OSDN Git Service

PR c++/6936
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 14 Nov 2011 17:55:57 +0000 (17:55 +0000)
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 14 Nov 2011 17:55:57 +0000 (17:55 +0000)
commit807f85cfb63c455ad591e9786293e05fe725b9ab
treef07e77967d125d0ff0d7a38837f5d8b94e0bf38f
parent811fd2b8d92f4d89c07aeb958da2b623f3908926
PR c++/6936
PR c++/25994
PR c++/26256
PR c++/30195
* search.c (lookup_field_1): Look through USING_DECL.
(lookup_field_r): Call lookup_fnfields_slot instead of
lookup_fnfields_1.
* semantics.c (finish_member_declaration): Remove the check that
prevents USING_DECLs from being verified by
pushdecl_class_level. Call add_method for using declarations that
designates functions if the using declaration is in a template
class. Set DECL_IGNORED_P on class-scope using declarations.
* typeck.c (build_class_member_access_expr): Handle USING_DECLs.
* class.c (check_field_decls): Keep using declarations.
(add_method): Remove two diagnostics about conflicting using
declarations.
* parser.c (cp_parser_nonclass_name): Handle USING_DECLs.
* decl.c (start_enum): Call xref_tag whenever possible.
* cp-tree.h (strip_using_decl): Declare, and reident the previous
function.
* name-lookup.c (strip_using_decl): New function.
(supplement_binding_1): Call strip_using_decl on decl and
bval. Perform most of the checks with USING_DECLs stripped.  Also
check that the target decl and the target bval does not refer to
the same declaration. Allow pushing an enum multiple times in a
template class. Adjustment to diagnose using redeclarations. Call
diagnose_name_conflict.
(push_class_level_binding): Call strip_using_decl on decl and
bval. Perform most of the checks with USING_DECLs stripped. Return
true if both decl and bval refer to USING_DECLs and are dependent.
(diagnose_name_conflict): New function.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181359 138bc75d-0d04-0410-961f-82ee72b054a4
49 files changed:
gcc/cp/ChangeLog
gcc/cp/class.c
gcc/cp/cp-tree.h
gcc/cp/decl.c
gcc/cp/name-lookup.c
gcc/cp/parser.c
gcc/cp/search.c
gcc/cp/semantics.c
gcc/cp/typeck.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/abi/mangle41.C
gcc/testsuite/g++.dg/cpp0x/forw_enum10.C [new file with mode: 0644]
gcc/testsuite/g++.dg/debug/using4.C [new file with mode: 0644]
gcc/testsuite/g++.dg/debug/using5.C [new file with mode: 0644]
gcc/testsuite/g++.dg/inherit/using4.C
gcc/testsuite/g++.dg/lookup/name-clash9.C
gcc/testsuite/g++.dg/lookup/pr6936.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using24.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using25.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using26.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using27.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using28.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using29.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using30.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using31.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using32.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using33.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using34.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using35.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using36.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using37.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using38.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using39.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using40.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using41.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using42.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using44.C [new file with mode: 0644]
gcc/testsuite/g++.dg/lookup/using45.C [new file with mode: 0644]
gcc/testsuite/g++.dg/parse/ctor5.C
gcc/testsuite/g++.dg/template/static4.C
gcc/testsuite/g++.dg/template/typedef1.C
gcc/testsuite/g++.dg/template/using2.C
gcc/testsuite/g++.old-deja/g++.brendan/misc14.C
gcc/testsuite/g++.old-deja/g++.bugs/900127_02.C
gcc/testsuite/g++.old-deja/g++.jason/scoping16.C
gcc/testsuite/g++.old-deja/g++.other/anon7.C
gcc/testsuite/g++.old-deja/g++.other/redecl1.C
gcc/testsuite/g++.old-deja/g++.other/typedef7.C
gcc/testsuite/g++.old-deja/g++.other/using1.C