Skip to content

R
riscv-gcc-1
Commit 6532e8a0 by Eric Botcazou Committed by Eric Botcazou
Options

trans.c (gigi): Don't set 'pure' flag on SJLJ routines. 

	* gcc-interface/trans.c (gigi): Don't set 'pure' flag on SJLJ routines.
	* gcc-interface/utils2.c (compare_arrays): Add LOC parameter.  Set it
	directly on all the comparison expressions.
	(build_binary_op): Pass input_location to compare_arrays.

From-SVN: r166533
parent 054d6b83
Showing with 26 additions and 30 deletions
gcc/ada/ChangeLog
2010-11-10 Eric Botcazou <ebotcazou@adacore.com> 2010-11-10 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/trans.c (gigi): Don't set 'pure' flag on SJLJ routines.
* gcc-interface/utils2.c (compare_arrays): Add LOC parameter. Set it
directly on all the comparison expressions.
(build_binary_op): Pass input_location to compare_arrays.
2010-11-10 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/trans.c (lvalue_required_p) <N_Type_Conversion>): Look * gcc-interface/trans.c (lvalue_required_p) <N_Type_Conversion>): Look
through it for elementary types as well. through it for elementary types as well.
<N_Unchecked_Type_Conversion>: Adjust to above change. <N_Unchecked_Type_Conversion>: Adjust to above change.
......
gcc/ada/gcc-interface/trans.c
...@@ -399,8 +399,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED, ...@@ -399,8 +399,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED,
(get_identifier ("system__soft_links__get_jmpbuf_address_soft"), (get_identifier ("system__soft_links__get_jmpbuf_address_soft"),
NULL_TREE, build_function_type (jmpbuf_ptr_type, NULL_TREE), NULL_TREE, build_function_type (jmpbuf_ptr_type, NULL_TREE),
NULL_TREE, false, true, true, NULL, Empty); NULL_TREE, false, true, true, NULL, Empty);
/* Avoid creating superfluous edges to __builtin_setjmp receivers. */
DECL_PURE_P (get_jmpbuf_decl) = 1;
DECL_IGNORED_P (get_jmpbuf_decl) = 1; DECL_IGNORED_P (get_jmpbuf_decl) = 1;
set_jmpbuf_decl set_jmpbuf_decl
...@@ -502,8 +500,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED, ...@@ -502,8 +500,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED,
NULL_TREE, NULL_TREE,
build_function_type (build_pointer_type (except_type_node), NULL_TREE), build_function_type (build_pointer_type (except_type_node), NULL_TREE),
NULL_TREE, false, true, true, NULL, Empty); NULL_TREE, false, true, true, NULL, Empty);
/* Avoid creating superfluous edges to __builtin_setjmp receivers. */
DECL_PURE_P (get_excptr_decl) = 1;
raise_nodefer_decl raise_nodefer_decl
= create_subprog_decl = create_subprog_decl
......
gcc/ada/gcc-interface/utils2.c
...@@ -235,7 +235,7 @@ find_common_type (tree t1, tree t2) ...@@ -235,7 +235,7 @@ find_common_type (tree t1, tree t2)
tests in as efficient a manner as possible. */ tests in as efficient a manner as possible. */
static tree static tree
compare_arrays (tree result_type, tree a1, tree a2) compare_arrays (location_t loc, tree result_type, tree a1, tree a2)
{ {
tree result = convert (result_type, boolean_true_node); tree result = convert (result_type, boolean_true_node);
tree a1_is_null = convert (result_type, boolean_false_node); tree a1_is_null = convert (result_type, boolean_false_node);
...@@ -296,10 +296,10 @@ compare_arrays (tree result_type, tree a1, tree a2) ...@@ -296,10 +296,10 @@ compare_arrays (tree result_type, tree a1, tree a2)
ub1 = TYPE_MAX_VALUE (TYPE_INDEX_TYPE (TYPE_DOMAIN (t1))); ub1 = TYPE_MAX_VALUE (TYPE_INDEX_TYPE (TYPE_DOMAIN (t1)));
lb1 = TYPE_MIN_VALUE (TYPE_INDEX_TYPE (TYPE_DOMAIN (t1))); lb1 = TYPE_MIN_VALUE (TYPE_INDEX_TYPE (TYPE_DOMAIN (t1)));
comparison = build_binary_op (LT_EXPR, result_type, ub1, lb1); comparison = fold_build2_loc (loc, LT_EXPR, result_type, ub1, lb1);
comparison = SUBSTITUTE_PLACEHOLDER_IN_EXPR (comparison, a1); comparison = SUBSTITUTE_PLACEHOLDER_IN_EXPR (comparison, a1);
if (EXPR_P (comparison)) if (EXPR_P (comparison))
SET_EXPR_LOCATION (comparison, input_location); SET_EXPR_LOCATION (comparison, loc);
this_a1_is_null = comparison; this_a1_is_null = comparison;
this_a2_is_null = convert (result_type, boolean_true_node); this_a2_is_null = convert (result_type, boolean_true_node);
...@@ -321,16 +321,15 @@ compare_arrays (tree result_type, tree a1, tree a2) ...@@ -321,16 +321,15 @@ compare_arrays (tree result_type, tree a1, tree a2)
bt = get_base_type (TREE_TYPE (ub1)); bt = get_base_type (TREE_TYPE (ub1));
comparison comparison
= build_binary_op (EQ_EXPR, result_type, = fold_build2_loc (loc, EQ_EXPR, result_type,
build_binary_op (MINUS_EXPR, bt, ub1, lb1), build_binary_op (MINUS_EXPR, bt, ub1, lb1),
build_binary_op (MINUS_EXPR, bt, ub2, lb2)); build_binary_op (MINUS_EXPR, bt, ub2, lb2));
comparison = SUBSTITUTE_PLACEHOLDER_IN_EXPR (comparison, a1); comparison = SUBSTITUTE_PLACEHOLDER_IN_EXPR (comparison, a1);
if (EXPR_P (comparison)) if (EXPR_P (comparison))
SET_EXPR_LOCATION (comparison, input_location); SET_EXPR_LOCATION (comparison, loc);
this_a1_is_null = build_binary_op (LT_EXPR, result_type, ub1, lb1); this_a1_is_null
if (EXPR_P (this_a1_is_null)) = fold_build2_loc (loc, LT_EXPR, result_type, ub1, lb1);
SET_EXPR_LOCATION (this_a1_is_null, input_location);
this_a2_is_null = convert (result_type, boolean_false_node); this_a2_is_null = convert (result_type, boolean_false_node);
} }
...@@ -342,31 +341,27 @@ compare_arrays (tree result_type, tree a1, tree a2) ...@@ -342,31 +341,27 @@ compare_arrays (tree result_type, tree a1, tree a2)
length2 = SUBSTITUTE_PLACEHOLDER_IN_EXPR (length2, a2); length2 = SUBSTITUTE_PLACEHOLDER_IN_EXPR (length2, a2);
comparison comparison
= build_binary_op (EQ_EXPR, result_type, length1, length2); = fold_build2_loc (loc, EQ_EXPR, result_type, length1, length2);
if (EXPR_P (comparison))
SET_EXPR_LOCATION (comparison, input_location);
/* If the length expression is of the form (cond ? val : 0), assume /* If the length expression is of the form (cond ? val : 0), assume
that cond is equivalent to (length != 0). That's guaranteed by that cond is equivalent to (length != 0). That's guaranteed by
construction of the array types in gnat_to_gnu_entity. */ construction of the array types in gnat_to_gnu_entity. */
if (TREE_CODE (length1) == COND_EXPR if (TREE_CODE (length1) == COND_EXPR
&& integer_zerop (TREE_OPERAND (length1, 2))) && integer_zerop (TREE_OPERAND (length1, 2)))
this_a1_is_null = invert_truthvalue (TREE_OPERAND (length1, 0)); this_a1_is_null
= invert_truthvalue_loc (loc, TREE_OPERAND (length1, 0));
else else
this_a1_is_null = build_binary_op (EQ_EXPR, result_type, length1, this_a1_is_null = fold_build2_loc (loc, EQ_EXPR, result_type,
size_zero_node); length1, size_zero_node);
if (EXPR_P (this_a1_is_null))
SET_EXPR_LOCATION (this_a1_is_null, input_location);
/* Likewise for the second array. */ /* Likewise for the second array. */
if (TREE_CODE (length2) == COND_EXPR if (TREE_CODE (length2) == COND_EXPR
&& integer_zerop (TREE_OPERAND (length2, 2))) && integer_zerop (TREE_OPERAND (length2, 2)))
this_a2_is_null = invert_truthvalue (TREE_OPERAND (length2, 0)); this_a2_is_null
= invert_truthvalue_loc (loc, TREE_OPERAND (length2, 0));
else else
this_a2_is_null = build_binary_op (EQ_EXPR, result_type, length2, this_a2_is_null = fold_build2_loc (loc, EQ_EXPR, result_type,
size_zero_node); length2, size_zero_node);
if (EXPR_P (this_a2_is_null))
SET_EXPR_LOCATION (this_a2_is_null, input_location);
} }
/* Append expressions for this dimension to the final expressions. */ /* Append expressions for this dimension to the final expressions. */
...@@ -396,9 +391,7 @@ compare_arrays (tree result_type, tree a1, tree a2) ...@@ -396,9 +391,7 @@ compare_arrays (tree result_type, tree a1, tree a2)
a2 = convert (type, a2); a2 = convert (type, a2);
} }
comparison = fold_build2 (EQ_EXPR, result_type, a1, a2); comparison = fold_build2_loc (loc, EQ_EXPR, result_type, a1, a2);
if (EXPR_P (comparison))
SET_EXPR_LOCATION (comparison, input_location);
result result
= build_binary_op (TRUTH_ANDIF_EXPR, result_type, result, comparison); = build_binary_op (TRUTH_ANDIF_EXPR, result_type, result, comparison);
...@@ -784,8 +777,8 @@ build_binary_op (enum tree_code op_code, tree result_type, ...@@ -784,8 +777,8 @@ build_binary_op (enum tree_code op_code, tree result_type,
|| (TREE_CODE (right_type) == INTEGER_TYPE || (TREE_CODE (right_type) == INTEGER_TYPE
&& TYPE_HAS_ACTUAL_BOUNDS_P (right_type)))) && TYPE_HAS_ACTUAL_BOUNDS_P (right_type))))
{ {
result = compare_arrays (result_type, left_operand, right_operand); result = compare_arrays (input_location,
result_type, left_operand, right_operand);
if (op_code == NE_EXPR) if (op_code == NE_EXPR)
result = invert_truthvalue_loc (EXPR_LOCATION (result), result); result = invert_truthvalue_loc (EXPR_LOCATION (result), result);
else else
......
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