From 654b758d473dd450a2fbfe8df4201b59adafaed8 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 20 Oct 2015 00:31:42 +0000 Subject: [PATCH] Revert "Diagnose UnresolvedLookupExprs that resolve to instance members in static methods" This reverts commit r250592. It has issues around unevaluated contexts, like this: template struct A { T i; }; template struct B : A { using A::i; typedef decltype(i) U; }; template struct B; git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@250774 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Sema/Sema.h | 3 --- lib/Sema/SemaExprMember.cpp | 25 +++++++++-------- lib/Sema/TreeTransform.h | 12 +-------- test/SemaCXX/using-decl-1.cpp | 51 +---------------------------------- 4 files changed, 16 insertions(+), 75 deletions(-) diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index d0b3e627f6..cce5405a1e 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -3692,9 +3692,6 @@ public: Expr *baseObjectExpr = nullptr, SourceLocation opLoc = SourceLocation()); - void DiagnoseInstanceReference(const CXXScopeSpec &SS, NamedDecl *Rep, - const DeclarationNameInfo &nameInfo); - ExprResult BuildPossibleImplicitMemberExpr(const CXXScopeSpec &SS, SourceLocation TemplateKWLoc, LookupResult &R, diff --git a/lib/Sema/SemaExprMember.cpp b/lib/Sema/SemaExprMember.cpp index 3256bd986f..52dfceccb9 100644 --- a/lib/Sema/SemaExprMember.cpp +++ b/lib/Sema/SemaExprMember.cpp @@ -192,8 +192,10 @@ static IMAKind ClassifyImplicitMemberAccess(Sema &SemaRef, } /// Diagnose a reference to a field with no object available. -void Sema::DiagnoseInstanceReference(const CXXScopeSpec &SS, NamedDecl *Rep, - const DeclarationNameInfo &nameInfo) { +static void diagnoseInstanceReference(Sema &SemaRef, + const CXXScopeSpec &SS, + NamedDecl *Rep, + const DeclarationNameInfo &nameInfo) { SourceLocation Loc = nameInfo.getLoc(); SourceRange Range(Loc); if (SS.isSet()) Range.setBegin(SS.getRange().getBegin()); @@ -201,7 +203,7 @@ void Sema::DiagnoseInstanceReference(const CXXScopeSpec &SS, NamedDecl *Rep, // Look through using shadow decls and aliases. Rep = Rep->getUnderlyingDecl(); - DeclContext *FunctionLevelDC = getFunctionLevelDeclContext(); + DeclContext *FunctionLevelDC = SemaRef.getFunctionLevelDeclContext(); CXXMethodDecl *Method = dyn_cast(FunctionLevelDC); CXXRecordDecl *ContextClass = Method ? Method->getParent() : nullptr; CXXRecordDecl *RepClass = dyn_cast(Rep->getDeclContext()); @@ -211,19 +213,20 @@ void Sema::DiagnoseInstanceReference(const CXXScopeSpec &SS, NamedDecl *Rep, if (IsField && InStaticMethod) // "invalid use of member 'x' in static member function" - Diag(Loc, diag::err_invalid_member_use_in_static_method) + SemaRef.Diag(Loc, diag::err_invalid_member_use_in_static_method) << Range << nameInfo.getName(); else if (ContextClass && RepClass && SS.isEmpty() && !InStaticMethod && !RepClass->Equals(ContextClass) && RepClass->Encloses(ContextClass)) // Unqualified lookup in a non-static member function found a member of an // enclosing class. - Diag(Loc, diag::err_nested_non_static_member_use) - << IsField << RepClass << nameInfo.getName() << ContextClass << Range; + SemaRef.Diag(Loc, diag::err_nested_non_static_member_use) + << IsField << RepClass << nameInfo.getName() << ContextClass << Range; else if (IsField) - Diag(Loc, diag::err_invalid_non_static_member_use) << nameInfo.getName() - << Range; + SemaRef.Diag(Loc, diag::err_invalid_non_static_member_use) + << nameInfo.getName() << Range; else - Diag(Loc, diag::err_member_call_without_object) << Range; + SemaRef.Diag(Loc, diag::err_member_call_without_object) + << Range; } /// Builds an expression which might be an implicit member expression. @@ -257,7 +260,7 @@ Sema::BuildPossibleImplicitMemberExpr(const CXXScopeSpec &SS, case IMA_Error_StaticContext: case IMA_Error_Unrelated: - DiagnoseInstanceReference(SS, R.getRepresentativeDecl(), + diagnoseInstanceReference(*this, SS, R.getRepresentativeDecl(), R.getLookupNameInfo()); return ExprError(); } @@ -471,7 +474,7 @@ static void DiagnoseQualifiedMemberReference(Sema &SemaRef, // If this is an implicit member access, use a different set of // diagnostics. if (!BaseExpr) - return SemaRef.DiagnoseInstanceReference(SS, rep, nameInfo); + return diagnoseInstanceReference(SemaRef, SS, rep, nameInfo); SemaRef.Diag(nameInfo.getLoc(), diag::err_qualified_member_of_unrelated) << SS.getRange() << rep << BaseType; diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 81c56c2f2c..31d69cbac3 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -9128,18 +9128,8 @@ TreeTransform::TransformUnresolvedLookupExpr( // If we have neither explicit template arguments, nor the template keyword, // it's a normal declaration name. - if (!Old->hasExplicitTemplateArgs() && !TemplateKWLoc.isValid()) { - // If an UnresolvedLookupExpr resolved to an instance member, that's an - // error. - NamedDecl *D = R.getAsSingle(); - if (D && D->isCXXInstanceMember()) { - SemaRef.DiagnoseInstanceReference(SS, D, Old->getNameInfo()); - R.clear(); - return ExprError(); - } - + if (!Old->hasExplicitTemplateArgs() && !TemplateKWLoc.isValid()) return getDerived().RebuildDeclarationNameExpr(SS, R, Old->requiresADL()); - } // If we have template arguments, rebuild them, then rebuild the // templateid expression. diff --git a/test/SemaCXX/using-decl-1.cpp b/test/SemaCXX/using-decl-1.cpp index ac53b3758e..ca532692c1 100644 --- a/test/SemaCXX/using-decl-1.cpp +++ b/test/SemaCXX/using-decl-1.cpp @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s -// RUN: %clang_cc1 -DCXX11 -fsyntax-only -verify -std=c++11 %s +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s extern "C" { void f(bool); } @@ -327,52 +327,3 @@ namespace PR24033 { using PR24033::st; // expected-error {{target of using declaration conflicts with declaration already in scope}} } } - -namespace pr21923 { -template struct Base { - int field; - void method(); -}; -template struct Derived : Base { - using Base::field; - using Base::method; - static void m_fn1() { - // expected-error@+1 {{invalid use of member 'field' in static member function}} - (void)field; - // expected-error@+1 {{invalid use of member 'field' in static member function}} - (void)&field; - // expected-error@+1 {{call to non-static member function without an object argument}} - (void)method; - // expected-error@+1 {{call to non-static member function without an object argument}} - (void)&method; - // expected-error@+1 {{call to non-static member function without an object argument}} - method(); - (void)&Base::field; - (void)&Base::method; - } -}; -// expected-note@+1 {{in instantiation of member function 'pr21923::Derived::m_fn1' requested here}} -template class Derived; - -#ifdef CXX11 -// This is interesting because we form an UnresolvedLookupExpr in the static -// function template and an UnresolvedMemberExpr in the instance function -// template. As a result, we get slightly different behavior. -struct UnresolvedTemplateNames { - template void maybe_static(); - template static void maybe_static(); - - template - void instance_method() { (void)maybe_static(); } - template - static void static_method() { - // expected-error@+1 {{call to non-static member function without an object argument}} - (void)maybe_static(); - } -}; -void force_instantiation(UnresolvedTemplateNames x) { - x.instance_method(); - UnresolvedTemplateNames::static_method(); // expected-note {{requested here}} -} -#endif // CXX11 -} -- 2.40.0