Skip to content

[clang] resugar decltype of MemberExpr #132448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mizvekov wants to merge 1 commit into
base: users/mizvekov/clang/resugar-decltype-declrefexpr
Choose a base branch
from
+129 −53
Draft

[clang] resugar decltype of MemberExpr #132448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions clang/include/clang/AST/Expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3263,7 +3263,7 @@ class MemberExpr final
: public Expr,
private llvm::TrailingObjects<MemberExpr, NestedNameSpecifierLoc,
DeclAccessPair, ASTTemplateKWAndArgsInfo,
TemplateArgumentLoc> {
TemplateArgumentLoc, QualType> {
friend class ASTReader;
friend class ASTStmtReader;
friend class ASTStmtWriter;
Expand Down Expand Up @@ -3304,13 +3304,23 @@ class MemberExpr final
return MemberExprBits.HasTemplateKWAndArgsInfo;
}

size_t numTrailingObjects(OverloadToken<TemplateArgumentLoc>) const {
return getNumTemplateArgs();
}

size_t numTrailingObjects(OverloadToken<QualType>) const {
return HasResugaredDeclType();
}

static bool needsDeclTypeStorage(ValueDecl *VD, QualType DeclType);

MemberExpr(Expr *Base, bool IsArrow, SourceLocation OperatorLoc,
NestedNameSpecifierLoc QualifierLoc, SourceLocation TemplateKWLoc,
ValueDecl *MemberDecl, DeclAccessPair FoundDecl,
const DeclarationNameInfo &NameInfo,
const TemplateArgumentListInfo *TemplateArgs,
const TemplateArgumentList *Deduced, QualType T, ExprValueKind VK,
ExprObjectKind OK, NonOdrUseReason NOUR);
QualType DeclType, ExprObjectKind OK, NonOdrUseReason NOUR);
MemberExpr(EmptyShell Empty)
: Expr(MemberExprClass, Empty), Base(), MemberDecl() {}

Expand All @@ -3322,7 +3332,7 @@ class MemberExpr final
DeclAccessPair FoundDecl, DeclarationNameInfo MemberNameInfo,
const TemplateArgumentListInfo *TemplateArgs,
const TemplateArgumentList *Deduced, QualType T, ExprValueKind VK,
ExprObjectKind OK, NonOdrUseReason NOUR);
QualType DeclType, ExprObjectKind OK, NonOdrUseReason NOUR);

/// Create an implicit MemberExpr, with no location, qualifier, template
/// arguments, and so on. Suitable only for non-static member access.
Expand All @@ -3333,14 +3343,15 @@ class MemberExpr final
return Create(C, Base, IsArrow, SourceLocation(), NestedNameSpecifierLoc(),
SourceLocation(), MemberDecl,
DeclAccessPair::make(MemberDecl, MemberDecl->getAccess()),
DeclarationNameInfo(), nullptr, /*Deduced=*/{}, T, VK, OK,
NOUR_None);
DeclarationNameInfo(), nullptr, /*Deduced=*/{}, T, VK,
QualType(), OK, NOUR_None);
}

static MemberExpr *CreateEmpty(const ASTContext &Context, bool HasQualifier,
bool HasFoundDecl,
bool HasTemplateKWAndArgsInfo,
unsigned NumTemplateArgs);
unsigned NumTemplateArgs,
bool HasResugaredDeclType);

void setBase(Expr *E) { Base = E; }
Expr *getBase() const { return cast<Expr>(Base); }
Expand All @@ -3351,6 +3362,16 @@ class MemberExpr final
/// static data members), a CXXMethodDecl, or an EnumConstantDecl.
ValueDecl *getMemberDecl() const { return MemberDecl; }
void setMemberDecl(ValueDecl *D);
void recomputeDependency();

bool HasResugaredDeclType() const {
return MemberExprBits.HasResugaredDeclType;
}
QualType getDeclType() const {
return HasResugaredDeclType() ? *getTrailingObjects<QualType>()
: MemberDecl->getType();
}
void setDeclType(QualType T);

/// Retrieves the declaration found by lookup.
DeclAccessPair getFoundDecl() const {
Expand Down
4 changes: 4 additions & 0 deletions clang/include/clang/AST/Stmt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,10 @@ class alignas(void *) Stmt {
LLVM_PREFERRED_TYPE(NonOdrUseReason)
unsigned NonOdrUseReason : 2;

/// Consider a different type for the MemberDecl this MemberExpr refers to.
LLVM_PREFERRED_TYPE(bool)
unsigned HasResugaredDeclType : 1;

/// This is the location of the -> or . in the expression.
SourceLocation OperatorLoc;
};
Expand Down
6 changes: 4 additions & 2 deletions clang/include/clang/Sema/Sema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8709,7 +8709,8 @@ class Sema final : public SemaBase {
NestedNameSpecifierLoc NNS, SourceLocation TemplateKWLoc,
ValueDecl *Member, DeclAccessPair FoundDecl, bool HadMultipleCandidates,
const DeclarationNameInfo &MemberNameInfo, QualType Ty, ExprValueKind VK,
ExprObjectKind OK, const TemplateArgumentListInfo *TemplateArgs = nullptr,
ExprObjectKind OK, QualType DeclType = QualType(),
const TemplateArgumentListInfo *TemplateArgs = nullptr,
const TemplateArgumentList *Deduced = nullptr);

// Check whether the declarations we found through a nested-name
Expand Down Expand Up @@ -8758,7 +8759,7 @@ class Sema final : public SemaBase {
ExprResult BuildFieldReferenceExpr(Expr *BaseExpr, bool IsArrow,
SourceLocation OpLoc,
const NestedNameSpecifierLoc &NNS,
FieldDecl *Field, QualType FieldType,
FieldDecl *Field, QualType FieldDeclType,
DeclAccessPair FoundDecl,
const DeclarationNameInfo &MemberNameInfo);

Expand Down Expand Up @@ -14013,6 +14014,7 @@ class Sema final : public SemaBase {
QualType resugar(const Type *Base, NamedDecl *ND,
ArrayRef<TemplateArgument> Args, QualType T);
QualType resugar(DeclRefExpr *DRE, ValueDecl *VD);
QualType resugar(MemberExpr *ME, ValueDecl *VD);

/// Performs template instantiation for all implicit template
/// instantiations we have seen until this point.
Expand Down
3 changes: 2 additions & 1 deletion clang/lib/AST/ASTImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8452,6 +8452,7 @@ ExpectedStmt ASTNodeImporter::VisitMemberExpr(MemberExpr *E) {
auto ToDecl = importChecked(Err, E->getFoundDecl().getDecl());
auto ToName = importChecked(Err, E->getMemberNameInfo().getName());
auto ToLoc = importChecked(Err, E->getMemberNameInfo().getLoc());
auto ToDeclType = importChecked(Err, E->getDeclType());
if (Err)
return std::move(Err);

Expand All @@ -8473,7 +8474,7 @@ ExpectedStmt ASTNodeImporter::VisitMemberExpr(MemberExpr *E) {
ToOperatorLoc, ToQualifierLoc, ToTemplateKeywordLoc,
ToMemberDecl, ToFoundDecl, ToMemberNameInfo,
ResInfo, ToDeduced, ToType, E->getValueKind(),
E->getObjectKind(), E->isNonOdrUse());
ToDeclType, E->getObjectKind(), E->isNonOdrUse());
}

ExpectedStmt
Expand Down
50 changes: 39 additions & 11 deletions clang/lib/AST/Expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,14 +1761,19 @@ UnaryExprOrTypeTraitExpr::UnaryExprOrTypeTraitExpr(
setDependence(computeDependence(this));
}

bool MemberExpr::needsDeclTypeStorage(ValueDecl *VD, QualType DeclType) {
return !DeclType.isNull() &&
(DeclType != VD->getType() || VD->getType()->isUndeducedType());
}

MemberExpr::MemberExpr(Expr *Base, bool IsArrow, SourceLocation OperatorLoc,
NestedNameSpecifierLoc QualifierLoc,
SourceLocation TemplateKWLoc, ValueDecl *MemberDecl,
DeclAccessPair FoundDecl,
const DeclarationNameInfo &NameInfo,
const TemplateArgumentListInfo *TemplateArgs,
const TemplateArgumentList *Deduced, QualType T,
ExprValueKind VK, ExprObjectKind OK,
ExprValueKind VK, QualType DeclType, ExprObjectKind OK,
NonOdrUseReason NOUR)
: Expr(MemberExprClass, T, VK, OK), Base(Base), MemberDecl(MemberDecl),
Deduced(Deduced), MemberDNLoc(NameInfo.getInfo()),
Expand All @@ -1784,6 +1789,8 @@ MemberExpr::MemberExpr(Expr *Base, bool IsArrow, SourceLocation OperatorLoc,
TemplateArgs || TemplateKWLoc.isValid();
MemberExprBits.HadMultipleCandidates = false;
MemberExprBits.NonOdrUseReason = NOUR;
MemberExprBits.HasResugaredDeclType =
needsDeclTypeStorage(MemberDecl, DeclType);
MemberExprBits.OperatorLoc = OperatorLoc;

if (hasQualifier())
Expand All @@ -1800,6 +1807,12 @@ MemberExpr::MemberExpr(Expr *Base, bool IsArrow, SourceLocation OperatorLoc,
getTrailingObjects<ASTTemplateKWAndArgsInfo>()->initializeFrom(
TemplateKWLoc);
}
if (HasResugaredDeclType()) {
assert(DeclType.getCanonicalType() ==
MemberDecl->getType().getCanonicalType());
*getTrailingObjects<QualType>() =
DeclType.isNull() ? MemberDecl->getType() : DeclType;
}
setDependence(computeDependence(this));
}

Expand All @@ -1809,45 +1822,60 @@ MemberExpr *MemberExpr::Create(
ValueDecl *MemberDecl, DeclAccessPair FoundDecl,
DeclarationNameInfo NameInfo, const TemplateArgumentListInfo *TemplateArgs,
const TemplateArgumentList *Deduced, QualType T, ExprValueKind VK,
ExprObjectKind OK, NonOdrUseReason NOUR) {
QualType DeclType, ExprObjectKind OK, NonOdrUseReason NOUR) {
bool HasQualifier = QualifierLoc.hasQualifier();
bool HasFoundDecl = FoundDecl.getDecl() != MemberDecl ||
FoundDecl.getAccess() != MemberDecl->getAccess();
bool HasTemplateKWAndArgsInfo = TemplateArgs || TemplateKWLoc.isValid();
std::size_t Size =
totalSizeToAlloc<NestedNameSpecifierLoc, DeclAccessPair,
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc>(
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc, QualType>(
HasQualifier, HasFoundDecl, HasTemplateKWAndArgsInfo,
TemplateArgs ? TemplateArgs->size() : 0);
TemplateArgs ? TemplateArgs->size() : 0,
needsDeclTypeStorage(MemberDecl, DeclType) ? 1 : 0);

void *Mem = C.Allocate(Size, alignof(MemberExpr));
return new (Mem) MemberExpr(Base, IsArrow, OperatorLoc, QualifierLoc,
TemplateKWLoc, MemberDecl, FoundDecl, NameInfo,
TemplateArgs, Deduced, T, VK, OK, NOUR);
TemplateArgs, Deduced, T, VK, DeclType, OK, NOUR);
}

MemberExpr *MemberExpr::CreateEmpty(const ASTContext &Context,
bool HasQualifier, bool HasFoundDecl,
bool HasTemplateKWAndArgsInfo,
unsigned NumTemplateArgs) {
unsigned NumTemplateArgs,
bool HasResugaredDeclType) {
assert((!NumTemplateArgs || HasTemplateKWAndArgsInfo) &&
"template args but no template arg info?");
std::size_t Size =
totalSizeToAlloc<NestedNameSpecifierLoc, DeclAccessPair,
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc>(
HasQualifier, HasFoundDecl, HasTemplateKWAndArgsInfo,
NumTemplateArgs);
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc, QualType>(
HasQualifier, HasFoundDecl, HasTemplateKWAndArgsInfo, NumTemplateArgs,
HasResugaredDeclType);
void *Mem = Context.Allocate(Size, alignof(MemberExpr));
return new (Mem) MemberExpr(EmptyShell());
}

void MemberExpr::setMemberDecl(ValueDecl *NewD) {
assert(MemberDecl != NewD);
assert(declaresSameEntity(MemberDecl, NewD));
assert(!HasResugaredDeclType() ||
MemberDecl->getASTContext().hasSameType(
NewD->getType(), *getTrailingObjects<QualType>()));
MemberDecl = NewD;
if (getType()->isUndeducedType())
setType(NewD->getType());
recomputeDependency();
}

void MemberExpr::recomputeDependency() {
setDependence(computeDependence(this));
}

void MemberExpr::setDeclType(QualType T) {
assert(!T.isNull());
if (HasResugaredDeclType())
*getTrailingObjects<QualType>() = T;
}

SourceLocation MemberExpr::getBeginLoc() const {
if (isImplicitAccess()) {
if (hasQualifier())
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Analysis/BodyFarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ MemberExpr *ASTMaker::makeMemberExpression(Expr *base, ValueDecl *MemberDecl,
SourceLocation(), MemberDecl, FoundDecl,
DeclarationNameInfo(MemberDecl->getDeclName(), SourceLocation()),
/* TemplateArgumentListInfo=*/nullptr, /*Deduced=*/nullptr,
MemberDecl->getType(), ValueKind, OK_Ordinary, NOUR_None);
MemberDecl->getType(), ValueKind, QualType(), OK_Ordinary, NOUR_None);
}

ValueDecl *ASTMaker::findMemberField(const RecordDecl *RD, StringRef Name) {
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/CodeGen/CGExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1867,7 +1867,7 @@ static DeclRefExpr *tryToConvertMemberExprToDeclRefExpr(CodeGenFunction &CGF,
return DeclRefExpr::Create(
CGF.getContext(), NestedNameSpecifierLoc(), SourceLocation(), VD,
/*RefersToEnclosingVariableOrCapture=*/false, ME->getExprLoc(),
ME->getType(), ME->getValueKind(), QualType(), nullptr, nullptr,
ME->getType(), ME->getValueKind(), ME->getDeclType(), nullptr, nullptr,
nullptr, ME->isNonOdrUse());
}
return nullptr;
Expand Down
19 changes: 6 additions & 13 deletions clang/lib/Sema/SemaExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19537,7 +19537,8 @@ static ExprResult rebuildPotentialResultsAsNonOdrUsed(Sema &S, Expr *E,
ME->getQualifierLoc(), ME->getTemplateKeywordLoc(),
ME->getMemberDecl(), ME->getFoundDecl(), ME->getMemberNameInfo(),
CopiedTemplateArgs(ME), ME->getDeduced(), ME->getType(),
ME->getValueKind(), ME->getObjectKind(), ME->isNonOdrUse());
ME->getValueKind(), ME->getDeclType(), ME->getObjectKind(),
ME->isNonOdrUse());
}

if (ME->getMemberDecl()->isCXXInstanceMember())
Expand All @@ -19554,7 +19555,7 @@ static ExprResult rebuildPotentialResultsAsNonOdrUsed(Sema &S, Expr *E,
S.Context, ME->getBase(), ME->isArrow(), ME->getOperatorLoc(),
ME->getQualifierLoc(), ME->getTemplateKeywordLoc(), ME->getMemberDecl(),
ME->getFoundDecl(), ME->getMemberNameInfo(), CopiedTemplateArgs(ME),
ME->getDeduced(), ME->getType(), ME->getValueKind(),
ME->getDeduced(), ME->getType(), ME->getValueKind(), ME->getDeclType(),
ME->getObjectKind(), NOUR);
}

Expand Down Expand Up @@ -19905,17 +19906,9 @@ static void DoMarkVarDeclReferenced(
DRE->setType(SemaRef.resugar(DRE, DRE->getDecl()));
DRE->recomputeDependency();
} else if (auto *ME = dyn_cast_or_null<MemberExpr>(E)) {
ME->setMemberDecl(ME->getMemberDecl());
CXXScopeSpec SS;
SS.Adopt(ME->getQualifierLoc());
assert(ME->template_arguments().size() == 0 ||
ME->getDeduced() != nullptr);
QualType T =
ME->getDeduced()
? SemaRef.resugar(SS.getScopeRep(), ME->getMemberDecl(),
ME->getDeduced()->asArray(), ME->getType())
: SemaRef.resugar(SS.getScopeRep(), ME->getType());
ME->setType(T);
if (ME->getType()->isUndeducedType())
ME->setType(SemaRef.resugar(ME, ME->getMemberDecl()));
ME->recomputeDependency();
}
} else if (FirstInstantiation) {
SemaRef.PendingInstantiations
Expand Down
Loading
Loading