re PR c++/12832 (ICE: tree check: expected class 'd', have 'x' (error_mark) in locati...

	PR c++/12832
	* name-lookup.c (supplement_binding): Gracefully handle names
	used at non-class scope prior declaration.

From-SVN: r73406

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7f83578..a8fedc8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-10  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       PR c++/12832
+       * name-lookup.c (supplement_binding): Gracefully handle names
+       used at non-class scope prior declaration.
+
 2003-11-06  Matt Austern  <austern@apple.com>
 
        * decl.c (duplicate_decls): copy DECL_VISIBILITY field.

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index add0d55..624e86e 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -435,10 +435,13 @@ supplement_binding (cxx_binding *binding, tree decl)
   if (TREE_CODE (decl) == TYPE_DECL && DECL_ARTIFICIAL (decl))
     /* The new name is the type name.  */
     binding->type = decl;
-  else if (!bval)
-    /* This situation arises when push_class_level_binding moves an
-       inherited type-binding out of the way to make room for a new
-       value binding.  */
+  else if (!bval || bval == error_mark_node)
+    /* VALUE is null when push_class_level_binding moves an inherited
+       type-binding out of the way to make room for a new value binding.
+       It is an error_mark_node when DECL's name has been used in a
+       non-class scope prior declaration.  In that case, we should have
+       already issued a diagnostic; for graceful error recovery purpose,
+       pretend this was the intended declaration for that name.  */
     binding->value = decl;
   else if (TREE_CODE (bval) == TYPE_DECL && DECL_ARTIFICIAL (bval))
     {

diff --git a/gcc/testsuite/g++.dg/lookup/used-before-declaration.C b/gcc/testsuite/g++.dg/lookup/used-before-declaration.C
new file mode 100644 (file)
index 0000000..c1469ea
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/used-before-declaration.C
@@ -0,0 +1,5 @@
+// Copyroght (C) 2003 Free Software Foundation
+// Origin: PR/12832, Jonathan Wakely <redi@gcc.gnu.org>
+
+void f() { g(); }               // { dg-error "undeclared" "" }
+void g() { }                    // { dg-error "used" "" }