maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Analyzer][NFC] Add RangedConstraintManager to ConstraintAssignor 

In this patch we store a reference to `RangedConstraintManager` in the
`ConstraintAssignor`. This way it is possible to call back and reuse some
functions of it. This patch is exclusively needed for its child patches,
it is not intended to be a standalone patch.

Differential Revision: https://reviews.llvm.org/D111640
This commit is contained in:
Gabor Marton 2021-10-11 14:44:02 +02:00
parent 01b4ddbfbb
commit e2a2c8328f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
View File

@ -1600,12 +1600,13 @@ class ConstraintAssignor : public ConstraintAssignorBase<ConstraintAssignor> {
public: public:
template <class ClassOrSymbol> template <class ClassOrSymbol>
LLVM_NODISCARD static ProgramStateRef LLVM_NODISCARD static ProgramStateRef
assign(ProgramStateRef State, SValBuilder &Builder, RangeSet::Factory &F, assign(ProgramStateRef State, RangeConstraintManager &RCM,
ClassOrSymbol CoS, RangeSet NewConstraint) { SValBuilder &Builder, RangeSet::Factory &F, ClassOrSymbol CoS,
RangeSet NewConstraint) {
if (!State || NewConstraint.isEmpty()) if (!State || NewConstraint.isEmpty())
return nullptr; return nullptr;
ConstraintAssignor Assignor{State, Builder, F}; ConstraintAssignor Assignor{State, RCM, Builder, F};
return Assignor.assign(CoS, NewConstraint); return Assignor.assign(CoS, NewConstraint);
} }
@ -1614,9 +1615,9 @@ public:
RangeSet Constraint); RangeSet Constraint);
private: private:
ConstraintAssignor(ProgramStateRef State, SValBuilder &Builder, ConstraintAssignor(ProgramStateRef State, RangeConstraintManager &RCM,
RangeSet::Factory &F) SValBuilder &Builder, RangeSet::Factory &F)
: State(State), Builder(Builder), RangeFactory(F) {} : State(State), RCM(RCM), Builder(Builder), RangeFactory(F) {}
using Base = ConstraintAssignorBase<ConstraintAssignor>; using Base = ConstraintAssignorBase<ConstraintAssignor>;
/// Base method for handling new constraints for symbols. /// Base method for handling new constraints for symbols.
@ -1696,6 +1697,7 @@ private:
} }
ProgramStateRef State; ProgramStateRef State;
RangeConstraintManager &RCM;
SValBuilder &Builder; SValBuilder &Builder;
RangeSet::Factory &RangeFactory; RangeSet::Factory &RangeFactory;
}; };
@ -2420,7 +2422,8 @@ RangeSet RangeConstraintManager::getRange(ProgramStateRef State,
ProgramStateRef RangeConstraintManager::setRange(ProgramStateRef State, ProgramStateRef RangeConstraintManager::setRange(ProgramStateRef State,
SymbolRef Sym, SymbolRef Sym,
RangeSet Range) { RangeSet Range) {
return ConstraintAssignor::assign(State, getSValBuilder(), F, Sym, Range); return ConstraintAssignor::assign(State, *this, getSValBuilder(), F, Sym,
Range);
} }
//===------------------------------------------------------------------------=== //===------------------------------------------------------------------------===