Skip to content

Commit 563c7c5

Browse files
kazutakahiratakazutakahirata
authored
[clang] Migrate away from PointerUnion::dyn_cast (NFC) (#124425)
Note that PointerUnion::dyn_cast has been soft deprecated in PointerUnion.h: // FIXME: Replace the uses of is(), get() and dyn_cast() with // isa<T>, cast<T> and the llvm::dyn_cast<T> This patch migrates uses of PointerUnion::dyn_cast to dyn_cast_if_present (see the definition of PointerUnion::dyn_cast). Note that we cannot use dyn_cast in any of the migrations in this patch; placing assert(!X.isNull()); just before any of dyn_cast_if_present in this patch triggers some failure in check-clang.
1 parent 1395cd0 commit 563c7c5

File tree

17 files changed

+83
-70
lines changed

17 files changed

+83
-70
lines changed

‎clang/include/clang/AST/APValue.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ class APValue {
161161

162162
template <class T> T get() const { return cast<T>(Ptr); }
163163

164-
template <class T>
165-
T dyn_cast() const { return Ptr.dyn_cast<T>(); }
164+
template <class T> T dyn_cast() const {
165+
return dyn_cast_if_present<T>(Ptr);
166+
}
166167

167168
void *getOpaqueValue() const;
168169

‎clang/include/clang/AST/ASTContext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
769769
/// pool.
770770
DeclListNode *AllocateDeclListNode(clang::NamedDecl *ND) {
771771
if (DeclListNode *Alloc = ListNodeFreeList) {
772-
ListNodeFreeList = Alloc->Rest.dyn_cast<DeclListNode*>();
772+
ListNodeFreeList = dyn_cast_if_present<DeclListNode *>(Alloc->Rest);
773773
Alloc->D = ND;
774774
Alloc->Rest = nullptr;
775775
return Alloc;

‎clang/include/clang/AST/Decl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4035,7 +4035,7 @@ class EnumDecl : public TagDecl {
40354035
/// Return the type source info for the underlying integer type,
40364036
/// if no type source info exists, return 0.
40374037
TypeSourceInfo *getIntegerTypeSourceInfo() const {
4038-
return IntegerType.dyn_cast<TypeSourceInfo*>();
4038+
return dyn_cast_if_present<TypeSourceInfo *>(IntegerType);
40394039
}
40404040

40414041
/// Retrieve the source range that covers the underlying type if

‎clang/include/clang/AST/DeclBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ class DeclContextLookupResult {
13911391
const_iterator end() const { return iterator(); }
13921392

13931393
bool empty() const { return Result.isNull(); }
1394-
bool isSingleResult() const { return Result.dyn_cast<NamedDecl*>(); }
1394+
bool isSingleResult() const { return isa_and_present<NamedDecl *>(Result); }
13951395
reference front() const { return *begin(); }
13961396

13971397
// Find the first declaration of the given type in the list. Note that this

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,7 +2009,8 @@ class ClassTemplateSpecializationDecl : public CXXRecordDecl,
20092009
/// Retrieve the template argument list as written in the sources,
20102010
/// if any.
20112011
const ASTTemplateArgumentListInfo *getTemplateArgsAsWritten() const {
2012-
if (auto *Info = ExplicitInfo.dyn_cast<ExplicitInstantiationInfo *>())
2012+
if (auto *Info =
2013+
dyn_cast_if_present<ExplicitInstantiationInfo *>(ExplicitInfo))
20132014
return Info->TemplateArgsAsWritten;
20142015
return cast<const ASTTemplateArgumentListInfo *>(ExplicitInfo);
20152016
}
@@ -2041,7 +2042,8 @@ class ClassTemplateSpecializationDecl : public CXXRecordDecl,
20412042

20422043
/// Gets the location of the template keyword, if present.
20432044
SourceLocation getTemplateKeywordLoc() const {
2044-
if (auto *Info = ExplicitInfo.dyn_cast<ExplicitInstantiationInfo *>())
2045+
if (auto *Info =
2046+
dyn_cast_if_present<ExplicitInstantiationInfo *>(ExplicitInfo))
20452047
return Info->TemplateKeywordLoc;
20462048
return SourceLocation();
20472049
}
@@ -2786,7 +2788,8 @@ class VarTemplateSpecializationDecl : public VarDecl,
27862788
/// Set the template argument list as written in the sources.
27872789
void
27882790
setTemplateArgsAsWritten(const ASTTemplateArgumentListInfo *ArgsWritten) {
2789-
if (auto *Info = ExplicitInfo.dyn_cast<ExplicitInstantiationInfo *>())
2791+
if (auto *Info =
2792+
dyn_cast_if_present<ExplicitInstantiationInfo *>(ExplicitInfo))
27902793
Info->TemplateArgsAsWritten = ArgsWritten;
27912794
else
27922795
ExplicitInfo = ArgsWritten;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5180,7 +5180,7 @@ class InitListExpr : public Expr {
51805180
/// than there are initializers in the list, specifies an expression to be
51815181
/// used for value initialization of the rest of the elements.
51825182
Expr *getArrayFiller() {
5183-
return ArrayFillerOrUnionFieldInit.dyn_cast<Expr *>();
5183+
return dyn_cast_if_present<Expr *>(ArrayFillerOrUnionFieldInit);
51845184
}
51855185
const Expr *getArrayFiller() const {
51865186
return const_cast<InitListExpr *>(this)->getArrayFiller();
@@ -5205,7 +5205,7 @@ class InitListExpr : public Expr {
52055205
/// union. However, a designated initializer can specify the
52065206
/// initialization of a different field within the union.
52075207
FieldDecl *getInitializedFieldInUnion() {
5208-
return ArrayFillerOrUnionFieldInit.dyn_cast<FieldDecl *>();
5208+
return dyn_cast_if_present<FieldDecl *>(ArrayFillerOrUnionFieldInit);
52095209
}
52105210
const FieldDecl *getInitializedFieldInUnion() const {
52115211
return const_cast<InitListExpr *>(this)->getInitializedFieldInUnion();

‎clang/include/clang/AST/ExprCXX.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5026,19 +5026,19 @@ class CXXParenListInitExpr final
50265026
void setArrayFiller(Expr *E) { ArrayFillerOrUnionFieldInit = E; }
50275027

50285028
Expr *getArrayFiller() {
5029-
return ArrayFillerOrUnionFieldInit.dyn_cast<Expr *>();
5029+
return dyn_cast_if_present<Expr *>(ArrayFillerOrUnionFieldInit);
50305030
}
50315031

50325032
const Expr *getArrayFiller() const {
5033-
return ArrayFillerOrUnionFieldInit.dyn_cast<Expr *>();
5033+
return dyn_cast_if_present<Expr *>(ArrayFillerOrUnionFieldInit);
50345034
}
50355035

50365036
void setInitializedFieldInUnion(FieldDecl *FD) {
50375037
ArrayFillerOrUnionFieldInit = FD;
50385038
}
50395039

50405040
FieldDecl *getInitializedFieldInUnion() {
5041-
return ArrayFillerOrUnionFieldInit.dyn_cast<FieldDecl *>();
5041+
return dyn_cast_if_present<FieldDecl *>(ArrayFillerOrUnionFieldInit);
50425042
}
50435043

50445044
const FieldDecl *getInitializedFieldInUnion() const {

‎clang/include/clang/Basic/IdentifierTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ class Selector {
10081008
}
10091009

10101010
const IdentifierInfo *getAsIdentifierInfo() const {
1011-
return InfoPtr.getPointer().dyn_cast<const IdentifierInfo *>();
1011+
return dyn_cast_if_present<const IdentifierInfo *>(InfoPtr.getPointer());
10121012
}
10131013

10141014
MultiKeywordSelector *getMultiKeywordSelector() const {

‎clang/include/clang/Lex/Preprocessor.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ class Preprocessor {
856856
!PP.CurSubmoduleState->VisibleModules.getGeneration())
857857
return nullptr;
858858

859-
auto *Info = State.dyn_cast<ModuleMacroInfo*>();
859+
auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State);
860860
if (!Info) {
861861
Info = new (PP.getPreprocessorAllocator())
862862
ModuleMacroInfo(cast<MacroDirective *>(State));
@@ -885,18 +885,18 @@ class Preprocessor {
885885
}
886886

887887
~MacroState() {
888-
if (auto *Info = State.dyn_cast<ModuleMacroInfo*>())
888+
if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
889889
Info->~ModuleMacroInfo();
890890
}
891891

892892
MacroDirective *getLatest() const {
893-
if (auto *Info = State.dyn_cast<ModuleMacroInfo*>())
893+
if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
894894
return Info->MD;
895895
return cast<MacroDirective *>(State);
896896
}
897897

898898
void setLatest(MacroDirective *MD) {
899-
if (auto *Info = State.dyn_cast<ModuleMacroInfo*>())
899+
if (auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State))
900900
Info->MD = MD;
901901
else
902902
State = MD;
@@ -940,7 +940,7 @@ class Preprocessor {
940940

941941
void setOverriddenMacros(Preprocessor &PP,
942942
ArrayRef<ModuleMacro *> Overrides) {
943-
auto *Info = State.dyn_cast<ModuleMacroInfo*>();
943+
auto *Info = dyn_cast_if_present<ModuleMacroInfo *>(State);
944944
if (!Info) {
945945
if (Overrides.empty())
946946
return;

‎clang/lib/APINotes/APINotesManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ APINotesManager::APINotesManager(SourceManager &SM, const LangOptions &LangOpts)
5656
APINotesManager::~APINotesManager() {
5757
// Free the API notes readers.
5858
for (const auto &Entry : Readers) {
59-
if (auto Reader = Entry.second.dyn_cast<APINotesReader *>())
59+
if (auto Reader = dyn_cast_if_present<APINotesReader *>(Entry.second))
6060
delete Reader;
6161
}
6262

@@ -381,7 +381,7 @@ APINotesManager::findAPINotes(SourceLocation Loc) {
381381
}
382382

383383
// We have the answer.
384-
if (auto Reader = Known->second.dyn_cast<APINotesReader *>())
384+
if (auto Reader = dyn_cast_if_present<APINotesReader *>(Known->second))
385385
Results.push_back(Reader);
386386
break;
387387
}

‎clang/lib/AST/Decl.cpp

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,7 +2447,7 @@ bool VarDecl::isOutOfLine() const {
24472447
}
24482448

24492449
void VarDecl::setInit(Expr *I) {
2450-
if (auto *Eval = Init.dyn_cast<EvaluatedStmt *>()) {
2450+
if (auto *Eval = dyn_cast_if_present<EvaluatedStmt *>(Init)) {
24512451
Eval->~EvaluatedStmt();
24522452
getASTContext().Deallocate(Eval);
24532453
}
@@ -2527,7 +2527,7 @@ bool VarDecl::isUsableInConstantExpressions(const ASTContext &Context) const {
25272527
/// form, which contains extra information on the evaluated value of the
25282528
/// initializer.
25292529
EvaluatedStmt *VarDecl::ensureEvaluatedStmt() const {
2530-
auto *Eval = Init.dyn_cast<EvaluatedStmt *>();
2530+
auto *Eval = dyn_cast_if_present<EvaluatedStmt *>(Init);
25312531
if (!Eval) {
25322532
// Note: EvaluatedStmt contains an APValue, which usually holds
25332533
// resources not allocated from the ASTContext. We need to do some
@@ -2541,7 +2541,7 @@ EvaluatedStmt *VarDecl::ensureEvaluatedStmt() const {
25412541
}
25422542

25432543
EvaluatedStmt *VarDecl::getEvaluatedStmt() const {
2544-
return Init.dyn_cast<EvaluatedStmt *>();
2544+
return dyn_cast_if_present<EvaluatedStmt *>(Init);
25452545
}
25462546

25472547
APValue *VarDecl::evaluateValue() const {
@@ -2784,8 +2784,8 @@ SourceLocation VarDecl::getPointOfInstantiation() const {
27842784
}
27852785

27862786
VarTemplateDecl *VarDecl::getDescribedVarTemplate() const {
2787-
return getASTContext().getTemplateOrSpecializationInfo(this)
2788-
.dyn_cast<VarTemplateDecl *>();
2787+
return dyn_cast_if_present<VarTemplateDecl *>(
2788+
getASTContext().getTemplateOrSpecializationInfo(this));
27892789
}
27902790

27912791
void VarDecl::setDescribedVarTemplate(VarTemplateDecl *Template) {
@@ -2875,8 +2875,8 @@ MemberSpecializationInfo *VarDecl::getMemberSpecializationInfo() const {
28752875
if (isStaticDataMember())
28762876
// FIXME: Remove ?
28772877
// return getASTContext().getInstantiatedFromStaticDataMember(this);
2878-
return getASTContext().getTemplateOrSpecializationInfo(this)
2879-
.dyn_cast<MemberSpecializationInfo *>();
2878+
return dyn_cast_if_present<MemberSpecializationInfo *>(
2879+
getASTContext().getTemplateOrSpecializationInfo(this));
28802880
return nullptr;
28812881
}
28822882

@@ -4040,11 +4040,11 @@ FunctionDecl *FunctionDecl::getInstantiatedFromMemberFunction() const {
40404040
}
40414041

40424042
MemberSpecializationInfo *FunctionDecl::getMemberSpecializationInfo() const {
4043-
if (auto *MSI =
4044-
TemplateOrSpecialization.dyn_cast<MemberSpecializationInfo *>())
4043+
if (auto *MSI = dyn_cast_if_present<MemberSpecializationInfo *>(
4044+
TemplateOrSpecialization))
40454045
return MSI;
4046-
if (auto *FTSI = TemplateOrSpecialization
4047-
.dyn_cast<FunctionTemplateSpecializationInfo *>())
4046+
if (auto *FTSI = dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4047+
TemplateOrSpecialization))
40484048
return FTSI->getMemberSpecializationInfo();
40494049
return nullptr;
40504050
}
@@ -4062,7 +4062,7 @@ FunctionDecl::setInstantiationOfMemberFunction(ASTContext &C,
40624062

40634063
FunctionTemplateDecl *FunctionDecl::getDescribedFunctionTemplate() const {
40644064
return dyn_cast_if_present<FunctionTemplateDecl>(
4065-
TemplateOrSpecialization.dyn_cast<NamedDecl *>());
4065+
dyn_cast_if_present<NamedDecl *>(TemplateOrSpecialization));
40664066
}
40674067

40684068
void FunctionDecl::setDescribedFunctionTemplate(
@@ -4181,40 +4181,40 @@ FunctionDecl::getTemplateInstantiationPattern(bool ForDefinition) const {
41814181
}
41824182

41834183
FunctionTemplateDecl *FunctionDecl::getPrimaryTemplate() const {
4184-
if (FunctionTemplateSpecializationInfo *Info
4185-
= TemplateOrSpecialization
4186-
.dyn_cast<FunctionTemplateSpecializationInfo*>()) {
4184+
if (FunctionTemplateSpecializationInfo *Info =
4185+
dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4186+
TemplateOrSpecialization)) {
41874187
return Info->getTemplate();
41884188
}
41894189
return nullptr;
41904190
}
41914191

41924192
FunctionTemplateSpecializationInfo *
41934193
FunctionDecl::getTemplateSpecializationInfo() const {
4194-
return TemplateOrSpecialization
4195-
.dyn_cast<FunctionTemplateSpecializationInfo *>();
4194+
return dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4195+
TemplateOrSpecialization);
41964196
}
41974197

41984198
const TemplateArgumentList *
41994199
FunctionDecl::getTemplateSpecializationArgs() const {
4200-
if (FunctionTemplateSpecializationInfo *Info
4201-
= TemplateOrSpecialization
4202-
.dyn_cast<FunctionTemplateSpecializationInfo*>()) {
4200+
if (FunctionTemplateSpecializationInfo *Info =
4201+
dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4202+
TemplateOrSpecialization)) {
42034203
return Info->TemplateArguments;
42044204
}
42054205
return nullptr;
42064206
}
42074207

42084208
const ASTTemplateArgumentListInfo *
42094209
FunctionDecl::getTemplateSpecializationArgsAsWritten() const {
4210-
if (FunctionTemplateSpecializationInfo *Info
4211-
= TemplateOrSpecialization
4212-
.dyn_cast<FunctionTemplateSpecializationInfo*>()) {
4210+
if (FunctionTemplateSpecializationInfo *Info =
4211+
dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4212+
TemplateOrSpecialization)) {
42134213
return Info->TemplateArgumentsAsWritten;
42144214
}
42154215
if (DependentFunctionTemplateSpecializationInfo *Info =
4216-
TemplateOrSpecialization
4217-
.dyn_cast<DependentFunctionTemplateSpecializationInfo *>()) {
4216+
dyn_cast_if_present<DependentFunctionTemplateSpecializationInfo *>(
4217+
TemplateOrSpecialization)) {
42184218
return Info->TemplateArgumentsAsWritten;
42194219
}
42204220
return nullptr;
@@ -4239,7 +4239,8 @@ void FunctionDecl::setFunctionTemplateSpecialization(
42394239
FunctionTemplateSpecializationInfo::Create(
42404240
C, this, Template, TSK, TemplateArgs, TemplateArgsAsWritten,
42414241
PointOfInstantiation,
4242-
TemplateOrSpecialization.dyn_cast<MemberSpecializationInfo *>());
4242+
dyn_cast_if_present<MemberSpecializationInfo *>(
4243+
TemplateOrSpecialization));
42434244
TemplateOrSpecialization = Info;
42444245
Template->addSpecialization(Info, InsertPos);
42454246
}
@@ -4256,8 +4257,8 @@ void FunctionDecl::setDependentTemplateSpecialization(
42564257

42574258
DependentFunctionTemplateSpecializationInfo *
42584259
FunctionDecl::getDependentSpecializationInfo() const {
4259-
return TemplateOrSpecialization
4260-
.dyn_cast<DependentFunctionTemplateSpecializationInfo *>();
4260+
return dyn_cast_if_present<DependentFunctionTemplateSpecializationInfo *>(
4261+
TemplateOrSpecialization);
42614262
}
42624263

42634264
DependentFunctionTemplateSpecializationInfo *
@@ -4288,12 +4289,13 @@ TemplateSpecializationKind FunctionDecl::getTemplateSpecializationKind() const {
42884289
// For a function template specialization, query the specialization
42894290
// information object.
42904291
if (FunctionTemplateSpecializationInfo *FTSInfo =
4291-
TemplateOrSpecialization
4292-
.dyn_cast<FunctionTemplateSpecializationInfo *>())
4292+
dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4293+
TemplateOrSpecialization))
42934294
return FTSInfo->getTemplateSpecializationKind();
42944295

42954296
if (MemberSpecializationInfo *MSInfo =
4296-
TemplateOrSpecialization.dyn_cast<MemberSpecializationInfo *>())
4297+
dyn_cast_if_present<MemberSpecializationInfo *>(
4298+
TemplateOrSpecialization))
42974299
return MSInfo->getTemplateSpecializationKind();
42984300

42994301
// A dependent function template specialization is an explicit specialization,
@@ -4331,15 +4333,16 @@ FunctionDecl::getTemplateSpecializationKindForInstantiation() const {
43314333
// of A<int>::f, and that A<int>::f<int> should be implicitly instantiated
43324334
// from A::f<int> if a definition is needed.
43334335
if (FunctionTemplateSpecializationInfo *FTSInfo =
4334-
TemplateOrSpecialization
4335-
.dyn_cast<FunctionTemplateSpecializationInfo *>()) {
4336+
dyn_cast_if_present<FunctionTemplateSpecializationInfo *>(
4337+
TemplateOrSpecialization)) {
43364338
if (auto *MSInfo = FTSInfo->getMemberSpecializationInfo())
43374339
return MSInfo->getTemplateSpecializationKind();
43384340
return FTSInfo->getTemplateSpecializationKind();
43394341
}
43404342

43414343
if (MemberSpecializationInfo *MSInfo =
4342-
TemplateOrSpecialization.dyn_cast<MemberSpecializationInfo *>())
4344+
dyn_cast_if_present<MemberSpecializationInfo *>(
4345+
TemplateOrSpecialization))
43434346
return MSInfo->getTemplateSpecializationKind();
43444347

43454348
if (isa<DependentFunctionTemplateSpecializationInfo *>(

0 commit comments

Comments
 (0)