From bf6490b56fc40295607429331a49de4c4ac46371 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 18 May 2011 10:40:50 +0200 Subject: [PATCH] trans.c (Exception_Handler_to_gnu_sjlj): Use boolean_false_node instead of integer_zero_node. 2011-05-18 Kai Tietz * gcc-interface/trans.c (Exception_Handler_to_gnu_sjlj): Use boolean_false_node instead of integer_zero_node. (convert_with_check): Likewise. * gcc-interface/decl.c (choices_to_gnu): Likewise. From-SVN: r173846 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/gcc-interface/decl.c | 4 ++-- gcc/ada/gcc-interface/trans.c | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 42019393571..b9325bcc54a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2011-05-18 Kai Tietz + + * gcc-interface/trans.c (Exception_Handler_to_gnu_sjlj): Use + boolean_false_node instead of integer_zero_node. + (convert_with_check): Likewise. + * gcc-interface/decl.c (choices_to_gnu): Likewise. + 2011-05-12 Eric Botcazou * gcc-interface/trans.c (call_to_gnu): In the by-reference case, if the diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 93bab4fb7c7..2ded33bbdcd 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -6595,7 +6595,7 @@ choices_to_gnu (tree operand, Node_Id choices) { Node_Id choice; Node_Id gnat_temp; - tree result = integer_zero_node; + tree result = boolean_false_node; tree this_test, low = 0, high = 0, single = 0; for (choice = First (choices); Present (choice); choice = Next (choice)) @@ -6660,7 +6660,7 @@ choices_to_gnu (tree operand, Node_Id choices) break; case N_Others_Choice: - this_test = integer_one_node; + this_test = boolean_true_node; break; default: diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 6b132353250..5f08877709f 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -3563,7 +3563,7 @@ Exception_Handler_to_gnu_sjlj (Node_Id gnat_node) an "if" statement to select the proper exceptions. For "Others", exclude exceptions where Handled_By_Others is nonzero unless the All_Others flag is set. For "Non-ada", accept an exception if "Lang" is 'V'. */ - tree gnu_choice = integer_zero_node; + tree gnu_choice = boolean_false_node; tree gnu_body = build_stmt_group (Statements (gnat_node), false); Node_Id gnat_temp; @@ -3575,7 +3575,7 @@ Exception_Handler_to_gnu_sjlj (Node_Id gnat_node) if (Nkind (gnat_temp) == N_Others_Choice) { if (All_Others (gnat_temp)) - this_choice = integer_one_node; + this_choice = boolean_true_node; else this_choice = build_binary_op @@ -7101,7 +7101,7 @@ convert_with_check (Entity_Id gnat_type, tree gnu_expr, bool overflowp, { /* Ensure GNU_EXPR only gets evaluated once. */ tree gnu_input = gnat_protect_expr (gnu_result); - tree gnu_cond = integer_zero_node; + tree gnu_cond = boolean_false_node; tree gnu_in_lb = TYPE_MIN_VALUE (gnu_in_basetype); tree gnu_in_ub = TYPE_MAX_VALUE (gnu_in_basetype); tree gnu_out_lb = TYPE_MIN_VALUE (gnu_base_type); -- 2.30.2