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

PR c++/21008, DR 515 

PR c++/21008, DR 515
	* semantics.c (finish_non_static_data_member): Don't check
	derivation in a template.

From-SVN: r154150
This commit is contained in:
Jason Merrill 2009-11-13 09:40:22 -05:00 committed by Jason Merrill
parent fc1e08468e
commit ab11c13ff3
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2009-11-13 Jason Merrill <jason@redhat.com>
PR c++/21008, DR 515
* semantics.c (finish_non_static_data_member): Don't check
derivation in a template.
PR c++/11987
* parser.c (cp_parser_direct_declarator): Give helpful error about
trying to define member of a dependent typedef.

17
gcc/cp/semantics.c
View File

@ -1485,6 +1485,14 @@ finish_non_static_data_member (tree decl, tree object, tree qualifying_scope)
return build_min (COMPONENT_REF, type, object, decl, NULL_TREE);
}
/* If PROCESSING_TEMPLATE_DECL is nonzero here, then
QUALIFYING_SCOPE is also non-null. Wrap this in a SCOPE_REF
for now. */
else if (processing_template_decl)
return build_qualified_name (TREE_TYPE (decl),
qualifying_scope,
DECL_NAME (decl),
/*template_p=*/false);
else
{
tree access_type = TREE_TYPE (object);
@ -1504,15 +1512,6 @@ finish_non_static_data_member (tree decl, tree object, tree qualifying_scope)
}
}
/* If PROCESSING_TEMPLATE_DECL is nonzero here, then
QUALIFYING_SCOPE is also non-null. Wrap this in a SCOPE_REF
for now. */
if (processing_template_decl)
return build_qualified_name (TREE_TYPE (decl),
qualifying_scope,
DECL_NAME (decl),
/*template_p=*/false);
perform_or_defer_access_check (TYPE_BINFO (access_type), decl,
decl);

4
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,9 @@
2009-11-13 Jason Merrill <jason@redhat.com>
PR c++/21008, DR 515
* g++.dg/template/inherit4.C: New.
* g++.dg/lookup/scoped8.C: Adjust.
PR c++/11987
* g++.dg/parse/typename11.C: New.
* g++.dg/template/crash48.C: Adjust.

2
gcc/testsuite/g++.dg/lookup/scoped8.C
View File

@ -14,3 +14,5 @@ template <int> struct B
{
int foo() { return A::i; } // { dg-error "this location" }
};
template struct B<0>;

14
gcc/testsuite/g++.dg/template/inherit4.C Normal file
View File

@ -0,0 +1,14 @@
// PR c++/21008, DR 515
struct A {
int foo_;
};
template <typename T> struct B: public A { };
template <typename T> struct C: B<T> {
int foo() {
return A::foo_; // #1
}
};
int f(C<int>* p) {
return p->foo();
}