Commit 73dc68b9 by Marek Polacek Committed by Marek Polacek

Make comp_ptr_ttypes_real return bool.

comp_ptr_ttypes_real could use bool instead of int since it only returns
0 or 1.

	* typeck.c (comp_ptr_ttypes_real): Change the return type to bool.
	Use false instead of 0.

From-SVN: r276808
parent 247afa98
2019-10-10 Marek Polacek <polacek@redhat.com>
* typeck.c (comp_ptr_ttypes_real): Change the return type to bool.
Use false instead of 0.
2019-10-10 Jakub Jelinek <jakub@redhat.com> 2019-10-10 Jakub Jelinek <jakub@redhat.com>
* parser.h (struct cp_omp_declare_simd_data): Add variant_p member. * parser.h (struct cp_omp_declare_simd_data): Add variant_p member.
......
...@@ -52,7 +52,7 @@ static tree cp_pointer_int_sum (location_t, enum tree_code, tree, tree, ...@@ -52,7 +52,7 @@ static tree cp_pointer_int_sum (location_t, enum tree_code, tree, tree,
tsubst_flags_t); tsubst_flags_t);
static tree rationalize_conditional_expr (enum tree_code, tree, static tree rationalize_conditional_expr (enum tree_code, tree,
tsubst_flags_t); tsubst_flags_t);
static int comp_ptr_ttypes_real (tree, tree, int); static bool comp_ptr_ttypes_real (tree, tree, int);
static bool comp_except_types (tree, tree, bool); static bool comp_except_types (tree, tree, bool);
static bool comp_array_types (const_tree, const_tree, compare_bounds_t, bool); static bool comp_array_types (const_tree, const_tree, compare_bounds_t, bool);
static tree pointer_diff (location_t, tree, tree, tree, tsubst_flags_t, tree *); static tree pointer_diff (location_t, tree, tree, tree, tsubst_flags_t, tree *);
...@@ -9903,7 +9903,7 @@ check_return_expr (tree retval, bool *no_warning) ...@@ -9903,7 +9903,7 @@ check_return_expr (tree retval, bool *no_warning)
If CONSTP is positive, then all outer pointers have been If CONSTP is positive, then all outer pointers have been
const-qualified. */ const-qualified. */
static int static bool
comp_ptr_ttypes_real (tree to, tree from, int constp) comp_ptr_ttypes_real (tree to, tree from, int constp)
{ {
bool to_more_cv_qualified = false; bool to_more_cv_qualified = false;
...@@ -9912,12 +9912,12 @@ comp_ptr_ttypes_real (tree to, tree from, int constp) ...@@ -9912,12 +9912,12 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
for (; ; to = TREE_TYPE (to), from = TREE_TYPE (from)) for (; ; to = TREE_TYPE (to), from = TREE_TYPE (from))
{ {
if (TREE_CODE (to) != TREE_CODE (from)) if (TREE_CODE (to) != TREE_CODE (from))
return 0; return false;
if (TREE_CODE (from) == OFFSET_TYPE if (TREE_CODE (from) == OFFSET_TYPE
&& !same_type_p (TYPE_OFFSET_BASETYPE (from), && !same_type_p (TYPE_OFFSET_BASETYPE (from),
TYPE_OFFSET_BASETYPE (to))) TYPE_OFFSET_BASETYPE (to)))
return 0; return false;
/* Const and volatile mean something different for function and /* Const and volatile mean something different for function and
array types, so the usual checks are not appropriate. We'll array types, so the usual checks are not appropriate. We'll
...@@ -9925,12 +9925,12 @@ comp_ptr_ttypes_real (tree to, tree from, int constp) ...@@ -9925,12 +9925,12 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
if (!FUNC_OR_METHOD_TYPE_P (to) && TREE_CODE (to) != ARRAY_TYPE) if (!FUNC_OR_METHOD_TYPE_P (to) && TREE_CODE (to) != ARRAY_TYPE)
{ {
if (!at_least_as_qualified_p (to, from)) if (!at_least_as_qualified_p (to, from))
return 0; return false;
if (!at_least_as_qualified_p (from, to)) if (!at_least_as_qualified_p (from, to))
{ {
if (constp == 0) if (constp == 0)
return 0; return false;
to_more_cv_qualified = true; to_more_cv_qualified = true;
} }
...@@ -9946,7 +9946,7 @@ comp_ptr_ttypes_real (tree to, tree from, int constp) ...@@ -9946,7 +9946,7 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
not match, then no conversion is possible. */ not match, then no conversion is possible. */
if (TREE_CODE (to) == ARRAY_TYPE if (TREE_CODE (to) == ARRAY_TYPE
&& !comp_array_types (to, from, bounds_first, /*strict=*/false)) && !comp_array_types (to, from, bounds_first, /*strict=*/false))
return 0; return false;
if (!TYPE_PTR_P (to) if (!TYPE_PTR_P (to)
&& !TYPE_PTRDATAMEM_P (to) && !TYPE_PTRDATAMEM_P (to)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment