From 0274dd3f8d6bcbc4935fae1e0cc815197c48bb0c Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 8 Nov 2018 15:53:47 +0000 Subject: [PATCH] fe.h (Suppress_Checks): Declare. * fe.h (Suppress_Checks): Declare. * gcc-interface/misc.c (gnat_init_gcc_eh): Set -fnon-call-exceptions only if checks are not suppressed and -faggressive-loop-optimizations only if they are. * gcc-interface/trans.c (struct loop_info_d): Remove has_checks and warned_aggressive_loop_optimizations fields. (gigi): Do not clear warn_aggressive_loop_optimizations here. (Raise_Error_to_gnu): Do not set has_checks. (gnat_to_gnu) : Remove support for aggressive loop optimizations. From-SVN: r265921 --- gcc/ada/ChangeLog | 13 +++++ gcc/ada/fe.h | 2 + gcc/ada/gcc-interface/misc.c | 14 +++-- gcc/ada/gcc-interface/trans.c | 51 ------------------- gcc/testsuite/ChangeLog | 10 ++++ gcc/testsuite/gnat.dg/null_pointer_deref1.adb | 4 +- gcc/testsuite/gnat.dg/null_pointer_deref2.adb | 3 +- gcc/testsuite/gnat.dg/null_pointer_deref3.adb | 3 +- gcc/testsuite/gnat.dg/opt74.adb | 13 +++++ gcc/testsuite/gnat.dg/opt74_pkg.adb | 16 ++++++ gcc/testsuite/gnat.dg/opt74_pkg.ads | 7 +++ gcc/testsuite/gnat.dg/warn12.adb | 48 ----------------- gcc/testsuite/gnat.dg/warn12_pkg.ads | 21 -------- 13 files changed, 79 insertions(+), 126 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/opt74.adb create mode 100644 gcc/testsuite/gnat.dg/opt74_pkg.adb create mode 100644 gcc/testsuite/gnat.dg/opt74_pkg.ads delete mode 100644 gcc/testsuite/gnat.dg/warn12.adb delete mode 100644 gcc/testsuite/gnat.dg/warn12_pkg.ads diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a1b3c666e3a1..ee8ba62756af 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,16 @@ +2018-11-08 Eric Botcazou + + * fe.h (Suppress_Checks): Declare. + * gcc-interface/misc.c (gnat_init_gcc_eh): Set -fnon-call-exceptions + only if checks are not suppressed and -faggressive-loop-optimizations + only if they are. + * gcc-interface/trans.c (struct loop_info_d): Remove has_checks and + warned_aggressive_loop_optimizations fields. + (gigi): Do not clear warn_aggressive_loop_optimizations here. + (Raise_Error_to_gnu): Do not set has_checks. + (gnat_to_gnu) : Remove support for aggressive + loop optimizations. + 2018-11-08 Eric Botcazou * gcc-interface/decl.c (components_to_record): Remove obsolete kludge. diff --git a/gcc/ada/fe.h b/gcc/ada/fe.h index b0ccbdc66d00..d4c426501b7e 100644 --- a/gcc/ada/fe.h +++ b/gcc/ada/fe.h @@ -193,6 +193,7 @@ extern Boolean In_Same_Source_Unit (Node_Id, Node_Id); #define GNAT_Mode opt__gnat_mode #define List_Representation_Info opt__list_representation_info #define No_Strict_Aliasing_CP opt__no_strict_aliasing +#define Suppress_Checks opt__suppress_checks typedef enum { Front_End_SJLJ, Back_End_ZCX, Back_End_SJLJ @@ -207,6 +208,7 @@ extern Boolean Generate_SCO_Instance_Table; extern Boolean GNAT_Mode; extern Int List_Representation_Info; extern Boolean No_Strict_Aliasing_CP; +extern Boolean Suppress_Checks; #define ZCX_Exceptions opt__zcx_exceptions #define SJLJ_Exceptions opt__sjlj_exceptions diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 98ec2778d56d..eadbd36f4a36 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -392,7 +392,7 @@ gnat_init_gcc_eh (void) using_eh_for_cleanups (); /* Turn on -fexceptions, -fnon-call-exceptions and -fdelete-dead-exceptions. - The first one triggers the generation of the necessary exception tables. + The first one activates the support for exceptions in the compiler. The second one is useful for two reasons: 1/ we map some asynchronous signals like SEGV to exceptions, so we need to ensure that the insns which can lead to such signals are correctly attached to the exception @@ -402,10 +402,18 @@ gnat_init_gcc_eh (void) for such calls to actually raise in Ada. The third one is an optimization that makes it possible to delete dead instructions that may throw exceptions, most notably loads and stores, - as permitted in Ada. */ + as permitted in Ada. + Turn off -faggressive-loop-optimizations because it may optimize away + out-of-bound array accesses that we want to be able to catch. + If checks are disabled, we use the same settings as the C++ compiler. */ flag_exceptions = 1; - flag_non_call_exceptions = 1; flag_delete_dead_exceptions = 1; + if (!Suppress_Checks) + { + flag_non_call_exceptions = 1; + flag_aggressive_loop_optimizations = 0; + warn_aggressive_loop_optimizations = 0; + } init_eh (); } diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index ce2d43f989e7..2cd710247a43 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -198,8 +198,6 @@ struct GTY(()) loop_info_d { tree high_bound; vec *checks; bool artificial; - bool has_checks; - bool warned_aggressive_loop_optimizations; }; typedef struct loop_info_d *loop_info; @@ -679,10 +677,6 @@ gigi (Node_Id gnat_root, /* Now translate the compilation unit proper. */ Compilation_Unit_to_gnu (gnat_root); - /* Disable -Waggressive-loop-optimizations since we implement our own - version of the warning. */ - warn_aggressive_loop_optimizations = 0; - /* Then process the N_Validate_Unchecked_Conversion nodes. We do this at the very end to avoid having to second-guess the front-end when we run into dummy nodes during the regular processing. */ @@ -5720,7 +5714,6 @@ Raise_Error_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p) rci->inserted_cond = build1 (SAVE_EXPR, boolean_type_node, boolean_true_node); vec_safe_push (loop->checks, rci); - loop->has_checks = true; gnu_cond = build_noreturn_cond (gnat_to_gnu (gnat_cond)); if (flag_unswitch_loops) gnu_cond = build_binary_op (TRUTH_ANDIF_EXPR, @@ -5733,14 +5726,6 @@ Raise_Error_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p) gnu_cond, rci->inserted_cond); } - - /* Or else, if aggressive loop optimizations are enabled, we just - record that there are checks applied to iteration variables. */ - else if (optimize - && flag_aggressive_loop_optimizations - && inside_loop_p () - && (loop = find_loop_for (gnu_index))) - loop->has_checks = true; } break; @@ -6359,45 +6344,9 @@ gnat_to_gnu (Node_Id gnat_node) gcc_assert (TREE_CODE (gnu_type) == ARRAY_TYPE); gnat_temp = gnat_expr_array[i]; gnu_expr = maybe_character_value (gnat_to_gnu (gnat_temp)); - struct loop_info_d *loop; gnu_result = build_binary_op (ARRAY_REF, NULL_TREE, gnu_result, gnu_expr); - - /* Array accesses are bound-checked so they cannot trap, but this - is valid only if they are not hoisted ahead of the check. We - need to mark them as no-trap to get decent loop optimizations - in the presence of -fnon-call-exceptions, so we do it when we - know that the original expression had no side-effects. */ - if (TREE_CODE (gnu_result) == ARRAY_REF - && !(Nkind (gnat_temp) == N_Identifier - && Ekind (Entity (gnat_temp)) == E_Constant)) - TREE_THIS_NOTRAP (gnu_result) = 1; - - /* If aggressive loop optimizations are enabled, we warn for loops - overrunning a simple array of size 1 not at the end of a record. - This is aimed to catch misuses of the trailing array idiom. */ - if (optimize - && flag_aggressive_loop_optimizations - && inside_loop_p () - && TREE_CODE (TREE_TYPE (gnu_type)) != ARRAY_TYPE - && TREE_CODE (gnu_array_object) != ARRAY_REF - && tree_int_cst_equal (TYPE_MIN_VALUE (TYPE_DOMAIN (gnu_type)), - TYPE_MAX_VALUE (TYPE_DOMAIN (gnu_type))) - && !array_at_struct_end_p (gnu_result) - && (loop = find_loop_for (gnu_expr)) - && !loop->artificial - && !loop->has_checks - && tree_int_cst_equal (TYPE_MIN_VALUE (TYPE_DOMAIN (gnu_type)), - loop->low_bound) - && can_be_lower_p (loop->low_bound, loop->high_bound) - && !loop->warned_aggressive_loop_optimizations - && warning (OPT_Waggressive_loop_optimizations, - "out-of-bounds access may be optimized away")) - { - inform (EXPR_LOCATION (loop->stmt), "containing loop"); - loop->warned_aggressive_loop_optimizations = true; - } } gnu_result_type = get_unpadded_type (Etype (gnat_node)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c7767ec48739..e08be5939d96 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2018-11-08 Eric Botcazou + + * gnat.dg/null_pointer_deref1.adb: Remove -gnatp and add pragma. + * gnat.dg/null_pointer_deref2.adb: Likewise. + * gnat.dg/null_pointer_deref3.adb: Likewise. + * gnat.dg/opt74.adb: New test. + * gnat.dg/opt74_pkg.ad[sb]: New helper. + * gnat.dg/warn12.adb: Delete. + * gnat.dg/warn12_pkg.ads: Likewise. + 2018-11-08 David Malcolm PR ipa/86395 diff --git a/gcc/testsuite/gnat.dg/null_pointer_deref1.adb b/gcc/testsuite/gnat.dg/null_pointer_deref1.adb index ec7f94605596..0f030b001bd1 100644 --- a/gcc/testsuite/gnat.dg/null_pointer_deref1.adb +++ b/gcc/testsuite/gnat.dg/null_pointer_deref1.adb @@ -1,11 +1,13 @@ -- { dg-do run } --- { dg-options "-gnatp" } -- This test requires architecture- and OS-specific support code for unwinding -- through signal frames (typically located in *-unwind.h) to pass. Feel free -- to disable it if this code hasn't been implemented yet. procedure Null_Pointer_Deref1 is + + pragma Suppress (All_Checks); + type Int_Ptr is access all Integer; function Ident return Int_Ptr is diff --git a/gcc/testsuite/gnat.dg/null_pointer_deref2.adb b/gcc/testsuite/gnat.dg/null_pointer_deref2.adb index 284762216c56..2a4ed0954bb1 100644 --- a/gcc/testsuite/gnat.dg/null_pointer_deref2.adb +++ b/gcc/testsuite/gnat.dg/null_pointer_deref2.adb @@ -1,5 +1,4 @@ -- { dg-do run } --- { dg-options "-gnatp" } -- This test requires architecture- and OS-specific support code for unwinding -- through signal frames (typically located in *-unwind.h) to pass. Feel free @@ -7,6 +6,8 @@ procedure Null_Pointer_Deref2 is + pragma Suppress (All_Checks); + task T; task body T is diff --git a/gcc/testsuite/gnat.dg/null_pointer_deref3.adb b/gcc/testsuite/gnat.dg/null_pointer_deref3.adb index f92242e7e679..c8e66a6c94aa 100644 --- a/gcc/testsuite/gnat.dg/null_pointer_deref3.adb +++ b/gcc/testsuite/gnat.dg/null_pointer_deref3.adb @@ -1,5 +1,4 @@ -- { dg-do run } --- { dg-options "-O -gnatp" } -- This test requires architecture- and OS-specific support code for unwinding -- through signal frames (typically located in *-unwind.h) to pass. Feel free @@ -7,6 +6,8 @@ procedure Null_Pointer_Deref3 is + pragma Suppress (All_Checks); + procedure Leaf is type Int_Ptr is access all Integer; function n return Int_Ptr is diff --git a/gcc/testsuite/gnat.dg/opt74.adb b/gcc/testsuite/gnat.dg/opt74.adb new file mode 100644 index 000000000000..8eacaa5b49e2 --- /dev/null +++ b/gcc/testsuite/gnat.dg/opt74.adb @@ -0,0 +1,13 @@ +-- { dg-do run } +-- { dg-options "-O2" } + +with Opt74_Pkg; use Opt74_Pkg; + +procedure Opt74 is + Index, Found : Integer; +begin + Proc (Found, Index); + if Found = 1 then + raise Program_Error; + end if; +end; diff --git a/gcc/testsuite/gnat.dg/opt74_pkg.adb b/gcc/testsuite/gnat.dg/opt74_pkg.adb new file mode 100644 index 000000000000..4d5ce4fa822b --- /dev/null +++ b/gcc/testsuite/gnat.dg/opt74_pkg.adb @@ -0,0 +1,16 @@ +package body Opt74_Pkg is + + procedure Proc (Found : out Integer; Index : out Integer) is + begin + Index := 1; + Found := 0; + while (Index <= A'Last) and (Found = 0) loop + if A (Index) = 2 then + Found := 1; + else + Index := Index + 1; + end if; + end loop; + end; + +end Opt74_Pkg; diff --git a/gcc/testsuite/gnat.dg/opt74_pkg.ads b/gcc/testsuite/gnat.dg/opt74_pkg.ads new file mode 100644 index 000000000000..7c8e85e85d76 --- /dev/null +++ b/gcc/testsuite/gnat.dg/opt74_pkg.ads @@ -0,0 +1,7 @@ +package Opt74_Pkg is + + A : array (1 .. 10) of Integer := (others => 0); + + procedure Proc (Found : out Integer; Index : out Integer); + +end Opt74_Pkg; diff --git a/gcc/testsuite/gnat.dg/warn12.adb b/gcc/testsuite/gnat.dg/warn12.adb deleted file mode 100644 index 8ffd0c7dff08..000000000000 --- a/gcc/testsuite/gnat.dg/warn12.adb +++ /dev/null @@ -1,48 +0,0 @@ --- { dg-do compile } --- { dg-options "-O2" } - -with Text_IO; use Text_IO; -with System.Storage_Elements; use System.Storage_Elements; -with Warn12_Pkg; use Warn12_Pkg; - -procedure Warn12 (N : Natural) is - - Buffer_Size : constant Storage_Offset - := Token_Groups'Size/System.Storage_Unit + 4096; - - Buffer : Storage_Array (1 .. Buffer_Size); - for Buffer'Alignment use 8; - - Tg1 : Token_Groups; - for Tg1'Address use Buffer'Address; - - Tg2 : Token_Groups; - pragma Warnings (Off, Tg2); - - sid : Sid_And_Attributes; - - pragma Suppress (Index_Check, Sid_And_Attributes_Array); - -begin - - for I in 0 .. 7 loop - sid := Tg1.Groups(I); -- { dg-bogus "out-of-bounds access" } - Put_Line("Iteration"); - end loop; - - for I in 0 .. N loop - sid := Tg1.Groups(I); -- { dg-bogus "out-of-bounds access" } - Put_Line("Iteration"); - end loop; - - for I in 0 .. 7 loop - sid := Tg2.Groups(I); -- { dg-warning "out-of-bounds access" } - Put_Line("Iteration"); - end loop; - - for I in 0 .. N loop - sid := Tg2.Groups(I); -- { dg-warning "out-of-bounds access" } - Put_Line("Iteration"); - end loop; - -end; diff --git a/gcc/testsuite/gnat.dg/warn12_pkg.ads b/gcc/testsuite/gnat.dg/warn12_pkg.ads deleted file mode 100644 index b3191cc304f6..000000000000 --- a/gcc/testsuite/gnat.dg/warn12_pkg.ads +++ /dev/null @@ -1,21 +0,0 @@ -with Interfaces.C; use Interfaces.C; -with System; - -package Warn12_Pkg is - - Anysize_Array: constant := 0; - - type Sid_And_Attributes is record - Sid : System.Address; - Attributes : Interfaces.C.Unsigned_Long; - end record; - - type Sid_And_Attributes_Array - is array (Integer range 0..Anysize_Array) of aliased Sid_And_Attributes; - - type Token_Groups is record - GroupCount : Interfaces.C.Unsigned_Long; - Groups : Sid_And_Attributes_Array; - end record; - -end Warn12_Pkg; -- 2.47.2