[clang] Reapply "[Clang][Sema] Fix crash when 'this' is used in a dependent class scope function template specialization that instantiates to a static member function (#87541, #88311)" (PR #88731)
Krystian Stasiowski via cfe-commits
cfe-commits at lists.llvm.org
Thu Apr 18 14:00:20 PDT 2024
https://github.com/sdkrystian updated https://github.com/llvm/llvm-project/pull/88731
>From f74be45a07ec82fb008341b98d549aed1d3354fd Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian at gmail.com>
Date: Mon, 15 Apr 2024 09:17:39 -0400
Subject: [PATCH 1/5] Reapply "[Clang][Sema] Fix crash when 'this' is used in a
dependent class scope function template specialization that instantiates to a
static member function (#87541, #88311)"
Reapplies #87541 and #88311 addressing the bug which caused expressions naming
overload sets to be incorrectly rebuilt, as well as the bug which caused
base class members to always be treated as overload sets.
---
clang/docs/ReleaseNotes.rst | 2 +
clang/include/clang/AST/ExprCXX.h | 3 +-
clang/include/clang/Sema/Sema.h | 16 +-
clang/lib/AST/ASTImporter.cpp | 2 +-
clang/lib/AST/ExprCXX.cpp | 9 +-
clang/lib/Sema/SemaCoroutine.cpp | 2 +-
clang/lib/Sema/SemaDecl.cpp | 2 +-
clang/lib/Sema/SemaExpr.cpp | 38 +---
clang/lib/Sema/SemaExprCXX.cpp | 61 +++---
clang/lib/Sema/SemaExprMember.cpp | 63 ++++--
clang/lib/Sema/SemaOpenMP.cpp | 6 +-
clang/lib/Sema/SemaOverload.cpp | 3 +-
.../lib/Sema/SemaTemplateInstantiateDecl.cpp | 8 +
clang/lib/Sema/TreeTransform.h | 82 ++++---
.../SemaTemplate/instantiate-using-decl.cpp | 2 +-
...ms-function-specialization-class-scope.cpp | 201 +++++++++++++++++-
16 files changed, 376 insertions(+), 124 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 3fe15934323c53..05ddac59052cf4 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -530,6 +530,8 @@ Bug Fixes to C++ Support
- Fix an issue caused by not handling invalid cases when substituting into the parameter mapping of a constraint. Fixes (#GH86757).
- Fixed a bug that prevented member function templates of class templates declared with a deduced return type
from being explicitly specialized for a given implicit instantiation of the class template.
+- Fixed a crash when ``this`` is used in a dependent class scope function template specialization
+ that instantiates to a static member function.
- Fix crash when inheriting from a cv-qualified type. Fixes #GH35603
- Fix a crash when the using enum declaration uses an anonymous enumeration. Fixes (#GH86790).
diff --git a/clang/include/clang/AST/ExprCXX.h b/clang/include/clang/AST/ExprCXX.h
index d28e5c3a78ee4b..4d5293566580ae 100644
--- a/clang/include/clang/AST/ExprCXX.h
+++ b/clang/include/clang/AST/ExprCXX.h
@@ -3219,7 +3219,8 @@ class UnresolvedLookupExpr final
Create(const ASTContext &Context, CXXRecordDecl *NamingClass,
NestedNameSpecifierLoc QualifierLoc,
const DeclarationNameInfo &NameInfo, bool RequiresADL, bool Overloaded,
- UnresolvedSetIterator Begin, UnresolvedSetIterator End);
+ UnresolvedSetIterator Begin, UnresolvedSetIterator End,
+ bool KnownDependent);
// After canonicalization, there may be dependent template arguments in
// CanonicalConverted But none of Args is dependent. When any of
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 1e89dfc58d92b1..42c7e1ebe38d5c 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -5429,7 +5429,8 @@ class Sema final : public SemaBase {
ExprResult BuildDeclarationNameExpr(const CXXScopeSpec &SS, LookupResult &R,
bool NeedsADL,
- bool AcceptInvalidDecl = false);
+ bool AcceptInvalidDecl = false,
+ bool NeedUnresolved = false);
ExprResult BuildDeclarationNameExpr(
const CXXScopeSpec &SS, const DeclarationNameInfo &NameInfo, NamedDecl *D,
NamedDecl *FoundD = nullptr,
@@ -6527,7 +6528,10 @@ class Sema final : public SemaBase {
SourceLocation RParenLoc);
//// ActOnCXXThis - Parse 'this' pointer.
- ExprResult ActOnCXXThis(SourceLocation loc);
+ ExprResult ActOnCXXThis(SourceLocation Loc);
+
+ /// Check whether the type of 'this' is valid in the current context.
+ bool CheckCXXThisType(SourceLocation Loc, QualType Type);
/// Build a CXXThisExpr and mark it referenced in the current context.
Expr *BuildCXXThisExpr(SourceLocation Loc, QualType Type, bool IsImplicit);
@@ -6949,10 +6953,14 @@ class Sema final : public SemaBase {
///@{
public:
+ /// Check whether an expression might be an implicit class member access.
+ bool isPotentialImplicitMemberAccess(const CXXScopeSpec &SS, LookupResult &R,
+ bool IsAddressOfOperand);
+
ExprResult BuildPossibleImplicitMemberExpr(
const CXXScopeSpec &SS, SourceLocation TemplateKWLoc, LookupResult &R,
- const TemplateArgumentListInfo *TemplateArgs, const Scope *S,
- UnresolvedLookupExpr *AsULE = nullptr);
+ const TemplateArgumentListInfo *TemplateArgs, const Scope *S);
+
ExprResult
BuildImplicitMemberExpr(const CXXScopeSpec &SS, SourceLocation TemplateKWLoc,
LookupResult &R,
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index 6aaa34c55ce307..0928e6cd2b37a8 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -8562,7 +8562,7 @@ ASTNodeImporter::VisitUnresolvedLookupExpr(UnresolvedLookupExpr *E) {
return UnresolvedLookupExpr::Create(
Importer.getToContext(), *ToNamingClassOrErr, *ToQualifierLocOrErr,
ToNameInfo, E->requiresADL(), E->isOverloaded(), ToDecls.begin(),
- ToDecls.end());
+ ToDecls.end(), /*KnownDependent=*/E->isTypeDependent());
}
ExpectedStmt
diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp
index a581963188433e..cb26e121004c3f 100644
--- a/clang/lib/AST/ExprCXX.cpp
+++ b/clang/lib/AST/ExprCXX.cpp
@@ -374,14 +374,15 @@ UnresolvedLookupExpr *UnresolvedLookupExpr::Create(
const ASTContext &Context, CXXRecordDecl *NamingClass,
NestedNameSpecifierLoc QualifierLoc, const DeclarationNameInfo &NameInfo,
bool RequiresADL, bool Overloaded, UnresolvedSetIterator Begin,
- UnresolvedSetIterator End) {
+ UnresolvedSetIterator End, bool KnownDependent) {
unsigned NumResults = End - Begin;
unsigned Size = totalSizeToAlloc<DeclAccessPair, ASTTemplateKWAndArgsInfo,
TemplateArgumentLoc>(NumResults, 0, 0);
void *Mem = Context.Allocate(Size, alignof(UnresolvedLookupExpr));
- return new (Mem) UnresolvedLookupExpr(Context, NamingClass, QualifierLoc,
- SourceLocation(), NameInfo, RequiresADL,
- Overloaded, nullptr, Begin, End, false);
+ return new (Mem) UnresolvedLookupExpr(
+ Context, NamingClass, QualifierLoc,
+ /*TemplateKWLoc=*/SourceLocation(), NameInfo, RequiresADL, Overloaded,
+ /*TemplateArgs=*/nullptr, Begin, End, KnownDependent);
}
UnresolvedLookupExpr *UnresolvedLookupExpr::Create(
diff --git a/clang/lib/Sema/SemaCoroutine.cpp b/clang/lib/Sema/SemaCoroutine.cpp
index 736632857efc36..1580cccd351a79 100644
--- a/clang/lib/Sema/SemaCoroutine.cpp
+++ b/clang/lib/Sema/SemaCoroutine.cpp
@@ -823,7 +823,7 @@ ExprResult Sema::BuildOperatorCoawaitLookupExpr(Scope *S, SourceLocation Loc) {
Expr *CoawaitOp = UnresolvedLookupExpr::Create(
Context, /*NamingClass*/ nullptr, NestedNameSpecifierLoc(),
DeclarationNameInfo(OpName, Loc), /*RequiresADL*/ true, IsOverloaded,
- Functions.begin(), Functions.end());
+ Functions.begin(), Functions.end(), /*KnownDependent=*/false);
assert(CoawaitOp);
return CoawaitOp;
}
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index af6b3f21f15a65..74b23005fa9fd6 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1241,7 +1241,7 @@ Sema::NameClassification Sema::ClassifyName(Scope *S, CXXScopeSpec &SS,
return NameClassification::OverloadSet(UnresolvedLookupExpr::Create(
Context, Result.getNamingClass(), SS.getWithLocInContext(Context),
Result.getLookupNameInfo(), ADL, Result.isOverloadedResult(),
- Result.begin(), Result.end()));
+ Result.begin(), Result.end(), /*KnownDependent=*/false));
}
ExprResult
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index d2c77ad61644f0..bedc9cd207a920 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -2918,26 +2918,9 @@ Sema::ActOnIdExpression(Scope *S, CXXScopeSpec &SS,
// to get this right here so that we don't end up making a
// spuriously dependent expression if we're inside a dependent
// instance method.
- if (getLangOpts().CPlusPlus && !R.empty() &&
- (*R.begin())->isCXXClassMember()) {
- bool MightBeImplicitMember;
- if (!IsAddressOfOperand)
- MightBeImplicitMember = true;
- else if (!SS.isEmpty())
- MightBeImplicitMember = false;
- else if (R.isOverloadedResult())
- MightBeImplicitMember = false;
- else if (R.isUnresolvableResult())
- MightBeImplicitMember = true;
- else
- MightBeImplicitMember = isa<FieldDecl>(R.getFoundDecl()) ||
- isa<IndirectFieldDecl>(R.getFoundDecl()) ||
- isa<MSPropertyDecl>(R.getFoundDecl());
-
- if (MightBeImplicitMember)
- return BuildPossibleImplicitMemberExpr(SS, TemplateKWLoc,
- R, TemplateArgs, S);
- }
+ if (isPotentialImplicitMemberAccess(SS, R, IsAddressOfOperand))
+ return BuildPossibleImplicitMemberExpr(SS, TemplateKWLoc, R, TemplateArgs,
+ S);
if (TemplateArgs || TemplateKWLoc.isValid()) {
@@ -3448,10 +3431,11 @@ static bool ShouldLookupResultBeMultiVersionOverload(const LookupResult &R) {
ExprResult Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS,
LookupResult &R, bool NeedsADL,
- bool AcceptInvalidDecl) {
+ bool AcceptInvalidDecl,
+ bool NeedUnresolved) {
// If this is a single, fully-resolved result and we don't need ADL,
// just build an ordinary singleton decl ref.
- if (!NeedsADL && R.isSingleResult() &&
+ if (!NeedUnresolved && !NeedsADL && R.isSingleResult() &&
!R.getAsSingle<FunctionTemplateDecl>() &&
!ShouldLookupResultBeMultiVersionOverload(R))
return BuildDeclarationNameExpr(SS, R.getLookupNameInfo(), R.getFoundDecl(),
@@ -3471,12 +3455,10 @@ ExprResult Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS,
// we've picked a target.
R.suppressDiagnostics();
- UnresolvedLookupExpr *ULE
- = UnresolvedLookupExpr::Create(Context, R.getNamingClass(),
- SS.getWithLocInContext(Context),
- R.getLookupNameInfo(),
- NeedsADL, R.isOverloadedResult(),
- R.begin(), R.end());
+ UnresolvedLookupExpr *ULE = UnresolvedLookupExpr::Create(
+ Context, R.getNamingClass(), SS.getWithLocInContext(Context),
+ R.getLookupNameInfo(), NeedsADL, R.isOverloadedResult(), R.begin(),
+ R.end(), NeedUnresolved);
return ULE;
}
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 7582cbd75fec05..779a41620033dc 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -1416,26 +1416,42 @@ bool Sema::CheckCXXThisCapture(SourceLocation Loc, const bool Explicit,
}
ExprResult Sema::ActOnCXXThis(SourceLocation Loc) {
- /// C++ 9.3.2: In the body of a non-static member function, the keyword this
- /// is a non-lvalue expression whose value is the address of the object for
- /// which the function is called.
+ // C++20 [expr.prim.this]p1:
+ // The keyword this names a pointer to the object for which an
+ // implicit object member function is invoked or a non-static
+ // data member's initializer is evaluated.
QualType ThisTy = getCurrentThisType();
- if (ThisTy.isNull()) {
- DeclContext *DC = getFunctionLevelDeclContext();
+ if (CheckCXXThisType(Loc, ThisTy))
+ return ExprError();
- if (const auto *Method = dyn_cast<CXXMethodDecl>(DC);
- Method && Method->isExplicitObjectMemberFunction()) {
- return Diag(Loc, diag::err_invalid_this_use) << 1;
- }
+ return BuildCXXThisExpr(Loc, ThisTy, /*IsImplicit=*/false);
+}
- if (isLambdaCallWithExplicitObjectParameter(CurContext))
- return Diag(Loc, diag::err_invalid_this_use) << 1;
+bool Sema::CheckCXXThisType(SourceLocation Loc, QualType Type) {
+ if (!Type.isNull())
+ return false;
- return Diag(Loc, diag::err_invalid_this_use) << 0;
+ // C++20 [expr.prim.this]p3:
+ // If a declaration declares a member function or member function template
+ // of a class X, the expression this is a prvalue of type
+ // "pointer to cv-qualifier-seq X" wherever X is the current class between
+ // the optional cv-qualifier-seq and the end of the function-definition,
+ // member-declarator, or declarator. It shall not appear within the
+ // declaration of either a static member function or an explicit object
+ // member function of the current class (although its type and value
+ // category are defined within such member functions as they are within
+ // an implicit object member function).
+ DeclContext *DC = getFunctionLevelDeclContext();
+ if (const auto *Method = dyn_cast<CXXMethodDecl>(DC);
+ Method && Method->isExplicitObjectMemberFunction()) {
+ Diag(Loc, diag::err_invalid_this_use) << 1;
+ } else if (isLambdaCallWithExplicitObjectParameter(CurContext)) {
+ Diag(Loc, diag::err_invalid_this_use) << 1;
+ } else {
+ Diag(Loc, diag::err_invalid_this_use) << 0;
}
-
- return BuildCXXThisExpr(Loc, ThisTy, /*IsImplicit=*/false);
+ return true;
}
Expr *Sema::BuildCXXThisExpr(SourceLocation Loc, QualType Type,
@@ -8644,21 +8660,8 @@ static ExprResult attemptRecovery(Sema &SemaRef,
// Detect and handle the case where the decl might be an implicit
// member.
- bool MightBeImplicitMember;
- if (!Consumer.isAddressOfOperand())
- MightBeImplicitMember = true;
- else if (!NewSS.isEmpty())
- MightBeImplicitMember = false;
- else if (R.isOverloadedResult())
- MightBeImplicitMember = false;
- else if (R.isUnresolvableResult())
- MightBeImplicitMember = true;
- else
- MightBeImplicitMember = isa<FieldDecl>(ND) ||
- isa<IndirectFieldDecl>(ND) ||
- isa<MSPropertyDecl>(ND);
-
- if (MightBeImplicitMember)
+ if (SemaRef.isPotentialImplicitMemberAccess(
+ NewSS, R, Consumer.isAddressOfOperand()))
return SemaRef.BuildPossibleImplicitMemberExpr(
NewSS, /*TemplateKWLoc*/ SourceLocation(), R,
/*TemplateArgs*/ nullptr, /*S*/ nullptr);
diff --git a/clang/lib/Sema/SemaExprMember.cpp b/clang/lib/Sema/SemaExprMember.cpp
index c79128bc8f39e7..ad74859797a6a2 100644
--- a/clang/lib/Sema/SemaExprMember.cpp
+++ b/clang/lib/Sema/SemaExprMember.cpp
@@ -62,6 +62,10 @@ enum IMAKind {
/// The reference is a contextually-permitted abstract member reference.
IMA_Abstract,
+ /// Whether the context is static is dependent on the enclosing template (i.e.
+ /// in a dependent class scope explicit specialization).
+ IMA_Dependent,
+
/// The reference may be to an unresolved using declaration and the
/// context is not an instance method.
IMA_Unresolved_StaticOrExplicitContext,
@@ -92,10 +96,18 @@ static IMAKind ClassifyImplicitMemberAccess(Sema &SemaRef,
DeclContext *DC = SemaRef.getFunctionLevelDeclContext();
- bool isStaticOrExplicitContext =
- SemaRef.CXXThisTypeOverride.isNull() &&
- (!isa<CXXMethodDecl>(DC) || cast<CXXMethodDecl>(DC)->isStatic() ||
- cast<CXXMethodDecl>(DC)->isExplicitObjectMemberFunction());
+ bool couldInstantiateToStatic = false;
+ bool isStaticOrExplicitContext = SemaRef.CXXThisTypeOverride.isNull();
+
+ if (auto *MD = dyn_cast<CXXMethodDecl>(DC)) {
+ if (MD->isImplicitObjectMemberFunction()) {
+ isStaticOrExplicitContext = false;
+ // A dependent class scope function template explicit specialization
+ // that is neither declared 'static' nor with an explicit object
+ // parameter could instantiate to a static or non-static member function.
+ couldInstantiateToStatic = MD->getDependentSpecializationInfo();
+ }
+ }
if (R.isUnresolvableResult())
return isStaticOrExplicitContext ? IMA_Unresolved_StaticOrExplicitContext
@@ -124,6 +136,9 @@ static IMAKind ClassifyImplicitMemberAccess(Sema &SemaRef,
if (Classes.empty())
return IMA_Static;
+ if (couldInstantiateToStatic)
+ return IMA_Dependent;
+
// C++11 [expr.prim.general]p12:
// An id-expression that denotes a non-static data member or non-static
// member function of a class can only be used:
@@ -264,32 +279,52 @@ static void diagnoseInstanceReference(Sema &SemaRef,
}
}
+bool Sema::isPotentialImplicitMemberAccess(const CXXScopeSpec &SS,
+ LookupResult &R,
+ bool IsAddressOfOperand) {
+ if (!getLangOpts().CPlusPlus)
+ return false;
+ else if (R.empty() || !R.begin()->isCXXClassMember())
+ return false;
+ else if (!IsAddressOfOperand)
+ return true;
+ else if (!SS.isEmpty())
+ return false;
+ else if (R.isOverloadedResult())
+ return false;
+ else if (R.isUnresolvableResult())
+ return true;
+ else
+ return isa<FieldDecl, IndirectFieldDecl, MSPropertyDecl>(R.getFoundDecl());
+}
+
/// Builds an expression which might be an implicit member expression.
ExprResult Sema::BuildPossibleImplicitMemberExpr(
const CXXScopeSpec &SS, SourceLocation TemplateKWLoc, LookupResult &R,
- const TemplateArgumentListInfo *TemplateArgs, const Scope *S,
- UnresolvedLookupExpr *AsULE) {
- switch (ClassifyImplicitMemberAccess(*this, R)) {
+ const TemplateArgumentListInfo *TemplateArgs, const Scope *S) {
+ switch (IMAKind Classification = ClassifyImplicitMemberAccess(*this, R)) {
case IMA_Instance:
- return BuildImplicitMemberExpr(SS, TemplateKWLoc, R, TemplateArgs, true, S);
-
case IMA_Mixed:
case IMA_Mixed_Unrelated:
case IMA_Unresolved:
- return BuildImplicitMemberExpr(SS, TemplateKWLoc, R, TemplateArgs, false,
- S);
-
+ return BuildImplicitMemberExpr(
+ SS, TemplateKWLoc, R, TemplateArgs,
+ /*IsKnownInstance=*/Classification == IMA_Instance, S);
case IMA_Field_Uneval_Context:
Diag(R.getNameLoc(), diag::warn_cxx98_compat_non_static_member_use)
<< R.getLookupNameInfo().getName();
[[fallthrough]];
case IMA_Static:
case IMA_Abstract:
+ case IMA_Dependent:
case IMA_Mixed_StaticOrExplicitContext:
case IMA_Unresolved_StaticOrExplicitContext:
if (TemplateArgs || TemplateKWLoc.isValid())
- return BuildTemplateIdExpr(SS, TemplateKWLoc, R, false, TemplateArgs);
- return AsULE ? AsULE : BuildDeclarationNameExpr(SS, R, false);
+ return BuildTemplateIdExpr(SS, TemplateKWLoc, R, /*RequiresADL=*/false,
+ TemplateArgs);
+ return BuildDeclarationNameExpr(
+ SS, R, /*NeedsADL=*/false, /*AcceptInvalidDecl=*/false,
+ /*NeedUnresolved=*/Classification == IMA_Dependent);
case IMA_Error_StaticOrExplicitContext:
case IMA_Error_Unrelated:
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 3e9f6cba25076d..2deb7a1883e9b3 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -19354,7 +19354,8 @@ buildDeclareReductionRef(Sema &SemaRef, SourceLocation Loc, SourceRange Range,
return UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), ReductionId,
- /*ADL=*/true, /*Overloaded=*/true, ResSet.begin(), ResSet.end());
+ /*ADL=*/true, /*Overloaded=*/true, ResSet.begin(), ResSet.end(),
+ /*KnownDependent=*/false);
}
// Lookup inside the classes.
// C++ [over.match.oper]p3:
@@ -22220,7 +22221,8 @@ static ExprResult buildUserDefinedMapperRef(Sema &SemaRef, Scope *S,
return UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
MapperIdScopeSpec.getWithLocInContext(SemaRef.Context), MapperId,
- /*ADL=*/false, /*Overloaded=*/true, URS.begin(), URS.end());
+ /*ADL=*/false, /*Overloaded=*/true, URS.begin(), URS.end(),
+ /*KnownDependent=*/false);
}
SourceLocation Loc = MapperId.getLoc();
// [OpenMP 5.0], 2.19.7.3 declare mapper Directive, Restrictions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index adc319e97b7625..47192b994477da 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -14271,7 +14271,8 @@ ExprResult Sema::CreateUnresolvedLookupExpr(CXXRecordDecl *NamingClass,
bool PerformADL) {
return UnresolvedLookupExpr::Create(Context, NamingClass, NNSLoc, DNI,
PerformADL, IsOverloaded(Fns),
- Fns.begin(), Fns.end());
+ Fns.begin(), Fns.end(),
+ /*KnownDependent=*/false);
}
ExprResult Sema::BuildCXXMemberCallExpr(Expr *E, NamedDecl *FoundDecl,
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index caa07abb61fe34..787a485e0b2f8c 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -5101,6 +5101,14 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation,
EnterExpressionEvaluationContext EvalContext(
*this, Sema::ExpressionEvaluationContext::PotentiallyEvaluated);
+ Qualifiers ThisTypeQuals;
+ CXXRecordDecl *ThisContext = nullptr;
+ if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(Function)) {
+ ThisContext = Method->getParent();
+ ThisTypeQuals = Method->getMethodQualifiers();
+ }
+ CXXThisScopeRAII ThisScope(*this, ThisContext, ThisTypeQuals);
+
// Introduce a new scope where local variable instantiations will be
// recorded, unless we're actually a member function within a local
// class, in which case we need to merge our results with the parent
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index eb05783a6219dc..0fc702464a8890 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -796,6 +796,9 @@ class TreeTransform {
ParenExpr *PE, DependentScopeDeclRefExpr *DRE, bool IsAddressOfOperand,
TypeSourceInfo **RecoveryTSI);
+ ExprResult TransformUnresolvedLookupExpr(UnresolvedLookupExpr *E,
+ bool IsAddressOfOperand);
+
StmtResult TransformOMPExecutableDirective(OMPExecutableDirective *S);
// FIXME: We use LLVM_ATTRIBUTE_NOINLINE because inlining causes a ridiculous
@@ -3320,12 +3323,13 @@ class TreeTransform {
/// Build a new C++ "this" expression.
///
- /// By default, builds a new "this" expression without performing any
- /// semantic analysis. Subclasses may override this routine to provide
- /// different behavior.
+ /// By default, performs semantic analysis to build a new "this" expression.
+ /// Subclasses may override this routine to provide different behavior.
ExprResult RebuildCXXThisExpr(SourceLocation ThisLoc,
QualType ThisType,
bool isImplicit) {
+ if (getSema().CheckCXXThisType(ThisLoc, ThisType))
+ return ExprError();
return getSema().BuildCXXThisExpr(ThisLoc, ThisType, isImplicit);
}
@@ -10429,12 +10433,11 @@ TreeTransform<Derived>::TransformOMPReductionClause(OMPReductionClause *C) {
cast<NamedDecl>(getDerived().TransformDecl(E->getExprLoc(), D));
Decls.addDecl(InstD, InstD->getAccess());
}
- UnresolvedReductions.push_back(
- UnresolvedLookupExpr::Create(
+ UnresolvedReductions.push_back(UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
- ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context),
- NameInfo, /*ADL=*/true, ULE->isOverloaded(),
- Decls.begin(), Decls.end()));
+ ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), NameInfo,
+ /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end(),
+ /*KnownDependent=*/false));
} else
UnresolvedReductions.push_back(nullptr);
}
@@ -10480,7 +10483,8 @@ OMPClause *TreeTransform<Derived>::TransformOMPTaskReductionClause(
UnresolvedReductions.push_back(UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), NameInfo,
- /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end()));
+ /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end(),
+ /*KnownDependent=*/false));
} else
UnresolvedReductions.push_back(nullptr);
}
@@ -10525,7 +10529,8 @@ TreeTransform<Derived>::TransformOMPInReductionClause(OMPInReductionClause *C) {
UnresolvedReductions.push_back(UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), NameInfo,
- /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end()));
+ /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end(),
+ /*KnownDependent=*/false));
} else
UnresolvedReductions.push_back(nullptr);
}
@@ -10707,7 +10712,7 @@ bool transformOMPMappableExprListClause(
TT.getSema().Context, /*NamingClass=*/nullptr,
MapperIdScopeSpec.getWithLocInContext(TT.getSema().Context),
MapperIdInfo, /*ADL=*/true, ULE->isOverloaded(), Decls.begin(),
- Decls.end()));
+ Decls.end(), /*KnownDependent=*/false));
} else {
UnresolvedMappers.push_back(nullptr);
}
@@ -11421,7 +11426,11 @@ template<typename Derived>
ExprResult
TreeTransform<Derived>::TransformAddressOfOperand(Expr *E) {
if (DependentScopeDeclRefExpr *DRE = dyn_cast<DependentScopeDeclRefExpr>(E))
- return getDerived().TransformDependentScopeDeclRefExpr(DRE, true, nullptr);
+ return getDerived().TransformDependentScopeDeclRefExpr(
+ DRE, /*IsAddressOfOperand=*/true, nullptr);
+ else if (UnresolvedLookupExpr *ULE = dyn_cast<UnresolvedLookupExpr>(E))
+ return getDerived().TransformUnresolvedLookupExpr(
+ ULE, /*IsAddressOfOperand=*/true);
else
return getDerived().TransformExpr(E);
}
@@ -13128,10 +13137,16 @@ bool TreeTransform<Derived>::TransformOverloadExprDecls(OverloadExpr *Old,
return false;
}
-template<typename Derived>
+template <typename Derived>
+ExprResult TreeTransform<Derived>::TransformUnresolvedLookupExpr(
+ UnresolvedLookupExpr *Old) {
+ return TransformUnresolvedLookupExpr(Old, /*IsAddressOfOperand=*/false);
+}
+
+template <typename Derived>
ExprResult
-TreeTransform<Derived>::TransformUnresolvedLookupExpr(
- UnresolvedLookupExpr *Old) {
+TreeTransform<Derived>::TransformUnresolvedLookupExpr(UnresolvedLookupExpr *Old,
+ bool IsAddressOfOperand) {
LookupResult R(SemaRef, Old->getName(), Old->getNameLoc(),
Sema::LookupOrdinaryName);
@@ -13163,26 +13178,8 @@ TreeTransform<Derived>::TransformUnresolvedLookupExpr(
R.setNamingClass(NamingClass);
}
+ // Rebuild the template arguments, if any.
SourceLocation TemplateKWLoc = Old->getTemplateKeywordLoc();
-
- // If we have neither explicit template arguments, nor the template keyword,
- // it's a normal declaration name or member reference.
- if (!Old->hasExplicitTemplateArgs() && !TemplateKWLoc.isValid()) {
- NamedDecl *D = R.getAsSingle<NamedDecl>();
- // In a C++11 unevaluated context, an UnresolvedLookupExpr might refer to an
- // instance member. In other contexts, BuildPossibleImplicitMemberExpr will
- // give a good diagnostic.
- if (D && D->isCXXInstanceMember()) {
- return SemaRef.BuildPossibleImplicitMemberExpr(SS, TemplateKWLoc, R,
- /*TemplateArgs=*/nullptr,
- /*Scope=*/nullptr);
- }
-
- return getDerived().RebuildDeclarationNameExpr(SS, R, Old->requiresADL());
- }
-
- // If we have template arguments, rebuild them, then rebuild the
- // templateid expression.
TemplateArgumentListInfo TransArgs(Old->getLAngleLoc(), Old->getRAngleLoc());
if (Old->hasExplicitTemplateArgs() &&
getDerived().TransformTemplateArguments(Old->getTemplateArgs(),
@@ -13192,6 +13189,23 @@ TreeTransform<Derived>::TransformUnresolvedLookupExpr(
return ExprError();
}
+ // An UnresolvedLookupExpr can refer to a class member. This occurs e.g. when
+ // a non-static data member is named in an unevaluated operand, or when
+ // a member is named in a dependent class scope function template explicit
+ // specialization that is neither declared static nor with an explicit object
+ // parameter.
+ if (SemaRef.isPotentialImplicitMemberAccess(SS, R, IsAddressOfOperand))
+ return SemaRef.BuildPossibleImplicitMemberExpr(
+ SS, TemplateKWLoc, R,
+ Old->hasExplicitTemplateArgs() ? &TransArgs : nullptr,
+ /*S=*/nullptr);
+
+ // If we have neither explicit template arguments, nor the template keyword,
+ // it's a normal declaration name or member reference.
+ if (!Old->hasExplicitTemplateArgs() && !TemplateKWLoc.isValid())
+ return getDerived().RebuildDeclarationNameExpr(SS, R, Old->requiresADL());
+
+ // If we have template arguments, then rebuild the template-id expression.
return getDerived().RebuildTemplateIdExpr(SS, TemplateKWLoc, R,
Old->requiresADL(), &TransArgs);
}
diff --git a/clang/test/SemaTemplate/instantiate-using-decl.cpp b/clang/test/SemaTemplate/instantiate-using-decl.cpp
index 0bbb3ca9c88c8b..28d83764385131 100644
--- a/clang/test/SemaTemplate/instantiate-using-decl.cpp
+++ b/clang/test/SemaTemplate/instantiate-using-decl.cpp
@@ -121,7 +121,7 @@ template <typename Scalar> struct Derived : Base<Scalar> {
(void)&field;
// expected-error at +1 {{call to non-static member function without an object argument}}
(void)method;
- // expected-error at +1 {{call to non-static member function without an object argument}}
+ // expected-error at +1 {{must explicitly qualify name of member function when taking its address}}
(void)&method;
// expected-error at +1 {{call to non-static member function without an object argument}}
method();
diff --git a/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp b/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
index dcab9bfaeabcb0..76e84e2bcbda7f 100644
--- a/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
+++ b/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
@@ -1,7 +1,6 @@
-// RUN: %clang_cc1 -fms-extensions -fsyntax-only -verify %s
-// RUN: %clang_cc1 -fms-extensions -fdelayed-template-parsing -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fms-extensions -fsyntax-only -Wno-unused-value -verify %s
+// RUN: %clang_cc1 -fms-extensions -fdelayed-template-parsing -fsyntax-only -Wno-unused-value -verify %s
-// expected-no-diagnostics
class A {
public:
template<class U> A(U p) {}
@@ -76,3 +75,199 @@ struct S {
int f<0>(int);
};
}
+
+namespace UsesThis {
+ template<typename T>
+ struct A {
+ int x;
+
+ static inline int y;
+
+ template<typename U = void>
+ static void f();
+
+ template<typename U = void>
+ void g();
+
+ template<typename U>
+ static auto h() -> A*;
+
+ void i();
+
+ static void j();
+
+ template<>
+ void f<int>() {
+ this->x; // expected-error {{invalid use of 'this' outside of a non-static member function}}
+ x; // expected-error {{invalid use of member 'x' in static member function}}
+ A::x; // expected-error {{invalid use of member 'x' in static member function}}
+ +x; // expected-error {{invalid use of member 'x' in static member function}}
+ +A::x; // expected-error {{invalid use of member 'x' in static member function}}
+ &x; // expected-error {{invalid use of member 'x' in static member function}}
+ &A::x;
+ this->y; // expected-error {{invalid use of 'this' outside of a non-static member function}}
+ y;
+ A::y;
+ +y;
+ +A::y;
+ &y;
+ &A::y;
+ f();
+ f<void>();
+ g(); // expected-error {{call to non-static member function without an object argument}}
+ g<void>(); // expected-error {{call to non-static member function without an object argument}}
+ i(); // expected-error {{call to non-static member function without an object argument}}
+ j();
+ &i; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &j;
+ &A::i;
+ &A::j;
+ }
+
+ template<>
+ void g<int>() {
+ this->x;
+ x;
+ A::x;
+ +x;
+ +A::x;
+ &x;
+ &A::x;
+ this->y;
+ y;
+ A::y;
+ +y;
+ +A::y;
+ &y;
+ &A::y;
+ f();
+ f<void>();
+ g();
+ g<void>();
+ i();
+ j();
+ &i; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &j;
+ &A::i;
+ &A::j;
+ }
+
+ template<>
+ auto h<int>() -> decltype(this); // expected-error {{'this' cannot be used in a static member function declaration}}
+ };
+
+ template struct A<int>; // expected-note 3{{in instantiation of}}
+
+ template <typename T>
+ struct Foo {
+ template <typename X>
+ int bar(X x) {
+ return 0;
+ }
+
+ template <>
+ int bar(int x) {
+ return bar(5.0); // ok
+ }
+ };
+
+ void call() {
+ Foo<double> f;
+ f.bar(1);
+ }
+
+ struct B {
+ int x0;
+ static inline int y0;
+
+ int f0(int);
+ static int g0(int);
+ };
+
+ template<typename T>
+ struct D : B {
+ int x1;
+ static inline int y1;
+
+ int f1(int);
+ static int g1(int);
+
+ template<typename U>
+ void non_static_spec(U);
+
+ template<typename U>
+ static void static_spec(U);
+
+ template<>
+ void non_static_spec(int z) {
+ ++z;
+ ++x0;
+ ++x1;
+ ++y0;
+ ++y1;
+
+ f0(0);
+ f0(z);
+ f0(x0);
+ f0(x1);
+ f0(y0);
+ f0(y1);
+ g0(0);
+ g0(z);
+ g0(x0);
+ g0(x1);
+ g0(y0);
+ g0(y1);
+
+ f1(0);
+ f1(z);
+ f1(x0);
+ f1(x1);
+ f1(y0);
+ f1(y1);
+ g1(0);
+ g1(z);
+ g1(x0);
+ g1(x1);
+ g1(y0);
+ g1(y1);
+ }
+
+ template<>
+ void static_spec(int z) {
+ ++z;
+ ++x0; // expected-error {{invalid use of member 'x0' in static member function}}
+ ++x1; // expected-error {{invalid use of member 'x1' in static member function}}
+ ++y0;
+ ++y1;
+
+ f0(0); // expected-error {{call to non-static member function without an object argument}}
+ f0(z); // expected-error {{call to non-static member function without an object argument}}
+ f0(x0); // expected-error {{call to non-static member function without an object argument}}
+ f0(x1); // expected-error {{call to non-static member function without an object argument}}
+ f0(y0); // expected-error {{call to non-static member function without an object argument}}
+ f0(y1); // expected-error {{call to non-static member function without an object argument}}
+ g0(0);
+ g0(z);
+ g0(x0); // expected-error {{invalid use of member 'x0' in static member function}}
+ g0(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g0(y0);
+ g0(y1);
+
+ f1(0); // expected-error {{call to non-static member function without an object argument}}
+ f1(z); // expected-error {{call to non-static member function without an object argument}}
+ f1(x0); // expected-error {{call to non-static member function without an object argument}}
+ f1(x1); // expected-error {{call to non-static member function without an object argument}}
+ f1(y0); // expected-error {{call to non-static member function without an object argument}}
+ f1(y1); // expected-error {{call to non-static member function without an object argument}}
+ g1(0);
+ g1(z);
+ g1(x0); // expected-error {{invalid use of member 'x0' in static member function}}
+ g1(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g1(y0);
+ g1(y1);
+ }
+ };
+
+ template struct D<int>; // expected-note {{in instantiation of}}
+}
>From 662c573fbf5d976ab80fe68a7b50724cd769e687 Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian at gmail.com>
Date: Mon, 15 Apr 2024 11:29:14 -0400
Subject: [PATCH 2/5] [FOLD] remove UnresolvedLookupExpr::isOverloaded
---
clang/include/clang/AST/ExprCXX.h | 6 +-----
clang/include/clang/AST/Stmt.h | 5 -----
clang/lib/AST/ASTImporter.cpp | 4 ++--
clang/lib/AST/ExprCXX.cpp | 13 ++++++-------
clang/lib/Sema/SemaCoroutine.cpp | 5 +----
clang/lib/Sema/SemaDecl.cpp | 4 ++--
clang/lib/Sema/SemaDeclCXX.cpp | 2 +-
clang/lib/Sema/SemaExpr.cpp | 3 +--
clang/lib/Sema/SemaOpenMP.cpp | 6 ++----
clang/lib/Sema/SemaOverload.cpp | 3 +--
clang/lib/Sema/TreeTransform.h | 10 +++++-----
clang/lib/Serialization/ASTReaderStmt.cpp | 1 -
clang/lib/Serialization/ASTWriterStmt.cpp | 1 -
13 files changed, 22 insertions(+), 41 deletions(-)
diff --git a/clang/include/clang/AST/ExprCXX.h b/clang/include/clang/AST/ExprCXX.h
index 4d5293566580ae..a915745d2d7322 100644
--- a/clang/include/clang/AST/ExprCXX.h
+++ b/clang/include/clang/AST/ExprCXX.h
@@ -3198,7 +3198,6 @@ class UnresolvedLookupExpr final
NestedNameSpecifierLoc QualifierLoc,
SourceLocation TemplateKWLoc,
const DeclarationNameInfo &NameInfo, bool RequiresADL,
- bool Overloaded,
const TemplateArgumentListInfo *TemplateArgs,
UnresolvedSetIterator Begin, UnresolvedSetIterator End,
bool KnownDependent);
@@ -3218,7 +3217,7 @@ class UnresolvedLookupExpr final
static UnresolvedLookupExpr *
Create(const ASTContext &Context, CXXRecordDecl *NamingClass,
NestedNameSpecifierLoc QualifierLoc,
- const DeclarationNameInfo &NameInfo, bool RequiresADL, bool Overloaded,
+ const DeclarationNameInfo &NameInfo, bool RequiresADL,
UnresolvedSetIterator Begin, UnresolvedSetIterator End,
bool KnownDependent);
@@ -3241,9 +3240,6 @@ class UnresolvedLookupExpr final
/// argument-dependent lookup.
bool requiresADL() const { return UnresolvedLookupExprBits.RequiresADL; }
- /// True if this lookup is overloaded.
- bool isOverloaded() const { return UnresolvedLookupExprBits.Overloaded; }
-
/// Gets the 'naming class' (in the sense of C++0x
/// [class.access.base]p5) of the lookup. This is the scope
/// that was looked in to find these results.
diff --git a/clang/include/clang/AST/Stmt.h b/clang/include/clang/AST/Stmt.h
index 1b9c9231047717..9cd7a364cd3f1d 100644
--- a/clang/include/clang/AST/Stmt.h
+++ b/clang/include/clang/AST/Stmt.h
@@ -1067,11 +1067,6 @@ class alignas(void *) Stmt {
/// argument-dependent lookup if this is the operand of a function call.
LLVM_PREFERRED_TYPE(bool)
unsigned RequiresADL : 1;
-
- /// True if these lookup results are overloaded. This is pretty trivially
- /// rederivable if we urgently need to kill this field.
- LLVM_PREFERRED_TYPE(bool)
- unsigned Overloaded : 1;
};
static_assert(sizeof(UnresolvedLookupExprBitfields) <= 4,
"UnresolvedLookupExprBitfields must be <= than 4 bytes to"
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index 0928e6cd2b37a8..899df1b9f15477 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -8561,8 +8561,8 @@ ASTNodeImporter::VisitUnresolvedLookupExpr(UnresolvedLookupExpr *E) {
return UnresolvedLookupExpr::Create(
Importer.getToContext(), *ToNamingClassOrErr, *ToQualifierLocOrErr,
- ToNameInfo, E->requiresADL(), E->isOverloaded(), ToDecls.begin(),
- ToDecls.end(), /*KnownDependent=*/E->isTypeDependent());
+ ToNameInfo, E->requiresADL(), ToDecls.begin(), ToDecls.end(),
+ /*KnownDependent=*/E->isTypeDependent());
}
ExpectedStmt
diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp
index cb26e121004c3f..1651d2ccc2fc16 100644
--- a/clang/lib/AST/ExprCXX.cpp
+++ b/clang/lib/AST/ExprCXX.cpp
@@ -353,7 +353,7 @@ SourceLocation CXXPseudoDestructorExpr::getEndLoc() const {
UnresolvedLookupExpr::UnresolvedLookupExpr(
const ASTContext &Context, CXXRecordDecl *NamingClass,
NestedNameSpecifierLoc QualifierLoc, SourceLocation TemplateKWLoc,
- const DeclarationNameInfo &NameInfo, bool RequiresADL, bool Overloaded,
+ const DeclarationNameInfo &NameInfo, bool RequiresADL,
const TemplateArgumentListInfo *TemplateArgs, UnresolvedSetIterator Begin,
UnresolvedSetIterator End, bool KnownDependent)
: OverloadExpr(UnresolvedLookupExprClass, Context, QualifierLoc,
@@ -361,7 +361,6 @@ UnresolvedLookupExpr::UnresolvedLookupExpr(
KnownDependent, false, false),
NamingClass(NamingClass) {
UnresolvedLookupExprBits.RequiresADL = RequiresADL;
- UnresolvedLookupExprBits.Overloaded = Overloaded;
}
UnresolvedLookupExpr::UnresolvedLookupExpr(EmptyShell Empty,
@@ -373,15 +372,15 @@ UnresolvedLookupExpr::UnresolvedLookupExpr(EmptyShell Empty,
UnresolvedLookupExpr *UnresolvedLookupExpr::Create(
const ASTContext &Context, CXXRecordDecl *NamingClass,
NestedNameSpecifierLoc QualifierLoc, const DeclarationNameInfo &NameInfo,
- bool RequiresADL, bool Overloaded, UnresolvedSetIterator Begin,
- UnresolvedSetIterator End, bool KnownDependent) {
+ bool RequiresADL, UnresolvedSetIterator Begin, UnresolvedSetIterator End,
+ bool KnownDependent) {
unsigned NumResults = End - Begin;
unsigned Size = totalSizeToAlloc<DeclAccessPair, ASTTemplateKWAndArgsInfo,
TemplateArgumentLoc>(NumResults, 0, 0);
void *Mem = Context.Allocate(Size, alignof(UnresolvedLookupExpr));
return new (Mem) UnresolvedLookupExpr(
Context, NamingClass, QualifierLoc,
- /*TemplateKWLoc=*/SourceLocation(), NameInfo, RequiresADL, Overloaded,
+ /*TemplateKWLoc=*/SourceLocation(), NameInfo, RequiresADL,
/*TemplateArgs=*/nullptr, Begin, End, KnownDependent);
}
@@ -399,8 +398,8 @@ UnresolvedLookupExpr *UnresolvedLookupExpr::Create(
TemplateArgumentLoc>(NumResults, 1, NumTemplateArgs);
void *Mem = Context.Allocate(Size, alignof(UnresolvedLookupExpr));
return new (Mem) UnresolvedLookupExpr(
- Context, NamingClass, QualifierLoc, TemplateKWLoc, NameInfo, RequiresADL,
- /*Overloaded=*/true, Args, Begin, End, KnownDependent);
+ Context, NamingClass, QualifierLoc, TemplateKWLoc, NameInfo,
+ RequiresADL, Args, Begin, End, KnownDependent);
}
UnresolvedLookupExpr *UnresolvedLookupExpr::CreateEmpty(
diff --git a/clang/lib/Sema/SemaCoroutine.cpp b/clang/lib/Sema/SemaCoroutine.cpp
index 1580cccd351a79..2fd077681b0ba4 100644
--- a/clang/lib/Sema/SemaCoroutine.cpp
+++ b/clang/lib/Sema/SemaCoroutine.cpp
@@ -817,12 +817,9 @@ ExprResult Sema::BuildOperatorCoawaitLookupExpr(Scope *S, SourceLocation Loc) {
assert(!Operators.isAmbiguous() && "Operator lookup cannot be ambiguous");
const auto &Functions = Operators.asUnresolvedSet();
- bool IsOverloaded =
- Functions.size() > 1 ||
- (Functions.size() == 1 && isa<FunctionTemplateDecl>(*Functions.begin()));
Expr *CoawaitOp = UnresolvedLookupExpr::Create(
Context, /*NamingClass*/ nullptr, NestedNameSpecifierLoc(),
- DeclarationNameInfo(OpName, Loc), /*RequiresADL*/ true, IsOverloaded,
+ DeclarationNameInfo(OpName, Loc), /*RequiresADL*/ true,
Functions.begin(), Functions.end(), /*KnownDependent=*/false);
assert(CoawaitOp);
return CoawaitOp;
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 74b23005fa9fd6..bd45e38117e918 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1240,8 +1240,8 @@ Sema::NameClassification Sema::ClassifyName(Scope *S, CXXScopeSpec &SS,
Result.suppressDiagnostics();
return NameClassification::OverloadSet(UnresolvedLookupExpr::Create(
Context, Result.getNamingClass(), SS.getWithLocInContext(Context),
- Result.getLookupNameInfo(), ADL, Result.isOverloadedResult(),
- Result.begin(), Result.end(), /*KnownDependent=*/false));
+ Result.getLookupNameInfo(), ADL, Result.begin(), Result.end(),
+ /*KnownDependent=*/false));
}
ExprResult
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 2ef8a15d5238fa..abdbc9d8830c03 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1302,7 +1302,7 @@ static bool checkTupleLikeDecomposition(Sema &S,
// in the associated namespaces.
Expr *Get = UnresolvedLookupExpr::Create(
S.Context, nullptr, NestedNameSpecifierLoc(), SourceLocation(),
- DeclarationNameInfo(GetDN, Loc), /*RequiresADL*/ true, &Args,
+ DeclarationNameInfo(GetDN, Loc), /*RequiresADL=*/true, &Args,
UnresolvedSetIterator(), UnresolvedSetIterator(),
/*KnownDependent=*/false);
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index bedc9cd207a920..8c1cdc6f141b47 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -3457,8 +3457,7 @@ ExprResult Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS,
UnresolvedLookupExpr *ULE = UnresolvedLookupExpr::Create(
Context, R.getNamingClass(), SS.getWithLocInContext(Context),
- R.getLookupNameInfo(), NeedsADL, R.isOverloadedResult(), R.begin(),
- R.end(), NeedUnresolved);
+ R.getLookupNameInfo(), NeedsADL, R.begin(), R.end(), NeedUnresolved);
return ULE;
}
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 2deb7a1883e9b3..5ba09926acf2b9 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -19354,8 +19354,7 @@ buildDeclareReductionRef(Sema &SemaRef, SourceLocation Loc, SourceRange Range,
return UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), ReductionId,
- /*ADL=*/true, /*Overloaded=*/true, ResSet.begin(), ResSet.end(),
- /*KnownDependent=*/false);
+ /*ADL=*/true, ResSet.begin(), ResSet.end(), /*KnownDependent=*/false);
}
// Lookup inside the classes.
// C++ [over.match.oper]p3:
@@ -22221,8 +22220,7 @@ static ExprResult buildUserDefinedMapperRef(Sema &SemaRef, Scope *S,
return UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
MapperIdScopeSpec.getWithLocInContext(SemaRef.Context), MapperId,
- /*ADL=*/false, /*Overloaded=*/true, URS.begin(), URS.end(),
- /*KnownDependent=*/false);
+ /*ADL=*/false, URS.begin(), URS.end(), /*KnownDependent=*/false);
}
SourceLocation Loc = MapperId.getLoc();
// [OpenMP 5.0], 2.19.7.3 declare mapper Directive, Restrictions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 47192b994477da..413dbe010ebab6 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -14270,8 +14270,7 @@ ExprResult Sema::CreateUnresolvedLookupExpr(CXXRecordDecl *NamingClass,
const UnresolvedSetImpl &Fns,
bool PerformADL) {
return UnresolvedLookupExpr::Create(Context, NamingClass, NNSLoc, DNI,
- PerformADL, IsOverloaded(Fns),
- Fns.begin(), Fns.end(),
+ PerformADL, Fns.begin(), Fns.end(),
/*KnownDependent=*/false);
}
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 0fc702464a8890..e42d8af1fca382 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -10436,7 +10436,7 @@ TreeTransform<Derived>::TransformOMPReductionClause(OMPReductionClause *C) {
UnresolvedReductions.push_back(UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), NameInfo,
- /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end(),
+ /*ADL=*/true, Decls.begin(), Decls.end(),
/*KnownDependent=*/false));
} else
UnresolvedReductions.push_back(nullptr);
@@ -10483,7 +10483,7 @@ OMPClause *TreeTransform<Derived>::TransformOMPTaskReductionClause(
UnresolvedReductions.push_back(UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), NameInfo,
- /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end(),
+ /*ADL=*/true, Decls.begin(), Decls.end(),
/*KnownDependent=*/false));
} else
UnresolvedReductions.push_back(nullptr);
@@ -10529,7 +10529,7 @@ TreeTransform<Derived>::TransformOMPInReductionClause(OMPInReductionClause *C) {
UnresolvedReductions.push_back(UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr,
ReductionIdScopeSpec.getWithLocInContext(SemaRef.Context), NameInfo,
- /*ADL=*/true, ULE->isOverloaded(), Decls.begin(), Decls.end(),
+ /*ADL=*/true, Decls.begin(), Decls.end(),
/*KnownDependent=*/false));
} else
UnresolvedReductions.push_back(nullptr);
@@ -10711,8 +10711,8 @@ bool transformOMPMappableExprListClause(
UnresolvedMappers.push_back(UnresolvedLookupExpr::Create(
TT.getSema().Context, /*NamingClass=*/nullptr,
MapperIdScopeSpec.getWithLocInContext(TT.getSema().Context),
- MapperIdInfo, /*ADL=*/true, ULE->isOverloaded(), Decls.begin(),
- Decls.end(), /*KnownDependent=*/false));
+ MapperIdInfo, /*ADL=*/true, Decls.begin(), Decls.end(),
+ /*KnownDependent=*/false));
} else {
UnresolvedMappers.push_back(nullptr);
}
diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp
index ca0460800898b3..baded0fe19831f 100644
--- a/clang/lib/Serialization/ASTReaderStmt.cpp
+++ b/clang/lib/Serialization/ASTReaderStmt.cpp
@@ -2096,7 +2096,6 @@ void ASTStmtReader::VisitUnresolvedMemberExpr(UnresolvedMemberExpr *E) {
void ASTStmtReader::VisitUnresolvedLookupExpr(UnresolvedLookupExpr *E) {
VisitOverloadExpr(E);
E->UnresolvedLookupExprBits.RequiresADL = CurrentUnpackingBits->getNextBit();
- E->UnresolvedLookupExprBits.Overloaded = CurrentUnpackingBits->getNextBit();
E->NamingClass = readDeclAs<CXXRecordDecl>();
}
diff --git a/clang/lib/Serialization/ASTWriterStmt.cpp b/clang/lib/Serialization/ASTWriterStmt.cpp
index a736a7b0ef726c..cd5f733baf76f4 100644
--- a/clang/lib/Serialization/ASTWriterStmt.cpp
+++ b/clang/lib/Serialization/ASTWriterStmt.cpp
@@ -2082,7 +2082,6 @@ void ASTStmtWriter::VisitUnresolvedMemberExpr(UnresolvedMemberExpr *E) {
void ASTStmtWriter::VisitUnresolvedLookupExpr(UnresolvedLookupExpr *E) {
VisitOverloadExpr(E);
CurrentPackingBits.addBit(E->requiresADL());
- CurrentPackingBits.addBit(E->isOverloaded());
Record.AddDeclRef(E->getNamingClass());
Code = serialization::EXPR_CXX_UNRESOLVED_LOOKUP;
}
>From f86c828108a070bcb9633861bd958294bfb067ad Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian at gmail.com>
Date: Mon, 15 Apr 2024 11:48:05 -0400
Subject: [PATCH 3/5] [FOLD]
---
clang/include/clang/Sema/Sema.h | 3 +--
clang/lib/AST/ExprCXX.cpp | 14 +++++++-------
clang/lib/Sema/SemaCoroutine.cpp | 4 ++--
clang/lib/Sema/SemaExpr.cpp | 8 ++++----
clang/lib/Sema/SemaExprMember.cpp | 12 ++++++++----
5 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 42c7e1ebe38d5c..c5d5b1b19651bc 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -5429,8 +5429,7 @@ class Sema final : public SemaBase {
ExprResult BuildDeclarationNameExpr(const CXXScopeSpec &SS, LookupResult &R,
bool NeedsADL,
- bool AcceptInvalidDecl = false,
- bool NeedUnresolved = false);
+ bool AcceptInvalidDecl = false);
ExprResult BuildDeclarationNameExpr(
const CXXScopeSpec &SS, const DeclarationNameInfo &NameInfo, NamedDecl *D,
NamedDecl *FoundD = nullptr,
diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp
index 1651d2ccc2fc16..7e9343271ac3cf 100644
--- a/clang/lib/AST/ExprCXX.cpp
+++ b/clang/lib/AST/ExprCXX.cpp
@@ -390,16 +390,16 @@ UnresolvedLookupExpr *UnresolvedLookupExpr::Create(
const DeclarationNameInfo &NameInfo, bool RequiresADL,
const TemplateArgumentListInfo *Args, UnresolvedSetIterator Begin,
UnresolvedSetIterator End, bool KnownDependent) {
- assert(Args || TemplateKWLoc.isValid());
unsigned NumResults = End - Begin;
+ bool HasTemplateKWAndArgsInfo = Args || TemplateKWLoc.isValid();
unsigned NumTemplateArgs = Args ? Args->size() : 0;
- unsigned Size =
- totalSizeToAlloc<DeclAccessPair, ASTTemplateKWAndArgsInfo,
- TemplateArgumentLoc>(NumResults, 1, NumTemplateArgs);
+ unsigned Size = totalSizeToAlloc<DeclAccessPair, ASTTemplateKWAndArgsInfo,
+ TemplateArgumentLoc>(
+ NumResults, HasTemplateKWAndArgsInfo, NumTemplateArgs);
void *Mem = Context.Allocate(Size, alignof(UnresolvedLookupExpr));
- return new (Mem) UnresolvedLookupExpr(
- Context, NamingClass, QualifierLoc, TemplateKWLoc, NameInfo,
- RequiresADL, Args, Begin, End, KnownDependent);
+ return new (Mem) UnresolvedLookupExpr(Context, NamingClass, QualifierLoc,
+ TemplateKWLoc, NameInfo, RequiresADL,
+ Args, Begin, End, KnownDependent);
}
UnresolvedLookupExpr *UnresolvedLookupExpr::CreateEmpty(
diff --git a/clang/lib/Sema/SemaCoroutine.cpp b/clang/lib/Sema/SemaCoroutine.cpp
index 2fd077681b0ba4..81334c817b2af2 100644
--- a/clang/lib/Sema/SemaCoroutine.cpp
+++ b/clang/lib/Sema/SemaCoroutine.cpp
@@ -819,8 +819,8 @@ ExprResult Sema::BuildOperatorCoawaitLookupExpr(Scope *S, SourceLocation Loc) {
const auto &Functions = Operators.asUnresolvedSet();
Expr *CoawaitOp = UnresolvedLookupExpr::Create(
Context, /*NamingClass*/ nullptr, NestedNameSpecifierLoc(),
- DeclarationNameInfo(OpName, Loc), /*RequiresADL*/ true,
- Functions.begin(), Functions.end(), /*KnownDependent=*/false);
+ DeclarationNameInfo(OpName, Loc), /*RequiresADL*/ true, Functions.begin(),
+ Functions.end(), /*KnownDependent=*/false);
assert(CoawaitOp);
return CoawaitOp;
}
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 8c1cdc6f141b47..ad27242148a5bd 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -3431,11 +3431,10 @@ static bool ShouldLookupResultBeMultiVersionOverload(const LookupResult &R) {
ExprResult Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS,
LookupResult &R, bool NeedsADL,
- bool AcceptInvalidDecl,
- bool NeedUnresolved) {
+ bool AcceptInvalidDecl) {
// If this is a single, fully-resolved result and we don't need ADL,
// just build an ordinary singleton decl ref.
- if (!NeedUnresolved && !NeedsADL && R.isSingleResult() &&
+ if (!NeedsADL && R.isSingleResult() &&
!R.getAsSingle<FunctionTemplateDecl>() &&
!ShouldLookupResultBeMultiVersionOverload(R))
return BuildDeclarationNameExpr(SS, R.getLookupNameInfo(), R.getFoundDecl(),
@@ -3457,7 +3456,8 @@ ExprResult Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS,
UnresolvedLookupExpr *ULE = UnresolvedLookupExpr::Create(
Context, R.getNamingClass(), SS.getWithLocInContext(Context),
- R.getLookupNameInfo(), NeedsADL, R.begin(), R.end(), NeedUnresolved);
+ R.getLookupNameInfo(), NeedsADL, R.begin(), R.end(),
+ /*KnownDependent=*/false);
return ULE;
}
diff --git a/clang/lib/Sema/SemaExprMember.cpp b/clang/lib/Sema/SemaExprMember.cpp
index ad74859797a6a2..bcdc309137b534 100644
--- a/clang/lib/Sema/SemaExprMember.cpp
+++ b/clang/lib/Sema/SemaExprMember.cpp
@@ -316,15 +316,19 @@ ExprResult Sema::BuildPossibleImplicitMemberExpr(
[[fallthrough]];
case IMA_Static:
case IMA_Abstract:
- case IMA_Dependent:
case IMA_Mixed_StaticOrExplicitContext:
case IMA_Unresolved_StaticOrExplicitContext:
if (TemplateArgs || TemplateKWLoc.isValid())
return BuildTemplateIdExpr(SS, TemplateKWLoc, R, /*RequiresADL=*/false,
TemplateArgs);
- return BuildDeclarationNameExpr(
- SS, R, /*NeedsADL=*/false, /*AcceptInvalidDecl=*/false,
- /*NeedUnresolved=*/Classification == IMA_Dependent);
+ return BuildDeclarationNameExpr(SS, R, /*NeedsADL=*/false,
+ /*AcceptInvalidDecl=*/false);
+ case IMA_Dependent:
+ R.suppressDiagnostics();
+ return UnresolvedLookupExpr::Create(
+ Context, R.getNamingClass(), SS.getWithLocInContext(Context),
+ TemplateKWLoc, R.getLookupNameInfo(), /*RequiresADL=*/false,
+ TemplateArgs, R.begin(), R.end(), /*KnownDependent=*/true);
case IMA_Error_StaticOrExplicitContext:
case IMA_Error_Unrelated:
>From ebcd21490af1263fa86b846570d6e6b23a8bb6e7 Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian at gmail.com>
Date: Mon, 15 Apr 2024 12:16:53 -0400
Subject: [PATCH 4/5] [FOLD] add more test
---
...ms-function-specialization-class-scope.cpp | 125 +++++++++++++++++-
1 file changed, 123 insertions(+), 2 deletions(-)
diff --git a/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp b/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
index 76e84e2bcbda7f..4cfd53a1242934 100644
--- a/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
+++ b/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
@@ -176,12 +176,18 @@ namespace UsesThis {
f.bar(1);
}
- struct B {
+ struct B {
int x0;
static inline int y0;
int f0(int);
static int g0(int);
+
+ int x2;
+ static inline int y2;
+
+ int f2(int);
+ static int g2(int);
};
template<typename T>
@@ -192,6 +198,11 @@ namespace UsesThis {
int f1(int);
static int g1(int);
+ using B::x2;
+ using B::y2;
+ using B::f2;
+ using B::g2;
+
template<typename U>
void non_static_spec(U);
@@ -203,34 +214,89 @@ namespace UsesThis {
++z;
++x0;
++x1;
+ ++x2;
++y0;
++y1;
+ ++y2;
+
+ &z;
+ &x0;
+ &x1;
+ &x2;
+ &y0;
+ &y1;
+ &y2;
+
+ &f0; // expected-error {{must explicitly qualify name of member function when taking its address}}
+ &f1; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &f2; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &g0;
+ &g1;
+ &g2;
+
+ &B::x0;
+ &D::x1;
+ &B::x2;
+ &B::y0;
+ &D::y1;
+ &B::y2;
+ &B::f0;
+ &D::f1;
+ &B::f2;
+ &B::g0;
+ &D::g1;
+ &B::g2;
f0(0);
f0(z);
f0(x0);
f0(x1);
+ f0(x2);
f0(y0);
f0(y1);
+ f0(y2);
g0(0);
g0(z);
g0(x0);
g0(x1);
+ g0(x2);
g0(y0);
g0(y1);
+ g0(y2);
f1(0);
f1(z);
f1(x0);
f1(x1);
+ f1(x2);
f1(y0);
f1(y1);
+ f1(y2);
g1(0);
g1(z);
g1(x0);
g1(x1);
+ g1(x2);
g1(y0);
g1(y1);
+ g1(y2);
+
+ f2(0);
+ f2(z);
+ f2(x0);
+ f2(x1);
+ f2(x2);
+ f2(y0);
+ f2(y1);
+ f2(y2);
+ g2(0);
+ g2(z);
+ g2(x0);
+ g2(x1);
+ g2(x2);
+ g2(y0);
+ g2(y1);
+ g2(y2);
}
template<>
@@ -238,36 +304,91 @@ namespace UsesThis {
++z;
++x0; // expected-error {{invalid use of member 'x0' in static member function}}
++x1; // expected-error {{invalid use of member 'x1' in static member function}}
+ ++x2; // expected-error {{invalid use of member 'x2' in static member function}}
++y0;
++y1;
+ ++y2;
+
+ &z;
+ &x0; // expected-error {{invalid use of member 'x0' in static member function}}
+ &x1; // expected-error {{invalid use of member 'x1' in static member function}}
+ &x2; // expected-error {{invalid use of member 'x2' in static member function}}
+ &y0;
+ &y1;
+ &y2;
+
+ &f0; // expected-error {{must explicitly qualify name of member function when taking its address}}
+ &f1; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &f2; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &g0;
+ &g1;
+ &g2;
+
+ &B::x0;
+ &D::x1;
+ &B::x2;
+ &B::y0;
+ &D::y1;
+ &B::y2;
+ &B::f0;
+ &D::f1;
+ &B::f2;
+ &B::g0;
+ &D::g1;
+ &B::g2;
f0(0); // expected-error {{call to non-static member function without an object argument}}
f0(z); // expected-error {{call to non-static member function without an object argument}}
f0(x0); // expected-error {{call to non-static member function without an object argument}}
f0(x1); // expected-error {{call to non-static member function without an object argument}}
+ f0(x2); // expected-error {{call to non-static member function without an object argument}}
f0(y0); // expected-error {{call to non-static member function without an object argument}}
f0(y1); // expected-error {{call to non-static member function without an object argument}}
+ f0(y2); // expected-error {{call to non-static member function without an object argument}}
g0(0);
g0(z);
g0(x0); // expected-error {{invalid use of member 'x0' in static member function}}
g0(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g0(x2); // expected-error {{invalid use of member 'x2' in static member function}}
g0(y0);
g0(y1);
+ g0(y2);
f1(0); // expected-error {{call to non-static member function without an object argument}}
f1(z); // expected-error {{call to non-static member function without an object argument}}
f1(x0); // expected-error {{call to non-static member function without an object argument}}
f1(x1); // expected-error {{call to non-static member function without an object argument}}
+ f1(x2); // expected-error {{call to non-static member function without an object argument}}
f1(y0); // expected-error {{call to non-static member function without an object argument}}
f1(y1); // expected-error {{call to non-static member function without an object argument}}
+ f1(y2); // expected-error {{call to non-static member function without an object argument}}
g1(0);
g1(z);
g1(x0); // expected-error {{invalid use of member 'x0' in static member function}}
g1(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g1(x2); // expected-error {{invalid use of member 'x2' in static member function}}
g1(y0);
g1(y1);
+ g1(y2);
+
+ f2(0); // expected-error {{call to non-static member function without an object argument}}
+ f2(z); // expected-error {{call to non-static member function without an object argument}}
+ f2(x0); // expected-error {{call to non-static member function without an object argument}}
+ f2(x1); // expected-error {{call to non-static member function without an object argument}}
+ f2(x2); // expected-error {{call to non-static member function without an object argument}}
+ f2(y0); // expected-error {{call to non-static member function without an object argument}}
+ f2(y1); // expected-error {{call to non-static member function without an object argument}}
+ f2(y2); // expected-error {{call to non-static member function without an object argument}}
+ g2(0);
+ g2(z);
+ g2(x0); // expected-error {{invalid use of member 'x0' in static member function}}
+ g2(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g2(x2); // expected-error {{invalid use of member 'x2' in static member function}}
+ g2(y0);
+ g2(y1);
+ g2(y2);
}
};
- template struct D<int>; // expected-note {{in instantiation of}}
+ template struct D<int>; // expected-note 2{{in instantiation of}}
}
>From 75b7842dda59f93420afda0b3a39996ee78cf9a8 Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian at gmail.com>
Date: Thu, 18 Apr 2024 17:00:02 -0400
Subject: [PATCH 5/5] [FOLD] add tests for dependent using declarations
---
clang/lib/Sema/SemaExprMember.cpp | 5 +-
...ms-function-specialization-class-scope.cpp | 135 +++++++++++++++++-
2 files changed, 138 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Sema/SemaExprMember.cpp b/clang/lib/Sema/SemaExprMember.cpp
index bcdc309137b534..6e30716b9ae436 100644
--- a/clang/lib/Sema/SemaExprMember.cpp
+++ b/clang/lib/Sema/SemaExprMember.cpp
@@ -109,9 +109,12 @@ static IMAKind ClassifyImplicitMemberAccess(Sema &SemaRef,
}
}
- if (R.isUnresolvableResult())
+ if (R.isUnresolvableResult()) {
+ if (couldInstantiateToStatic)
+ return IMA_Dependent;
return isStaticOrExplicitContext ? IMA_Unresolved_StaticOrExplicitContext
: IMA_Unresolved;
+ }
// Collect all the declaring classes of instance members we find.
bool hasNonInstance = false;
diff --git a/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp b/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
index 4cfd53a1242934..c49d2cb2422fab 100644
--- a/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
+++ b/clang/test/SemaTemplate/ms-function-specialization-class-scope.cpp
@@ -176,7 +176,7 @@ namespace UsesThis {
f.bar(1);
}
- struct B {
+ struct B {
int x0;
static inline int y0;
@@ -391,4 +391,137 @@ namespace UsesThis {
};
template struct D<int>; // expected-note 2{{in instantiation of}}
+
+ template<typename T>
+ struct E : T {
+ int x1;
+ static inline int y1;
+
+ int f1(int);
+ static int g1(int);
+
+ using T::x0;
+ using T::y0;
+ using T::f0;
+ using T::g0;
+
+ template<typename U>
+ void non_static_spec(U);
+
+ template<typename U>
+ static void static_spec(U);
+
+ template<>
+ void non_static_spec(int z) {
+ ++z;
+ ++x0;
+ ++x1;
+ ++y0;
+ ++y1;
+
+ &z;
+ &x0;
+ &x1;
+ &y0;
+ &y1;
+
+ &f0; // expected-error {{must explicitly qualify name of member function when taking its address}}
+ &f1; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &g0;
+ &g1;
+
+ &T::x0;
+ &E::x1;
+ &T::y0;
+ &E::y1;
+ &T::f0;
+ &E::f1;
+ &T::g0;
+ &E::g1;
+
+ f0(0);
+ f0(z);
+ f0(x0);
+ f0(x1);
+ f0(y0);
+ f0(y1);
+ g0(0);
+ g0(z);
+ g0(x0);
+ g0(x1);
+ g0(y0);
+ g0(y1);
+
+ f1(0);
+ f1(z);
+ f1(x0);
+ f1(x1);
+ f1(y0);
+ f1(y1);
+ g1(0);
+ g1(z);
+ g1(x0);
+ g1(x1);
+ g1(y0);
+ g1(y1);
+ }
+
+ template<>
+ void static_spec(int z) {
+ ++z;
+ ++x0; // expected-error {{invalid use of member 'x0' in static member function}}
+ ++x1; // expected-error {{invalid use of member 'x1' in static member function}}
+ ++y0;
+ ++y1;
+
+ &z;
+ &x0; // expected-error {{invalid use of member 'x0' in static member function}}
+ &x1; // expected-error {{invalid use of member 'x1' in static member function}}
+ &y0;
+ &y1;
+
+ &f0; // expected-error {{must explicitly qualify name of member function when taking its address}}
+ &f1; // expected-error 2{{must explicitly qualify name of member function when taking its address}}
+ &g0;
+ &g1;
+
+ &T::x0;
+ &E::x1;
+ &T::y0;
+ &E::y1;
+ &T::f0;
+ &E::f1;
+ &T::g0;
+ &E::g1;
+
+ f0(0); // expected-error {{call to non-static member function without an object argument}}
+ f0(z); // expected-error {{call to non-static member function without an object argument}}
+ f0(x0); // expected-error {{call to non-static member function without an object argument}}
+ f0(x1); // expected-error {{call to non-static member function without an object argument}}
+ f0(y0); // expected-error {{call to non-static member function without an object argument}}
+ f0(y1); // expected-error {{call to non-static member function without an object argument}}
+ g0(0);
+ g0(z);
+ g0(x0); // expected-error {{invalid use of member 'x0' in static member function}}
+ g0(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g0(y0);
+ g0(y1);
+
+ f1(0); // expected-error {{call to non-static member function without an object argument}}
+ f1(z); // expected-error {{call to non-static member function without an object argument}}
+ f1(x0); // expected-error {{call to non-static member function without an object argument}}
+ f1(x1); // expected-error {{call to non-static member function without an object argument}}
+ f1(y0); // expected-error {{call to non-static member function without an object argument}}
+ f1(y1); // expected-error {{call to non-static member function without an object argument}}
+ g1(0);
+ g1(z);
+ g1(x0); // expected-error {{invalid use of member 'x0' in static member function}}
+ g1(x1); // expected-error {{invalid use of member 'x1' in static member function}}
+ g1(y0);
+ g1(y1);
+ }
+ };
+
+ template struct E<B>; // expected-note 2{{in instantiation of}}
+
}
More information about the cfe-commits
mailing list