From 0576681bac125be07f77f66b02a3dba2c3a24557 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sat, 18 Aug 2012 00:55:03 +0000 Subject: PR41111, PR5925, PR13210: Teach tentative parsing to annotate identifiers and nested names as id-expressions, using the annot_primary_expr annotation, where possible. This removes some redundant lookups, and also allows us to typo-correct within tentative parsing, and to carry on disambiguating past an identifier which we can determine will fail lookup as both a type and as a non-type, allowing us to disambiguate more declarations (and thus offer improved error recovery for such cases). This also introduces to the parser the notion of a tentatively-declared name, which is an identifier which we *might* have seen a declaration for in a tentative parse (but only if we end up disambiguating the tokens as a declaration). This is necessary to correctly disambiguate cases where a variable is used within its own initializer. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162159 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/SemaTemplate/member-access-ambig.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'test/SemaTemplate/member-access-ambig.cpp') diff --git a/test/SemaTemplate/member-access-ambig.cpp b/test/SemaTemplate/member-access-ambig.cpp index f8a01d5fff..5c2d761703 100644 --- a/test/SemaTemplate/member-access-ambig.cpp +++ b/test/SemaTemplate/member-access-ambig.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -verify -Wno-unused-comparison %s // PR8439 class A @@ -43,3 +43,22 @@ namespace PR11134 { }; } +namespace AddrOfMember { + struct A { int X; }; + typedef int (A::*P); + template struct S : T { + void f() { + P(&T::X) // expected-error {{cannot cast from type 'int *' to member pointer type 'P'}} + == &A::X; + } + }; + + void g() { + S().f(); // ok, &T::X is 'int (A::*)', not 'int *', even though T is a base class + } + + struct B : A { static int X; }; + void h() { + S().f(); // expected-note {{here}} + } +} -- cgit v1.2.3-18-g5258