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

re PR c++/32898 (Definition of variable N::i outside namespace N not rejected)

Browse Source 
PR c++/32898
	* name-lookup.c (set_decl_namespace): lookup_qualified_name failure
	is error_mark_node rather than NULL_TREE.
	* pt.c (check_explicit_specialization): Likewise.

	* g++.dg/lookup/ns3.C: New test.

From-SVN: r127749
This commit is contained in:
Jakub Jelinek 2007-08-24 01:27:34 +02:00 committed by Jakub Jelinek
parent 9b21a38053
commit 97dc8e5b57
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
2007-08-24 Jakub Jelinek <jakub@redhat.com> 2007-08-24 Jakub Jelinek <jakub@redhat.com>
PR c++/32898
* name-lookup.c (set_decl_namespace): lookup_qualified_name failure
is error_mark_node rather than NULL_TREE.
* pt.c (check_explicit_specialization): Likewise.
PR c++/31941 PR c++/31941
* error.c (resolve_virtual_fun_from_obj_type_ref): Handle * error.c (resolve_virtual_fun_from_obj_type_ref): Handle
TARGET_VTABLE_USES_DESCRIPTORS targets properly. TARGET_VTABLE_USES_DESCRIPTORS targets properly.

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

@ -2970,7 +2970,7 @@ set_decl_namespace (tree decl, tree scope, bool friendp)
/* See whether this has been declared in the namespace. */ /* See whether this has been declared in the namespace. */
old = lookup_qualified_name (scope, DECL_NAME (decl), false, true); old = lookup_qualified_name (scope, DECL_NAME (decl), false, true);
if (!old) if (old == error_mark_node)
/* No old declaration at all. */ /* No old declaration at all. */
goto complain; goto complain;
if (!is_overloaded_fn (decl)) if (!is_overloaded_fn (decl))

4
gcc/cp/pt.c
View File

@ -1980,7 +1980,7 @@ check_explicit_specialization (tree declarator,
context. */ context. */
fns = lookup_qualified_name (CP_DECL_CONTEXT (decl), dname, fns = lookup_qualified_name (CP_DECL_CONTEXT (decl), dname,
false, true); false, true);
if (!fns || !is_overloaded_fn (fns)) if (fns == error_mark_node || !is_overloaded_fn (fns))
{ {
error ("%qD is not a template function", dname); error ("%qD is not a template function", dname);
fns = error_mark_node; fns = error_mark_node;
@ -2215,6 +2215,8 @@ check_explicit_specialization (tree declarator,
/* This specialization has the same linkage and visibility as /* This specialization has the same linkage and visibility as
the function template it specializes. */ the function template it specializes. */
TREE_PUBLIC (decl) = TREE_PUBLIC (tmpl_func); TREE_PUBLIC (decl) = TREE_PUBLIC (tmpl_func);
if (! TREE_PUBLIC (decl) && DECL_INTERFACE_KNOWN (tmpl_func))
DECL_INTERFACE_KNOWN (decl) = 1;
DECL_THIS_STATIC (decl) = DECL_THIS_STATIC (tmpl_func); DECL_THIS_STATIC (decl) = DECL_THIS_STATIC (tmpl_func);
if (DECL_VISIBILITY_SPECIFIED (tmpl_func)) if (DECL_VISIBILITY_SPECIFIED (tmpl_func))
{ {

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2007-08-24 Jakub Jelinek <jakub@redhat.com> 2007-08-24 Jakub Jelinek <jakub@redhat.com>
PR c++/32898
* g++.dg/lookup/ns3.C: New test.
* gfortran.dg/assumed_charlen_sharing.f90: New test. * gfortran.dg/assumed_charlen_sharing.f90: New test.
PR c++/31941 PR c++/31941

5
gcc/testsuite/g++.dg/lookup/ns3.C Normal file
View File

@ -0,0 +1,5 @@
// PR c++/32898
namespace N { }
int N::i; // { dg-error "should have been declared inside" }