Skip to content

Commit 3297e1b

Browse files
mizvekovmizvekov
committed
WIP: [clang] Store in exprs the conveed arguments for function calls.
WIP - Not ready for review This keeps around in expressions the sugared converted arguments. This is a pre-requisite for adding some additional users of the resugaring transform. Differential Revision: https://reviews.llvm.org/D134115
1 parent 67a0981 commit 3297e1b

29 files changed

+578
-343
lines changed

‎clang/include/clang/AST/ASTImporter.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,13 @@ class TypeSourceInfo;
481481
/// error.
482482
llvm::Expected<APValue> Import(const APValue &FromValue);
483483

484+
/// Import the given C++ TemplateArgumentList from the "from"
485+
/// context into the "to" context.
486+
///
487+
/// \returns The equivalent initializer in the "to" context, or the import
488+
/// error.
489+
llvm::Expected<TemplateArgumentList *> Import(const TemplateArgumentList *);
490+
484491
/// Import the definition of the given declaration, including all of
485492
/// the declarations it contains.
486493
[[nodiscard]] llvm::Error ImportDefinition(Decl *From);

‎clang/include/clang/AST/DeclTemplate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ class TemplateArgumentList final
264264

265265
/// Create a new template argument list that copies the given set of
266266
/// template arguments.
267-
static TemplateArgumentList *CreateCopy(ASTContext &Context,
267+
static TemplateArgumentList *CreateCopy(const ASTContext &Context,
268268
ArrayRef<TemplateArgument> Args);
269269

270270
/// Retrieve the template argument at a given index.

‎clang/include/clang/AST/Expr.h‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,8 @@ class DeclRefExpr final
12741274
/// The declaration that we are referencing.
12751275
ValueDecl *D;
12761276

1277+
const TemplateArgumentList *ConvertedArgs;
1278+
12771279
/// Provides source/type location info for the declaration name
12781280
/// embedded in D.
12791281
DeclarationNameLoc DNLoc;
@@ -1298,7 +1300,8 @@ class DeclRefExpr final
12981300
SourceLocation TemplateKWLoc, ValueDecl *D,
12991301
bool RefersToEnclosingVariableOrCapture,
13001302
const DeclarationNameInfo &NameInfo, NamedDecl *FoundD,
1301-
const TemplateArgumentListInfo *TemplateArgs, QualType T,
1303+
const TemplateArgumentListInfo *TemplateArgs,
1304+
const TemplateArgumentList *ConvertedArgs, QualType T,
13021305
ExprValueKind VK, NonOdrUseReason NOUR);
13031306

13041307
/// Construct an empty declaration reference expression.
@@ -1317,6 +1320,7 @@ class DeclRefExpr final
13171320
bool RefersToEnclosingVariableOrCapture, SourceLocation NameLoc,
13181321
QualType T, ExprValueKind VK, NamedDecl *FoundD = nullptr,
13191322
const TemplateArgumentListInfo *TemplateArgs = nullptr,
1323+
const TemplateArgumentList *ConvertedArgs = nullptr,
13201324
NonOdrUseReason NOUR = NOUR_None);
13211325

13221326
static DeclRefExpr *
@@ -1326,6 +1330,7 @@ class DeclRefExpr final
13261330
const DeclarationNameInfo &NameInfo, QualType T, ExprValueKind VK,
13271331
NamedDecl *FoundD = nullptr,
13281332
const TemplateArgumentListInfo *TemplateArgs = nullptr,
1333+
const TemplateArgumentList *ConvertedArgs = nullptr,
13291334
NonOdrUseReason NOUR = NOUR_None);
13301335

13311336
/// Construct an empty declaration reference expression.
@@ -1433,6 +1438,8 @@ class DeclRefExpr final
14331438
return getTrailingObjects<TemplateArgumentLoc>();
14341439
}
14351440

1441+
const TemplateArgumentList *getConvertedArgs() const { return ConvertedArgs; }
1442+
14361443
/// Retrieve the number of template arguments provided as part of this
14371444
/// template-id.
14381445
unsigned getNumTemplateArgs() const {
@@ -3248,6 +3255,8 @@ class MemberExpr final
32483255
/// In X.F, this is the decl referenced by F.
32493256
ValueDecl *MemberDecl;
32503257

3258+
const TemplateArgumentList *Deduced;
3259+
32513260
/// MemberDNLoc - Provides source/type location info for the
32523261
/// declaration name embedded in MemberDecl.
32533262
DeclarationNameLoc MemberDNLoc;
@@ -3277,21 +3286,21 @@ class MemberExpr final
32773286
NestedNameSpecifierLoc QualifierLoc, SourceLocation TemplateKWLoc,
32783287
ValueDecl *MemberDecl, DeclAccessPair FoundDecl,
32793288
const DeclarationNameInfo &NameInfo,
3280-
const TemplateArgumentListInfo *TemplateArgs, QualType T,
3281-
ExprValueKind VK, ExprObjectKind OK, NonOdrUseReason NOUR);
3289+
const TemplateArgumentListInfo *TemplateArgs,
3290+
const TemplateArgumentList *Deduced, QualType T, ExprValueKind VK,
3291+
ExprObjectKind OK, NonOdrUseReason NOUR);
32823292
MemberExpr(EmptyShell Empty)
32833293
: Expr(MemberExprClass, Empty), Base(), MemberDecl() {}
32843294

32853295
public:
3286-
static MemberExpr *Create(const ASTContext &C, Expr *Base, bool IsArrow,
3287-
SourceLocation OperatorLoc,
3288-
NestedNameSpecifierLoc QualifierLoc,
3289-
SourceLocation TemplateKWLoc, ValueDecl *MemberDecl,
3290-
DeclAccessPair FoundDecl,
3291-
DeclarationNameInfo MemberNameInfo,
3292-
const TemplateArgumentListInfo *TemplateArgs,
3293-
QualType T, ExprValueKind VK, ExprObjectKind OK,
3294-
NonOdrUseReason NOUR);
3296+
static MemberExpr *
3297+
Create(const ASTContext &C, Expr *Base, bool IsArrow,
3298+
SourceLocation OperatorLoc, NestedNameSpecifierLoc QualifierLoc,
3299+
SourceLocation TemplateKWLoc, ValueDecl *MemberDecl,
3300+
DeclAccessPair FoundDecl, DeclarationNameInfo MemberNameInfo,
3301+
const TemplateArgumentListInfo *TemplateArgs,
3302+
const TemplateArgumentList *Deduced, QualType T, ExprValueKind VK,
3303+
ExprObjectKind OK, NonOdrUseReason NOUR);
32953304

32963305
/// Create an implicit MemberExpr, with no location, qualifier, template
32973306
/// arguments, and so on. Suitable only for non-static member access.
@@ -3302,7 +3311,8 @@ class MemberExpr final
33023311
return Create(C, Base, IsArrow, SourceLocation(), NestedNameSpecifierLoc(),
33033312
SourceLocation(), MemberDecl,
33043313
DeclAccessPair::make(MemberDecl, MemberDecl->getAccess()),
3305-
DeclarationNameInfo(), nullptr, T, VK, OK, NOUR_None);
3314+
DeclarationNameInfo(), nullptr, /*Deduced=*/{}, T, VK, OK,
3315+
NOUR_None);
33063316
}
33073317

33083318
static MemberExpr *CreateEmpty(const ASTContext &Context, bool HasQualifier,
@@ -3328,6 +3338,8 @@ class MemberExpr final
33283338
return *getTrailingObjects<DeclAccessPair>();
33293339
}
33303340

3341+
const TemplateArgumentList *getDeduced() const { return Deduced; }
3342+
33313343
/// Determines whether this member expression actually had
33323344
/// a C++ nested-name-specifier prior to the name of the member, e.g.,
33333345
/// x->Base::foo.

‎clang/include/clang/Sema/Initialization.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,7 @@ class InitializationSequence {
957957
bool HadMultipleCandidates;
958958
FunctionDecl *Function;
959959
DeclAccessPair FoundDecl;
960+
const TemplateArgumentList *ConvertedArgs;
960961
};
961962

962963
union {
@@ -1262,9 +1263,10 @@ class InitializationSequence {
12621263
///
12631264
/// \param Function the function to which the overloaded function reference
12641265
/// resolves.
1265-
void AddAddressOverloadResolutionStep(FunctionDecl *Function,
1266-
DeclAccessPair Found,
1267-
bool HadMultipleCandidates);
1266+
void
1267+
AddAddressOverloadResolutionStep(FunctionDecl *Function, DeclAccessPair Found,
1268+
const TemplateArgumentList *ConvertedArgs,
1269+
bool HadMultipleCandidates);
12681270

12691271
/// Add a new step in the initialization that performs a derived-to-
12701272
/// base cast.

‎clang/include/clang/Sema/Overload.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,9 @@ class Sema;
961961
StandardConversionSequence FinalConversion;
962962
};
963963

964+
/// Deduced Arguments for Function Templates.
965+
const TemplateArgumentList *Deduced;
966+
964967
/// Get RewriteKind value in OverloadCandidateRewriteKind type (This
965968
/// function is to workaround the spurious GCC bitfield enum warning)
966969
OverloadCandidateRewriteKind getRewriteKind() const {

‎clang/include/clang/Sema/Sema.h‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6855,7 +6855,8 @@ class Sema final : public SemaBase {
68556855
const CXXScopeSpec *SS = nullptr,
68566856
NamedDecl *FoundD = nullptr,
68576857
SourceLocation TemplateKWLoc = SourceLocation(),
6858-
const TemplateArgumentListInfo *TemplateArgs = nullptr);
6858+
const TemplateArgumentListInfo *TemplateArgs = nullptr,
6859+
const TemplateArgumentList *ConvertArgs = nullptr);
68596860

68606861
/// BuildDeclRefExpr - Build an expression that references a
68616862
/// declaration that does not require a closure capture.
@@ -6864,7 +6865,8 @@ class Sema final : public SemaBase {
68646865
const DeclarationNameInfo &NameInfo,
68656866
NestedNameSpecifierLoc NNS, NamedDecl *FoundD = nullptr,
68666867
SourceLocation TemplateKWLoc = SourceLocation(),
6867-
const TemplateArgumentListInfo *TemplateArgs = nullptr);
6868+
const TemplateArgumentListInfo *TemplateArgs = nullptr,
6869+
const TemplateArgumentList *ConvertArgs = nullptr);
68686870

68696871
bool UseArgumentDependentLookup(const CXXScopeSpec &SS, const LookupResult &R,
68706872
bool HasTrailingLParen);
@@ -6886,6 +6888,7 @@ class Sema final : public SemaBase {
68866888
const CXXScopeSpec &SS, const DeclarationNameInfo &NameInfo, NamedDecl *D,
68876889
NamedDecl *FoundD = nullptr,
68886890
const TemplateArgumentListInfo *TemplateArgs = nullptr,
6891+
const TemplateArgumentList *ConvertedArgs = nullptr,
68896892
bool AcceptInvalidDecl = false);
68906893

68916894
// ExpandFunctionLocalPredefinedMacros - Returns a new vector of Tokens,
@@ -8698,14 +8701,13 @@ class Sema final : public SemaBase {
86988701
SourceLocation TemplateKWLoc,
86998702
UnqualifiedId &Member, Decl *ObjCImpDecl);
87008703

8701-
MemberExpr *
8702-
BuildMemberExpr(Expr *Base, bool IsArrow, SourceLocation OpLoc,
8703-
NestedNameSpecifierLoc NNS, SourceLocation TemplateKWLoc,
8704-
ValueDecl *Member, DeclAccessPair FoundDecl,
8705-
bool HadMultipleCandidates,
8706-
const DeclarationNameInfo &MemberNameInfo, QualType Ty,
8707-
ExprValueKind VK, ExprObjectKind OK,
8708-
const TemplateArgumentListInfo *TemplateArgs = nullptr);
8704+
MemberExpr *BuildMemberExpr(
8705+
Expr *Base, bool IsArrow, SourceLocation OpLoc,
8706+
NestedNameSpecifierLoc NNS, SourceLocation TemplateKWLoc,
8707+
ValueDecl *Member, DeclAccessPair FoundDecl, bool HadMultipleCandidates,
8708+
const DeclarationNameInfo &MemberNameInfo, QualType Ty, ExprValueKind VK,
8709+
ExprObjectKind OK, const TemplateArgumentListInfo *TemplateArgs = nullptr,
8710+
const TemplateArgumentList *Deduced = nullptr);
87098711

87108712
// Check whether the declarations we found through a nested-name
87118713
// specifier in a member expression are actually members of the base
@@ -10294,6 +10296,7 @@ class Sema final : public SemaBase {
1029410296
ADLCallKind IsADLCandidate = ADLCallKind::NotADL,
1029510297
ConversionSequenceList EarlyConversions = {},
1029610298
OverloadCandidateParamOrder PO = {},
10299+
const TemplateArgumentList *Deduced = nullptr,
1029710300
bool AggregateCandidateDeduction = false, bool StrictPackMatch = false);
1029810301

1029910302
/// Add all of the function declarations in the given function set to
@@ -10330,6 +10333,7 @@ class Sema final : public SemaBase {
1033010333
bool PartialOverloading = false,
1033110334
ConversionSequenceList EarlyConversions = {},
1033210335
OverloadCandidateParamOrder PO = {},
10336+
const TemplateArgumentList *Deduced = nullptr,
1033310337
bool StrictPackMatch = false);
1033410338

1033510339
/// Add a C++ member function template as a candidate to the candidate
@@ -10538,6 +10542,7 @@ class Sema final : public SemaBase {
1053810542
FunctionDecl *
1053910543
ResolveAddressOfOverloadedFunction(Expr *AddressOfExpr, QualType TargetType,
1054010544
bool Complain, DeclAccessPair &Found,
10545+
const TemplateArgumentList *&ConvertedArgs,
1054110546
bool *pHadMultipleCandidates = nullptr);
1054210547

1054310548
/// Given an expression that refers to an overloaded function, try to
@@ -10571,7 +10576,9 @@ class Sema final : public SemaBase {
1057110576
/// If no template-ids are found, no diagnostics are emitted and NULL is
1057210577
/// returned.
1057310578
FunctionDecl *ResolveSingleFunctionTemplateSpecialization(
10574-
OverloadExpr *ovl, bool Complain = false, DeclAccessPair *Found = nullptr,
10579+
OverloadExpr *ovl, TemplateArgumentListInfo &ExplicitTemplateArgs,
10580+
const TemplateArgumentList *&ConvertedArgs, bool Complain = false,
10581+
DeclAccessPair *Found = nullptr,
1057510582
TemplateSpecCandidateSet *FailedTSC = nullptr,
1057610583
bool ForTypeDeduction = false);
1057710584

@@ -10756,11 +10763,14 @@ class Sema final : public SemaBase {
1075610763
/// perhaps a '&' around it). We have resolved the overloaded function
1075710764
/// to the function declaration Fn, so patch up the expression E to
1075810765
/// refer (possibly indirectly) to Fn. Returns the new expr.
10759-
ExprResult FixOverloadedFunctionReference(Expr *E, DeclAccessPair FoundDecl,
10760-
FunctionDecl *Fn);
10761-
ExprResult FixOverloadedFunctionReference(ExprResult,
10762-
DeclAccessPair FoundDecl,
10763-
FunctionDecl *Fn);
10766+
ExprResult
10767+
FixOverloadedFunctionReference(Expr *E, DeclAccessPair FoundDecl,
10768+
FunctionDecl *Fn,
10769+
const TemplateArgumentList *Deduced);
10770+
ExprResult
10771+
FixOverloadedFunctionReference(ExprResult, DeclAccessPair FoundDecl,
10772+
FunctionDecl *Fn,
10773+
const TemplateArgumentList *Deduced);
1076410774

1076510775
/// - Returns a selector which best matches given argument list or
1076610776
/// nullptr if none could be found
@@ -11541,7 +11551,8 @@ class Sema final : public SemaBase {
1154111551
DeclResult CheckVarTemplateId(VarTemplateDecl *Template,
1154211552
SourceLocation TemplateLoc,
1154311553
SourceLocation TemplateNameLoc,
11544-
const TemplateArgumentListInfo &TemplateArgs);
11554+
const TemplateArgumentListInfo &TemplateArgs,
11555+
const TemplateArgumentList *&ConvertedArgs);
1154511556

1154611557
/// Form a reference to the specialization of the given variable template
1154711558
/// corresponding to the specified argument list, or a null-but-valid result

‎clang/include/clang/Sema/SemaCUDA.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ class SemaCUDA : public SemaBase {
229229
/// calling priority.
230230
void EraseUnwantedMatches(
231231
const FunctionDecl *Caller,
232-
llvm::SmallVectorImpl<std::pair<DeclAccessPair, FunctionDecl *>>
233-
&Matches);
232+
llvm::SmallVectorImpl<std::tuple<DeclAccessPair, FunctionDecl *,
233+
const TemplateArgumentList *>> &Matches);
234234

235235
/// Given a implicit special member, infer its CUDA target from the
236236
/// calls it needs to make to underlying base/field special members.

‎clang/lib/AST/ASTImporter.cpp‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7500,6 +7500,7 @@ ExpectedStmt ASTNodeImporter::VisitDeclRefExpr(DeclRefExpr *E) {
75007500
auto ToQualifierLoc = importChecked(Err, E->getQualifierLoc());
75017501
auto ToTemplateKeywordLoc = importChecked(Err, E->getTemplateKeywordLoc());
75027502
auto ToDecl = importChecked(Err, E->getDecl());
7503+
auto ToConvertedArgs = importChecked(Err, E->getConvertedArgs());
75037504
auto ToLocation = importChecked(Err, E->getLocation());
75047505
auto ToType = importChecked(Err, E->getType());
75057506
if (Err)
@@ -7526,7 +7527,8 @@ ExpectedStmt ASTNodeImporter::VisitDeclRefExpr(DeclRefExpr *E) {
75267527
auto *ToE = DeclRefExpr::Create(
75277528
Importer.getToContext(), ToQualifierLoc, ToTemplateKeywordLoc, ToDecl,
75287529
E->refersToEnclosingVariableOrCapture(), ToLocation, ToType,
7529-
E->getValueKind(), ToFoundD, ToResInfo, E->isNonOdrUse());
7530+
E->getValueKind(), ToFoundD, ToResInfo, ToConvertedArgs,
7531+
E->isNonOdrUse());
75307532
if (E->hadMultipleCandidates())
75317533
ToE->setHadMultipleCandidates(true);
75327534
ToE->setIsImmediateEscalating(E->isImmediateEscalating());
@@ -8451,6 +8453,7 @@ ExpectedStmt ASTNodeImporter::VisitMemberExpr(MemberExpr *E) {
84518453
auto ToQualifierLoc = importChecked(Err, E->getQualifierLoc());
84528454
auto ToTemplateKeywordLoc = importChecked(Err, E->getTemplateKeywordLoc());
84538455
auto ToMemberDecl = importChecked(Err, E->getMemberDecl());
8456+
auto ToDeduced = importChecked(Err, E->getDeduced());
84548457
auto ToType = importChecked(Err, E->getType());
84558458
auto ToDecl = importChecked(Err, E->getFoundDecl().getDecl());
84568459
auto ToName = importChecked(Err, E->getMemberNameInfo().getName());
@@ -8475,7 +8478,7 @@ ExpectedStmt ASTNodeImporter::VisitMemberExpr(MemberExpr *E) {
84758478
return MemberExpr::Create(Importer.getToContext(), ToBase, E->isArrow(),
84768479
ToOperatorLoc, ToQualifierLoc, ToTemplateKeywordLoc,
84778480
ToMemberDecl, ToFoundDecl, ToMemberNameInfo,
8478-
ResInfo, ToType, E->getValueKind(),
8481+
ResInfo, ToDeduced, ToType, E->getValueKind(),
84798482
E->getObjectKind(), E->isNonOdrUse());
84808483
}
84818484

@@ -10198,6 +10201,17 @@ llvm::Expected<APValue> ASTImporter::Import(const APValue &FromValue) {
1019810201
return Importer.ImportAPValue(FromValue);
1019910202
}
1020010203

10204+
llvm::Expected<TemplateArgumentList *>
10205+
ASTImporter::Import(const TemplateArgumentList *ArgList) {
10206+
ASTNodeImporter Importer(*this);
10207+
if (!ArgList)
10208+
return nullptr;
10209+
SmallVector<TemplateArgument, 4> ToArgs(ArgList->size());
10210+
if (auto Res = Importer.ImportTemplateArguments(ArgList->asArray(), ToArgs))
10211+
return std::move(Res);
10212+
return TemplateArgumentList::CreateCopy(ToContext, ToArgs);
10213+
}
10214+
1020110215
Error ASTImporter::ImportDefinition(Decl *From) {
1020210216
ExpectedDecl ToOrErr = Import(From);
1020310217
if (!ToOrErr)

‎clang/lib/AST/DeclTemplate.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ TemplateArgumentList::TemplateArgumentList(ArrayRef<TemplateArgument> Args)
948948
}
949949

950950
TemplateArgumentList *
951-
TemplateArgumentList::CreateCopy(ASTContext &Context,
951+
TemplateArgumentList::CreateCopy(const ASTContext &Context,
952952
ArrayRef<TemplateArgument> Args) {
953953
void *Mem = Context.Allocate(totalSizeToAlloc<TemplateArgument>(Args.size()));
954954
return new (Mem) TemplateArgumentList(Args);

0 commit comments

Comments
 (0)