From 38f638cae20c53258854054bfc09f489c01ffe94 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sun, 16 Jul 2017 22:03:54 +0000 Subject: [PATCH] re PR rtl-optimization/81424 (internal error on GPRbuild with -O2) PR rtl-optimization/81424 * optabs.c (prepare_cmp_insn): Use copy_to_reg instead of force_reg to remove potential trapping from operands if -fnon-call-exceptions. From-SVN: r250246 --- gcc/ChangeLog | 6 ++++++ gcc/optabs.c | 4 ++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/opt65.adb | 30 ++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/opt65.adb diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 31979ed91b3..240ff4009d3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-07-16 Eric Botcazou + + PR rtl-optimization/81424 + * optabs.c (prepare_cmp_insn): Use copy_to_reg instead of force_reg + to remove potential trapping from operands if -fnon-call-exceptions. + 2017-07-16 Jan Hubicka * tree-ssa-loop-manip.c (tree_transform_and_unroll_loop): Use diff --git a/gcc/optabs.c b/gcc/optabs.c index 39051326c7a..9258e5f888b 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -3846,9 +3846,9 @@ prepare_cmp_insn (rtx x, rtx y, enum rtx_code comparison, rtx size, if (cfun->can_throw_non_call_exceptions) { if (may_trap_p (x)) - x = force_reg (mode, x); + x = copy_to_reg (x); if (may_trap_p (y)) - y = force_reg (mode, y); + y = copy_to_reg (y); } if (GET_MODE_CLASS (mode) == MODE_CC) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3ede9d83653..872d24e0109 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2017-07-16 Eric Botcazou + + * gnat.dg/opt65.adb: New test. + 2017-07-16 Jan Hubicka * gcc.dg/predict-8.c: Update. diff --git a/gcc/testsuite/gnat.dg/opt65.adb b/gcc/testsuite/gnat.dg/opt65.adb new file mode 100644 index 00000000000..7b429b6b1a3 --- /dev/null +++ b/gcc/testsuite/gnat.dg/opt65.adb @@ -0,0 +1,30 @@ +-- { dg-do run } +-- { dg-options "-O2" } + +with Ada.Command_Line; use Ada.Command_Line; + +procedure Opt65 is + + procedure Check_Version_And_Help (Version_String : String) is + Help_Switch_Present : Boolean := False; + Next_Arg : Natural := 1; + begin + while Next_Arg <= Argument_Count loop + declare + Next_Argv : constant String := Argument (Next_Arg); + begin + if Next_Argv = "--help" then + Help_Switch_Present := True; + end if; + Next_Arg := Next_Arg + 1; + end; + end loop; + + if Help_Switch_Present then + raise Program_Error; + end if; + end; + +begin + Check_Version_And_Help ("version"); +end; -- 2.30.2