aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2002-10-24 00:01:37 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2002-10-24 00:01:37 +0000
commit6b607ffd46714ea2650dfa8d3b3ff6634b1c6610 (patch)
tree3d5249f221f268561ba0e176a992e683d5880f57
parentb0af98d793adb3ff2dfd1a754209fd290e7ca491 (diff)
downloadgcc-6b607ffd46714ea2650dfa8d3b3ff6634b1c6610.zip
gcc-6b607ffd46714ea2650dfa8d3b3ff6634b1c6610.tar.gz
gcc-6b607ffd46714ea2650dfa8d3b3ff6634b1c6610.tar.bz2
re PR c++/8067 (g++ 3.2 internal error: Segmentation fault)
PR c++/8067 * decl.c (maybe_inject_for_scope_var): Ignore __FUNCTION__ and related variables. PR c++/8067 * g++.dg/lookup/pretty1.C: New test. From-SVN: r58477
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/decl.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/lookup/pretty1.C1
4 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bca3b4c..e6ed929 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2002-10-23 Mark Mitchell <mark@codesourcery.com>
+ PR c++/8067
+ * decl.c (maybe_inject_for_scope_var): Ignore __FUNCTION__ and
+ related variables.
+
PR c++/7679
* spew.c (next_token): Do not return an endless stream of
END_OF_SAVED_INPUT tokens.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b52622a..97ab946 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8175,6 +8175,12 @@ maybe_inject_for_scope_var (decl)
{
if (!DECL_NAME (decl))
return;
+
+ /* Declarations of __FUNCTION__ and its ilk appear magically when
+ the variable is first used. If that happens to be inside a
+ for-loop, we don't want to do anything special. */
+ if (DECL_PRETTY_FUNCTION_P (decl))
+ return;
if (current_binding_level->is_for_scope)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e2fa077..fc2c7c2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-23 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/8067
+ * g++.dg/lookup/pretty1.C: New test.
+
2002-10-23 Jakub Jelinek <jakub@redhat.com>
* gcc.dg/20021023-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/lookup/pretty1.C b/gcc/testsuite/g++.dg/lookup/pretty1.C
new file mode 100644
index 0000000..a03bd3c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/pretty1.C
@@ -0,0 +1 @@
+void foo() { for ( __PRETTY_FUNCTION__ ; ; ) ; }