Skip to content

[analyzer][NFC] Migrate loc::ConcreteInt to use APSIntPtr (3/4) #120437

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 19, 2024
+10 −7
Merged

[analyzer][NFC] Migrate loc::ConcreteInt to use APSIntPtr (3/4) #120437

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
7 changes: 5 additions & 2 deletions clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,12 @@ class MemRegionVal : public Loc {

class ConcreteInt : public Loc {
public:
explicit ConcreteInt(const llvm::APSInt &V) : Loc(ConcreteIntKind, &V) {}
explicit ConcreteInt(APSIntPtr V) : Loc(ConcreteIntKind, V.get()) {}

const llvm::APSInt &getValue() const { return *castDataAs<llvm::APSInt>(); }
APSIntPtr getValue() const {
// This is safe because in the ctor we take a safe APSIntPtr.
return APSIntPtr::unsafeConstructor(castDataAs<llvm::APSInt>());
}

static bool classof(SVal V) { return V.getKind() == ConcreteIntKind; }
};
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ class EvalCastVisitor : public SValVisitor<EvalCastVisitor, SVal> {
SVal VisitConcreteInt(loc::ConcreteInt V) {
// Pointer to bool.
if (CastTy->isBooleanType())
return VB.makeTruthVal(V.getValue().getBoolValue(), CastTy);
return VB.makeTruthVal(V.getValue()->getBoolValue(), CastTy);

// Pointer to integer.
if (CastTy->isIntegralOrEnumerationType()) {
Expand Down
6 changes: 3 additions & 3 deletions clang/lib/StaticAnalyzer/Core/SVals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const llvm::APSInt *SVal::getAsInteger() const {
if (auto CI = getAs<nonloc::ConcreteInt>())
return CI->getValue().get();
if (auto CI = getAs<loc::ConcreteInt>())
return &CI->getValue();
return CI->getValue().get();
return nullptr;
}

Expand Down Expand Up @@ -249,7 +249,7 @@ bool SVal::isConstant() const {

bool SVal::isConstant(int I) const {
if (std::optional<loc::ConcreteInt> LV = getAs<loc::ConcreteInt>())
return LV->getValue() == I;
return *LV->getValue().get() == I;
if (std::optional<nonloc::ConcreteInt> NV = getAs<nonloc::ConcreteInt>())
return *NV->getValue().get() == I;
return false;
Expand Down Expand Up @@ -380,7 +380,7 @@ void NonLoc::dumpToStream(raw_ostream &os) const {
void Loc::dumpToStream(raw_ostream &os) const {
switch (getKind()) {
case loc::ConcreteIntKind:
os << castAs<loc::ConcreteInt>().getValue().getZExtValue() << " (Loc)";
os << castAs<loc::ConcreteInt>().getValue()->getZExtValue() << " (Loc)";
break;
case loc::GotoLabelKind:
os << "&&" << castAs<loc::GotoLabel>().getLabel()->getName();
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ const llvm::APSInt *SimpleSValBuilder::getConstValue(ProgramStateRef state,

const llvm::APSInt *SimpleSValBuilder::getConcreteValue(SVal V) {
if (std::optional<loc::ConcreteInt> X = V.getAs<loc::ConcreteInt>())
return &X->getValue();
return X->getValue().get();

if (std::optional<nonloc::ConcreteInt> X = V.getAs<nonloc::ConcreteInt>())
return X->getValue().get();
Expand Down
Loading