OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/9336 (ICE in cp_line_of, at cp/error.c:2191)

Browse Source 
PR c++/9336
	* g++.dg/parse/namespace8.C: New test.

	PR c++/9336
	* decl2.c (do_nonmember_using_decl): Do not call duplicate decls
	to merge old and new declarations.

From-SVN: r64216
This commit is contained in:
Mark Mitchell 2003-03-12 07:23:15 +00:00 committed by Mark Mitchell
parent 21282b1e92
commit 2601a4ee73
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2003-03-11 Mark Mitchell <mark@codesourcery.com>
PR c++/9336
* decl2.c (do_nonmember_using_decl): Do not call duplicate decls
to merge old and new declarations.
2003-03-12 Alexandre Oliva <aoliva@redhat.com>
* g++.1: Remove.
@ -8,6 +14,10 @@
2003-03-11 Mark Mitchell <mark@codesourcery.com>
PR c++/9336
* decl2.c (do_nonmember_using_decl): Do not call duplicate decls
to merge old and new declarations.
PR c++/9924
* decl2.c (do_nonmember_using_decl): Ignore anticipated builtins.

14
gcc/cp/decl2.c
View File

@ -4222,12 +4222,6 @@ do_nonmember_using_decl (tree scope, tree name, tree oldval, tree oldtype,
{
tree tmp, tmp1;
if (oldval && !is_overloaded_fn (oldval))
{
duplicate_decls (OVL_CURRENT (BINDING_VALUE (decls)), oldval);
oldval = NULL_TREE;
}
*newval = oldval;
for (tmp = BINDING_VALUE (decls); tmp; tmp = OVL_NEXT (tmp))
{
@ -4290,12 +4284,12 @@ do_nonmember_using_decl (tree scope, tree name, tree oldval, tree oldtype,
else
{
*newval = BINDING_VALUE (decls);
if (oldval)
duplicate_decls (*newval, oldval);
}
if (oldval && !decls_match (*newval, oldval))
error ("`%D' is already declared in this scope", name);
}
*newtype = BINDING_TYPE (decls);
if (oldtype && *newtype && oldtype != *newtype)
if (oldtype && *newtype && !same_type_p (oldtype, *newtype))
{
error ("using declaration `%D' introduced ambiguous type `%T'",
name, oldtype);

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2003-03-11 Mark Mitchell <mark@codesourcery.com>
PR c++/9336
* g++.dg/parse/namespace8.C: New test.
PR c++/9924
* g++.dg/overload/builtin2.C: New test.

6
gcc/testsuite/g++.dg/parse/namespace8.C Normal file
View File

@ -0,0 +1,6 @@
namespace X {
typedef struct {
} x;
}
typedef X::x x;
using X::x;