[Bug c++/10200] [6 Regression] Weird clash with same names in different scopes

[jason at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10200

--- Comment #38 from Jason Merrill <jason at gcc dot gnu.org> ---
Author: jason
Date: Fri May 13 19:18:35 2016
New Revision: 236221

URL: https://gcc.gnu.org/viewcvs?rev=236221&root=gcc&view=rev
Log:
        Fix type-dependence and the current instantiation.

        PR c++/10200
        PR c++/69753
        * pt.c (tsubst_decl): Use uses_template_parms.
        (instantiate_template_1): Handle non-dependent calls in templates.
        (value_dependent_expression_p): Handle BASELINK, FUNCTION_DECL.
        (type_dependent_expression_p): Only consider innermost template args.
        (dependent_template_arg_p): Check enclosing class of a template here.
        (dependent_template_p): Not here.
        (type_dependent_object_expression_p): New.
        * typeck.c (finish_class_member_access_expr): Use it.
        * parser.c (cp_parser_postfix_expression): Use it.
        (cp_parser_postfix_dot_deref_expression): Use it.  Use comptypes
        to detect the current instantiation.
        (cp_parser_lookup_name): Really implement DR 141.
        * search.c (lookup_field_r): Prefer a dependent using-declaration.
        (any_dependent_bases_p): Split out from...
        * name-lookup.c (do_class_using_decl): ...here.
        * call.c (build_new_method_call_1): Use it.
        * semantics.c (finish_call_expr): 'this' doesn't make a call dependent.
        * tree.c (non_static_member_function_p): Remove.
        * typeck2.c (build_x_arrow): Use dependent_scope_p.

Added:
    trunk/gcc/testsuite/g++.dg/lookup/member4.C
    trunk/gcc/testsuite/g++.dg/lookup/member5.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/call.c
    trunk/gcc/cp/cp-tree.h
    trunk/gcc/cp/name-lookup.c
    trunk/gcc/cp/parser.c
    trunk/gcc/cp/pt.c
    trunk/gcc/cp/search.c
    trunk/gcc/cp/semantics.c
    trunk/gcc/cp/tree.c
    trunk/gcc/cp/typeck.c
    trunk/gcc/cp/typeck2.c
    trunk/gcc/testsuite/g++.dg/template/using14.C