From a343634aa59d6a6380370aea966fe55d0c7498bd Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Sun, 16 Oct 2011 13:14:34 +0000 Subject: [PATCH] PR rtl-optimization/50615 * combine.c (distribute_notes) : Skip if I3 is a no-op. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180058 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/combine.c | 15 ++++++++------- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/vla-23.c | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/vla-23.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8c5017d95fd..766f12d56d7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-10-16 Eric Botcazou + + PR rtl-optimization/50615 + * combine.c (distribute_notes) : Skip if I3 is a no-op. + 2011-10-16 Jakub Jelinek PR tree-optimization/50596 diff --git a/gcc/combine.c b/gcc/combine.c index 6c3b17ca6ea..29411149173 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -13274,13 +13274,14 @@ distribute_notes (rtx notes, rtx from_insn, rtx i3, rtx i2, rtx elim_i2, break; case REG_ARGS_SIZE: - { - /* ??? How to distribute between i3-i1. Assume i3 contains the - entire adjustment. Assert i3 contains at least some adjust. */ - int old_size, args_size = INTVAL (XEXP (note, 0)); - old_size = fixup_args_size_notes (PREV_INSN (i3), i3, args_size); - gcc_assert (old_size != args_size); - } + /* ??? How to distribute between i3-i1. Assume i3 contains the + entire adjustment. Assert i3 contains at least some adjust. */ + if (!noop_move_p (i3)) + { + int old_size, args_size = INTVAL (XEXP (note, 0)); + old_size = fixup_args_size_notes (PREV_INSN (i3), i3, args_size); + gcc_assert (old_size != args_size); + } break; case REG_NORETURN: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 653453a77ed..d10e82b3ee1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-10-16 Eric Botcazou + + * gcc.dg/vla-23.c: New test. + 2011-10-16 Jakub Jelinek PR tree-optimization/50596 diff --git a/gcc/testsuite/gcc.dg/vla-23.c b/gcc/testsuite/gcc.dg/vla-23.c new file mode 100644 index 00000000000..47be4123301 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-23.c @@ -0,0 +1,17 @@ +/* PR rtl-optimization/50615 */ +/* Testcase by Zdenek Sojka */ + +/* { dg-do compile } */ +/* { dg-options "-O --param max-cse-insns=1" } */ + +int +foo (int a) +{ + if (!a) + return 1; + + { + int s[a]; + return 0; + } +} -- 2.11.0