From 3b34d92c9cabd5249eacf0774980028defeffde0 Mon Sep 17 00:00:00 2001
From: Jie Zhang <jie@codesourcery.com>
Date: Mon, 29 Mar 2010 13:06:50 +0000
Subject: [PATCH] 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
---
gcc/ChangeLog | 8 ++++++++
gcc/opts.c | 8 +-------
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gcc.dg/pr43564.c | 16 ++++++++++++++++
gcc/toplev.c | 4 ++++
5 files changed, 34 insertions(+), 7 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/pr43564.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d2dd62ba5ee..f3b75676a023 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.
diff --git a/gcc/opts.c b/gcc/opts.c
index df78027d1e9f..139cd2694163 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -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 b23124664e3c..e429f264eb1e 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 000000000000..39e0f3ac3ed7
--- /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 fb3c4b260638..a789383cfdc5 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
--
GitLab