[clang] [StaticAnalyzer] Migrate away from PointerUnion::{is,get} (NFC) (PR #118421)
Kazu Hirata via cfe-commits
cfe-commits at lists.llvm.org
Tue Dec 3 10:37:53 PST 2024
https://github.com/kazutakahirata updated https://github.com/llvm/llvm-project/pull/118421
>From 45da9c47e9cfb6c24a6a3e0bba89fa25a4bf2a2a Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Wed, 27 Nov 2024 09:15:12 -0800
Subject: [PATCH 1/2] [StaticAnalyzer] Migrate away from PointerUnion::{is,get}
(NFC)
Note that PointerUnion::{is,get} have 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>
I'm not touching PointerUnion::dyn_cast for now because it's a bit
complicated; we could blindly migrate it to dyn_cast_if_present, but
we should probably use dyn_cast when the operand is known to be
non-null.
---
.../Checkers/MallocSizeofChecker.cpp | 4 ++--
.../lib/StaticAnalyzer/Core/BasicValueFactory.cpp | 8 ++++----
clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp | 10 +++++-----
clang/lib/StaticAnalyzer/Core/MemRegion.cpp | 6 +++---
clang/lib/StaticAnalyzer/Core/SVals.cpp | 14 +++++++-------
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
index 9e81a6bd19fc5b..bfd31f25b26dc5 100644
--- a/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
@@ -211,8 +211,8 @@ class MallocSizeofChecker : public Checker<check::ASTCodeBody> {
continue;
const TypeSourceInfo *TSI = nullptr;
- if (CallRec.CastedExprParent.is<const VarDecl *>()) {
- TSI = CallRec.CastedExprParent.get<const VarDecl *>()
+ if (isa<const VarDecl *>(CallRec.CastedExprParent)) {
+ TSI = cast<const VarDecl *>(CallRec.CastedExprParent)
->getTypeSourceInfo();
} else {
TSI = CallRec.ExplicitCastType;
diff --git a/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp b/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
index b0563b6c070f1f..1f2e14424a264e 100644
--- a/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
+++ b/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
@@ -196,13 +196,13 @@ const PointerToMemberData *BasicValueFactory::accumCXXBase(
const NamedDecl *ND = nullptr;
llvm::ImmutableList<const CXXBaseSpecifier *> BaseSpecList;
- if (PTMDT.isNull() || PTMDT.is<const NamedDecl *>()) {
- if (PTMDT.is<const NamedDecl *>())
- ND = PTMDT.get<const NamedDecl *>();
+ if (PTMDT.isNull() || isa<const NamedDecl *>(PTMDT)) {
+ if (isa<const NamedDecl *>(PTMDT))
+ ND = cast<const NamedDecl *>(PTMDT);
BaseSpecList = CXXBaseListFactory.getEmptyList();
} else {
- const PointerToMemberData *PTMD = PTMDT.get<const PointerToMemberData *>();
+ const PointerToMemberData *PTMD = cast<const PointerToMemberData *>(PTMDT);
ND = PTMD->getDeclaratorDecl();
BaseSpecList = PTMD->getCXXBaseList();
diff --git a/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp b/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
index 1e0cc2eea9ed85..5f9de64b7d4c36 100644
--- a/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
@@ -211,9 +211,9 @@ void ExplodedNode::NodeGroup::replaceNode(ExplodedNode *node) {
assert(!getFlag());
GroupStorage &Storage = reinterpret_cast<GroupStorage&>(P);
- assert(Storage.is<ExplodedNode *>());
+ assert(isa<ExplodedNode *>(Storage));
Storage = node;
- assert(Storage.is<ExplodedNode *>());
+ assert(isa<ExplodedNode *>(Storage));
}
void ExplodedNode::NodeGroup::addNode(ExplodedNode *N, ExplodedGraph &G) {
@@ -222,7 +222,7 @@ void ExplodedNode::NodeGroup::addNode(ExplodedNode *N, ExplodedGraph &G) {
GroupStorage &Storage = reinterpret_cast<GroupStorage&>(P);
if (Storage.isNull()) {
Storage = N;
- assert(Storage.is<ExplodedNode *>());
+ assert(isa<ExplodedNode *>(Storage));
return;
}
@@ -230,7 +230,7 @@ void ExplodedNode::NodeGroup::addNode(ExplodedNode *N, ExplodedGraph &G) {
if (!V) {
// Switch from single-node to multi-node representation.
- ExplodedNode *Old = Storage.get<ExplodedNode *>();
+ ExplodedNode *Old = cast<ExplodedNode *>(Storage);
BumpVectorContext &Ctx = G.getNodeAllocator();
V = new (G.getAllocator()) ExplodedNodeVector(Ctx, 4);
@@ -238,7 +238,7 @@ void ExplodedNode::NodeGroup::addNode(ExplodedNode *N, ExplodedGraph &G) {
Storage = V;
assert(!getFlag());
- assert(Storage.is<ExplodedNodeVector *>());
+ assert(isa<ExplodedNodeVector *>(Storage));
}
V->push_back(N, G.getNodeAllocator());
diff --git a/clang/lib/StaticAnalyzer/Core/MemRegion.cpp b/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
index ad4e43630dd44e..0c4785d4d4c07d 100644
--- a/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
+++ b/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
@@ -1068,10 +1068,10 @@ const VarRegion *MemRegionManager::getVarRegion(const VarDecl *D,
llvm::PointerUnion<const StackFrameContext *, const VarRegion *> V =
getStackOrCaptureRegionForDeclContext(LC, DC, D);
- if (V.is<const VarRegion*>())
- return V.get<const VarRegion*>();
+ if (isa<const VarRegion *>(V))
+ return cast<const VarRegion *>(V);
- const auto *STC = V.get<const StackFrameContext *>();
+ const auto *STC = cast<const StackFrameContext *>(V);
if (!STC) {
// FIXME: Assign a more sensible memory space to static locals
diff --git a/clang/lib/StaticAnalyzer/Core/SVals.cpp b/clang/lib/StaticAnalyzer/Core/SVals.cpp
index 84e7e033404c03..b738190940dfb0 100644
--- a/clang/lib/StaticAnalyzer/Core/SVals.cpp
+++ b/clang/lib/StaticAnalyzer/Core/SVals.cpp
@@ -205,10 +205,10 @@ const NamedDecl *nonloc::PointerToMember::getDecl() const {
return nullptr;
const NamedDecl *ND = nullptr;
- if (PTMD.is<const NamedDecl *>())
- ND = PTMD.get<const NamedDecl *>();
+ if (isa<const NamedDecl *>(PTMD))
+ ND = cast<const NamedDecl *>(PTMD);
else
- ND = PTMD.get<const PointerToMemberData *>()->getDeclaratorDecl();
+ ND = cast<const PointerToMemberData *>(PTMD)->getDeclaratorDecl();
return ND;
}
@@ -227,16 +227,16 @@ nonloc::CompoundVal::iterator nonloc::CompoundVal::end() const {
nonloc::PointerToMember::iterator nonloc::PointerToMember::begin() const {
const PTMDataType PTMD = getPTMData();
- if (PTMD.is<const NamedDecl *>())
+ if (isa<const NamedDecl *>(PTMD))
return {};
- return PTMD.get<const PointerToMemberData *>()->begin();
+ return cast<const PointerToMemberData *>(PTMD)->begin();
}
nonloc::PointerToMember::iterator nonloc::PointerToMember::end() const {
const PTMDataType PTMD = getPTMData();
- if (PTMD.is<const NamedDecl *>())
+ if (isa<const NamedDecl *>(PTMD))
return {};
- return PTMD.get<const PointerToMemberData *>()->end();
+ return cast<const PointerToMemberData *>(PTMD)->end();
}
//===----------------------------------------------------------------------===//
>From f5e2453dd5d96ee8038fb07cbf5f49098e2ac41e Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Tue, 3 Dec 2024 09:05:22 -0800
Subject: [PATCH 2/2] Address comments.
---
clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp | 5 ++---
clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp | 6 +++---
clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp | 2 +-
clang/lib/StaticAnalyzer/Core/MemRegion.cpp | 4 ++--
clang/lib/StaticAnalyzer/Core/SVals.cpp | 4 ++--
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
index bfd31f25b26dc5..050d82a383d90c 100644
--- a/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
@@ -211,9 +211,8 @@ class MallocSizeofChecker : public Checker<check::ASTCodeBody> {
continue;
const TypeSourceInfo *TSI = nullptr;
- if (isa<const VarDecl *>(CallRec.CastedExprParent)) {
- TSI = cast<const VarDecl *>(CallRec.CastedExprParent)
- ->getTypeSourceInfo();
+ if (const auto *VD = dyn_cast<const VarDecl *>(CallRec.CastedExprParent)) {
+ TSI = VD->getTypeSourceInfo();
} else {
TSI = CallRec.ExplicitCastType;
}
diff --git a/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp b/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
index 1f2e14424a264e..827c04143e6588 100644
--- a/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
+++ b/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
@@ -197,12 +197,12 @@ const PointerToMemberData *BasicValueFactory::accumCXXBase(
llvm::ImmutableList<const CXXBaseSpecifier *> BaseSpecList;
if (PTMDT.isNull() || isa<const NamedDecl *>(PTMDT)) {
- if (isa<const NamedDecl *>(PTMDT))
- ND = cast<const NamedDecl *>(PTMDT);
+ if (const auto *NDP = dyn_cast_if_present<const NamedDecl *>(PTMDT))
+ ND = NDP;
BaseSpecList = CXXBaseListFactory.getEmptyList();
} else {
- const PointerToMemberData *PTMD = cast<const PointerToMemberData *>(PTMDT);
+ const auto *PTMD = cast<const PointerToMemberData *>(PTMDT);
ND = PTMD->getDeclaratorDecl();
BaseSpecList = PTMD->getCXXBaseList();
diff --git a/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp b/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
index 5f9de64b7d4c36..c4af02f21f4943 100644
--- a/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
@@ -230,7 +230,7 @@ void ExplodedNode::NodeGroup::addNode(ExplodedNode *N, ExplodedGraph &G) {
if (!V) {
// Switch from single-node to multi-node representation.
- ExplodedNode *Old = cast<ExplodedNode *>(Storage);
+ auto *Old = cast<ExplodedNode *>(Storage);
BumpVectorContext &Ctx = G.getNodeAllocator();
V = new (G.getAllocator()) ExplodedNodeVector(Ctx, 4);
diff --git a/clang/lib/StaticAnalyzer/Core/MemRegion.cpp b/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
index 0c4785d4d4c07d..bbf2303b9f6ef3 100644
--- a/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
+++ b/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
@@ -1068,8 +1068,8 @@ const VarRegion *MemRegionManager::getVarRegion(const VarDecl *D,
llvm::PointerUnion<const StackFrameContext *, const VarRegion *> V =
getStackOrCaptureRegionForDeclContext(LC, DC, D);
- if (isa<const VarRegion *>(V))
- return cast<const VarRegion *>(V);
+ if (const auto *VR = dyn_cast_if_present<const VarRegion *>(V))
+ return VR;
const auto *STC = cast<const StackFrameContext *>(V);
diff --git a/clang/lib/StaticAnalyzer/Core/SVals.cpp b/clang/lib/StaticAnalyzer/Core/SVals.cpp
index b738190940dfb0..d009552965eca8 100644
--- a/clang/lib/StaticAnalyzer/Core/SVals.cpp
+++ b/clang/lib/StaticAnalyzer/Core/SVals.cpp
@@ -205,8 +205,8 @@ const NamedDecl *nonloc::PointerToMember::getDecl() const {
return nullptr;
const NamedDecl *ND = nullptr;
- if (isa<const NamedDecl *>(PTMD))
- ND = cast<const NamedDecl *>(PTMD);
+ if (const auto *NDP = dyn_cast<const NamedDecl *>(PTMD))
+ ND = NDP;
else
ND = cast<const PointerToMemberData *>(PTMD)->getDeclaratorDecl();
More information about the cfe-commits
mailing list