diff options
| author | Jie Zhang <jie@codesourcery.com> | 2010-03-29 13:06:50 +0000 |
|---|---|---|
| committer | Jie Zhang <jiez@gcc.gnu.org> | 2010-03-29 13:06:50 +0000 |
| commit | 3b34d92c9cabd5249eacf0774980028defeffde0 (patch) | |
| tree | 7acf3831a61124e3544b15880d258d529a66dc1c /gcc | |
| parent | 10fa280a98a0e0b2f3f155262a0886de314f46fc (diff) | |
| download | gcc-3b34d92c9cabd5249eacf0774980028defeffde0.zip gcc-3b34d92c9cabd5249eacf0774980028defeffde0.tar.gz gcc-3b34d92c9cabd5249eacf0774980028defeffde0.tar.bz2 | |
re PR other/43564 (ICE on code with optimize attribute and inlining)
PR 43564
* toplev.c (process_options): Set optimization_default_node
and optimization_current_node.
* opts.c (decode_options): Don't set optimization_default_node
and optimization_current_node.
testsuite/
PR 43564
* gcc.dg/pr43564.c: New test.
From-SVN: r157795
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/opts.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr43564.c | 16 | ||||
| -rw-r--r-- | gcc/toplev.c | 4 |
5 files changed, 34 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9d2dd62..f3b7567 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-03-29 Jie Zhang <jie@codesourcery.com> + + PR 43564 + * toplev.c (process_options): Set optimization_default_node + and optimization_current_node. + * opts.c (decode_options): Don't set optimization_default_node + and optimization_current_node. + 2010-03-29 Ralf Corsépius <ralf.corsepius@rtems.org> * config/rtems.h: Abandon -qrtems_debug. @@ -1034,6 +1034,7 @@ decode_options (unsigned int argc, const char **argv) flag_pic = flag_pie; if (flag_pic && !flag_pie) flag_shlib = 1; + first_time_p = false; } if (optimize == 0) @@ -1112,13 +1113,6 @@ decode_options (unsigned int argc, const char **argv) flag_ira_algorithm = IRA_ALGORITHM_PRIORITY; } - /* Save the current optimization options if this is the first call. */ - if (first_time_p) - { - optimization_default_node = build_optimization_node (); - optimization_current_node = optimization_default_node; - first_time_p = false; - } if (flag_conserve_stack) { if (!PARAM_SET_P (PARAM_LARGE_STACK_FRAME)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b231246..e429f26 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-29 Jie Zhang <jie@codesourcery.com> + + PR 43564 + * gcc.dg/pr43564.c: New test. + 2010-03-29 Tobias Burnus <burnus@net-b.de> PR fortran/43551 diff --git a/gcc/testsuite/gcc.dg/pr43564.c b/gcc/testsuite/gcc.dg/pr43564.c new file mode 100644 index 0000000..39e0f3a --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr43564.c @@ -0,0 +1,16 @@ +/* { dg-options "-O0" } */ +/* { dg-do compile } */ + +static inline __attribute__ ((__always_inline__)) +unsigned __clz (unsigned input) +{ + unsigned output; + __asm__ __volatile__ ("clz %0, %1":"=r" (output):"r" (input)); +} +__attribute__ ((optimize ("O2"))) +void foo () +{ + unsigned a; + unsigned b; + a = __clz (b); +} diff --git a/gcc/toplev.c b/gcc/toplev.c index fb3c4b2..a789383 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -2148,6 +2148,10 @@ process_options (void) "for correctness"); flag_omit_frame_pointer = 0; } + + /* Save the current optimization options. */ + optimization_default_node = build_optimization_node (); + optimization_current_node = optimization_default_node; } /* This function can be called multiple times to reinitialize the compiler |