mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 14:51:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/12832 (ICE: tree check: expected class 'd', have 'x' (error_mark) in location_of, at cp/error.c:1962)

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

From-SVN: r73406
This commit is contained in:
Gabriel Dos Reis 2003-11-10 08:32:16 +00:00 committed by Gabriel Dos Reis
parent 1ec0c6076c
commit 64323f62a6
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -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.

11
gcc/cp/name-lookup.c
View File

@ -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))
{

5
gcc/testsuite/g++.dg/lookup/used-before-declaration.C Normal file
View File

@ -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" "" }