Skip to content
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

[analyzer][NFC] Trivial refactoring of region invalidation #102456

Merged
merged 1 commit into from
Aug 12, 2024
Merged

[analyzer][NFC] Trivial refactoring of region invalidation #102456

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
11 changes: 0 additions & 11 deletions clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,17 +484,6 @@ class ProgramState : public llvm::FoldingSetNode {
friend void ProgramStateRetain(const ProgramState *state);
friend void ProgramStateRelease(const ProgramState *state);

/// \sa invalidateValues()
/// \sa invalidateRegions()
ProgramStateRef
invalidateRegionsImpl(ArrayRef<SVal> Values,
const Expr *E, unsigned BlockCount,
const LocationContext *LCtx,
bool ResultsInSymbolEscape,
InvalidatedSymbols *IS,
RegionAndSymbolInvalidationTraits *HTraits,
const CallEvent *Call) const;

SVal wrapSymbolicRegion(SVal Base) const;
};

Expand Down
33 changes: 9 additions & 24 deletions clang/lib/StaticAnalyzer/Core/ProgramState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ ProgramState::invalidateRegions(RegionList Regions,
for (const MemRegion *Reg : Regions)
Values.push_back(loc::MemRegionVal(Reg));

return invalidateRegionsImpl(Values, E, Count, LCtx, CausedByPointerEscape,
IS, ITraits, Call);
return invalidateRegions(Values, E, Count, LCtx, CausedByPointerEscape, IS,
Call, ITraits);
}

ProgramStateRef
Expand All @@ -172,18 +172,6 @@ ProgramState::invalidateRegions(ValueList Values,
const CallEvent *Call,
RegionAndSymbolInvalidationTraits *ITraits) const {

return invalidateRegionsImpl(Values, E, Count, LCtx, CausedByPointerEscape,
IS, ITraits, Call);
}

ProgramStateRef
ProgramState::invalidateRegionsImpl(ValueList Values,
const Expr *E, unsigned Count,
const LocationContext *LCtx,
bool CausedByPointerEscape,
InvalidatedSymbols *IS,
RegionAndSymbolInvalidationTraits *ITraits,
const CallEvent *Call) const {
ProgramStateManager &Mgr = getStateManager();
ExprEngine &Eng = Mgr.getOwningEngine();

Expand All @@ -197,21 +185,18 @@ ProgramState::invalidateRegionsImpl(ValueList Values,

StoreManager::InvalidatedRegions TopLevelInvalidated;
StoreManager::InvalidatedRegions Invalidated;
const StoreRef &newStore
= Mgr.StoreMgr->invalidateRegions(getStore(), Values, E, Count, LCtx, Call,
*IS, *ITraits, &TopLevelInvalidated,
&Invalidated);
const StoreRef &NewStore = Mgr.StoreMgr->invalidateRegions(
getStore(), Values, E, Count, LCtx, Call, *IS, *ITraits,
&TopLevelInvalidated, &Invalidated);

ProgramStateRef newState = makeWithStore(newStore);
ProgramStateRef NewState = makeWithStore(NewStore);

if (CausedByPointerEscape) {
newState = Eng.notifyCheckersOfPointerEscape(newState, IS,
TopLevelInvalidated,
Call,
*ITraits);
NewState = Eng.notifyCheckersOfPointerEscape(
NewState, IS, TopLevelInvalidated, Call, *ITraits);
}

return Eng.processRegionChanges(newState, IS, TopLevelInvalidated,
return Eng.processRegionChanges(NewState, IS, TopLevelInvalidated,
Invalidated, LCtx, Call);
}

Expand Down
Loading