Skip to content

[Serialization] Migrate away from PointerUnion::{is,get} (NFC) #118948

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

Merged
merged 1 commit into from
Dec 9, 2024
Merged

[Serialization] Migrate away from PointerUnion::{is,get} (NFC) #118948

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
6 changes: 3 additions & 3 deletions clang/lib/Serialization/ASTReaderDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4598,7 +4598,7 @@ void ASTDeclReader::UpdateDecl(Decl *D) {
.dyn_cast<FunctionTemplateSpecializationInfo *>())
FTSInfo->setPointOfInstantiation(POI);
else
FD->TemplateOrSpecialization.get<MemberSpecializationInfo *>()
cast<MemberSpecializationInfo *>(FD->TemplateOrSpecialization)
->setPointOfInstantiation(POI);
}
break;
Expand Down Expand Up @@ -4697,8 +4697,8 @@ void ASTDeclReader::UpdateDecl(Decl *D) {

// FIXME: If we already have a partial specialization set,
// check that it matches.
if (!Spec->getSpecializedTemplateOrPartial()
.is<ClassTemplatePartialSpecializationDecl *>())
if (!isa<ClassTemplatePartialSpecializationDecl *>(
Spec->getSpecializedTemplateOrPartial()))
Spec->setInstantiationOf(PartialSpec, TemplArgList);
}
}
Expand Down
6 changes: 3 additions & 3 deletions clang/lib/Serialization/ASTReaderStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,9 +911,9 @@ void ASTStmtReader::VisitRequiresExpr(RequiresExpr *E) {
std::move(*Req), Status, SubstitutedConstraintExpr);
else
R = new (Record.getContext()) concepts::ExprRequirement(
E.get<concepts::Requirement::SubstitutionDiagnostic *>(),
RK == concepts::Requirement::RK_Simple, NoexceptLoc,
std::move(*Req));
cast<concepts::Requirement::SubstitutionDiagnostic *>(E),
RK == concepts::Requirement::RK_Simple, NoexceptLoc,
std::move(*Req));
} break;
case concepts::Requirement::RK_Nested: {
ASTContext &C = Record.getContext();
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Serialization/ASTWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5111,7 +5111,7 @@ ASTWriter::WriteAST(llvm::PointerUnion<Sema *, Preprocessor *> Subject,

Sema *SemaPtr = Subject.dyn_cast<Sema *>();
Preprocessor &PPRef =
SemaPtr ? SemaPtr->getPreprocessor() : *Subject.get<Preprocessor *>();
SemaPtr ? SemaPtr->getPreprocessor() : *cast<Preprocessor *>(Subject);

ASTHasCompilerErrors = PPRef.getDiagnostics().hasUncompilableErrorOccurred();

Expand Down
6 changes: 3 additions & 3 deletions clang/lib/Serialization/ASTWriterDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,7 @@ void ASTDeclWriter::VisitFriendDecl(FriendDecl *D) {
// so as to simplify memory allocation during deserialization.
Record.push_back(D->NumTPLists);
VisitDecl(D);
bool hasFriendDecl = D->Friend.is<NamedDecl*>();
bool hasFriendDecl = isa<NamedDecl *>(D->Friend);
Record.push_back(hasFriendDecl);
if (hasFriendDecl)
Record.AddDeclRef(D->getFriendDecl());
Expand Down Expand Up @@ -1795,7 +1795,7 @@ void ASTDeclWriter::VisitClassTemplateSpecializationDecl(
if (Decl *InstFromD = InstFrom.dyn_cast<ClassTemplateDecl *>()) {
Record.AddDeclRef(InstFromD);
} else {
Record.AddDeclRef(InstFrom.get<ClassTemplatePartialSpecializationDecl *>());
Record.AddDeclRef(cast<ClassTemplatePartialSpecializationDecl *>(InstFrom));
Record.AddTemplateArgumentList(&D->getTemplateInstantiationArgs());
}

Expand Down Expand Up @@ -1873,7 +1873,7 @@ void ASTDeclWriter::VisitVarTemplateSpecializationDecl(
if (Decl *InstFromD = InstFrom.dyn_cast<VarTemplateDecl *>()) {
Record.AddDeclRef(InstFromD);
} else {
Record.AddDeclRef(InstFrom.get<VarTemplatePartialSpecializationDecl *>());
Record.AddDeclRef(cast<VarTemplatePartialSpecializationDecl *>(InstFrom));
Record.AddTemplateArgumentList(&D->getTemplateInstantiationArgs());
}

Expand Down
11 changes: 6 additions & 5 deletions clang/lib/Serialization/ASTWriterStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ addConstraintSatisfaction(ASTRecordWriter &Record,
if (E)
Record.AddStmt(E);
else {
auto *Diag = DetailRecord.get<std::pair<SourceLocation, StringRef> *>();
auto *Diag = cast<std::pair<SourceLocation, StringRef> *>(DetailRecord);
Record.AddSourceLocation(Diag->first);
Record.AddString(Diag->second);
}
Expand Down Expand Up @@ -532,10 +532,11 @@ void ASTStmtWriter::VisitRequiresExpr(RequiresExpr *E) {
Record.push_back(ExprReq->getKind());
Record.push_back(ExprReq->Status);
if (ExprReq->isExprSubstitutionFailure()) {
addSubstitutionDiagnostic(Record,
ExprReq->Value.get<concepts::Requirement::SubstitutionDiagnostic *>());
addSubstitutionDiagnostic(
Record, cast<concepts::Requirement::SubstitutionDiagnostic *>(
ExprReq->Value));
} else
Record.AddStmt(ExprReq->Value.get<Expr *>());
Record.AddStmt(cast<Expr *>(ExprReq->Value));
if (ExprReq->getKind() == concepts::Requirement::RK_Compound) {
Record.AddSourceLocation(ExprReq->NoexceptLoc);
const auto &RetReq = ExprReq->getReturnTypeRequirement();
Expand Down Expand Up @@ -1166,7 +1167,7 @@ void ASTStmtWriter::VisitInitListExpr(InitListExpr *E) {
Record.AddStmt(E->getSyntacticForm());
Record.AddSourceLocation(E->getLBraceLoc());
Record.AddSourceLocation(E->getRBraceLoc());
bool isArrayFiller = E->ArrayFillerOrUnionFieldInit.is<Expr*>();
bool isArrayFiller = isa<Expr *>(E->ArrayFillerOrUnionFieldInit);
Record.push_back(isArrayFiller);
if (isArrayFiller)
Record.AddStmt(E->getArrayFiller());
Expand Down
Loading