Skip to content

Commit

Permalink
SVF code formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
yuleisui committed Jan 7, 2025
1 parent cfdbb6c commit 32c2a51
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 22 deletions.
2 changes: 1 addition & 1 deletion svf-llvm/lib/LLVMModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)
}

void LLVMModuleSet::addToLLVMVal2SVFVarMap(const Value* val,
SVFBaseNode* svfBaseNode)
SVFBaseNode* svfBaseNode)
{
SVFBaseNode2LLVMValue[svfBaseNode] = val;
svfBaseNode->setSourceLoc(LLVMUtil::getSourceLoc(val));
Expand Down
8 changes: 5 additions & 3 deletions svf/include/SVFIR/SVFIR.h
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ class SVFIR : public IRGraph
const SVFVar* node = getGNode(id);
if(const GepValVar* gepVar = SVFUtil::dyn_cast<GepValVar>(node))
return SVFUtil::dyn_cast<ValVar>(
getGNode(gepVar->getBaseNode()));
getGNode(gepVar->getBaseNode()));
else
return SVFUtil::dyn_cast<ValVar>(node);
}
Expand Down Expand Up @@ -656,7 +656,8 @@ class SVFIR : public IRGraph
}


inline NodeID addConstantIntObjNode(const SVFValue* curInst, s64_t sval, u64_t zval, const NodeID i) {
inline NodeID addConstantIntObjNode(const SVFValue* curInst, s64_t sval, u64_t zval, const NodeID i)
{
const MemObj* mem = getMemObj(curInst);
NodeID base = mem->getId();
memToFieldsMap[base].set(mem->getId());
Expand All @@ -666,7 +667,8 @@ class SVFIR : public IRGraph
}


inline NodeID addConstantNullPtrObjNode(const SVFValue* curInst, const NodeID i) {
inline NodeID addConstantNullPtrObjNode(const SVFValue* curInst, const NodeID i)
{
const MemObj* mem = getMemObj(curInst);
NodeID base = mem->getId();
memToFieldsMap[base].set(mem->getId());
Expand Down
15 changes: 10 additions & 5 deletions svf/include/SVFIR/SVFVariables.h
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,8 @@ class BlackHoleVar: public ConstantDataValVar

}

virtual const std::string toString() const {
virtual const std::string toString() const
{
return "BlackHoleVar";
}
};
Expand Down Expand Up @@ -1109,7 +1110,8 @@ class ConstantNullPtrValVar: public ConstantDataValVar
virtual const std::string toString() const;
};

class GlobalObjVar : public BaseObjVar {
class GlobalObjVar : public BaseObjVar
{
friend class SVFIRWriter;
friend class SVFIRReader;

Expand Down Expand Up @@ -1148,15 +1150,17 @@ class GlobalObjVar : public BaseObjVar {

/// Constructor
GlobalObjVar(const SVFValue* val, NodeID i, const MemObj* mem,
PNODEK ty = GlobalObjNode): BaseObjVar(val, i,mem,ty){
PNODEK ty = GlobalObjNode): BaseObjVar(val, i,mem,ty)
{

}


virtual const std::string toString() const;
};

class ConstantDataObjVar: public BaseObjVar {
class ConstantDataObjVar: public BaseObjVar
{
friend class SVFIRWriter;
friend class SVFIRReader;

Expand Down Expand Up @@ -1224,7 +1228,8 @@ class ConstantFPObjVar: public ConstantDataObjVar
{
return node->getNodeKind() == SVFVar::ConstantFPObjNode;
}
static inline bool classof(const BaseObjVar* node) {
static inline bool classof(const BaseObjVar* node)
{
return node->getNodeKind() == SVFVar::ConstantFPObjNode;
}

Expand Down
2 changes: 1 addition & 1 deletion svf/lib/MemoryModel/PointerAnalysis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ void PointerAnalysis::getVFnsFromPts(const CallICFGNode* cs, const PointsTo &tar
if (ptdnode->hasValue())
{
if ((isa<ObjVar>(ptdnode) && isa<GlobalObjVar>(pag->getBaseObject(ptdnode->getId())))
|| (isa<ValVar>(ptdnode) && isa<GlobalValVar>(pag->getBaseValVar(ptdnode->getId()))))
|| (isa<ValVar>(ptdnode) && isa<GlobalValVar>(pag->getBaseValVar(ptdnode->getId()))))
{
const SVFGlobalValue* globalValue = SVFUtil::dyn_cast<SVFGlobalValue>(ptdnode->getValue());
if (chaVtbls.find(globalValue) != chaVtbls.end())
Expand Down
2 changes: 1 addition & 1 deletion svf/lib/SABER/SaberSVFGBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void SaberSVFGBuilder::collectGlobals(BVDataPTAImpl* pta)
continue;
}
if ((isa<ObjVar>(pagNode) && isa<GlobalObjVar>(pag->getBaseObject(pagNode->getId()))) ||
(isa<ValVar>(pagNode) && isa<GlobalValVar>(pag->getBaseValVar(pagNode->getId()))))
(isa<ValVar>(pagNode) && isa<GlobalValVar>(pag->getBaseValVar(pagNode->getId()))))
worklist.push_back(it->first);
}

Expand Down
32 changes: 21 additions & 11 deletions svf/lib/SVFIR/SVFVariables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ using namespace SVFUtil;
* SVFVar constructor
*/
SVFVar::SVFVar(const SVFValue* val, NodeID i, PNODEK k) :
GenericPAGNodeTy(i,k), value(val), func(nullptr)
GenericPAGNodeTy(i,k), value(val), func(nullptr)
{
assert( ValNode <= k && k <= DummyObjNode && "new SVFIR node kind?");
switch (k)
Expand Down Expand Up @@ -262,7 +262,8 @@ const std::string FunValVar::toString() const
return rawstr.str();
}

const std::string ConstantDataValVar::toString() const {
const std::string ConstantDataValVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantDataValNode ID: " << getId();
Expand All @@ -274,7 +275,8 @@ const std::string ConstantDataValVar::toString() const {
return rawstr.str();
}

const std::string GlobalValVar::toString() const {
const std::string GlobalValVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "GlobalValVar ID: " << getId();
Expand All @@ -286,7 +288,8 @@ const std::string GlobalValVar::toString() const {
return rawstr.str();
}

const std::string ConstantFPValVar::toString() const {
const std::string ConstantFPValVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantFPValNode ID: " << getId();
Expand All @@ -298,7 +301,8 @@ const std::string ConstantFPValVar::toString() const {
return rawstr.str();
}

const std::string ConstantIntValVar::toString() const {
const std::string ConstantIntValVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantIntValNode ID: " << getId();
Expand All @@ -310,7 +314,8 @@ const std::string ConstantIntValVar::toString() const {
return rawstr.str();
}

const std::string ConstantNullPtrValVar::toString() const {
const std::string ConstantNullPtrValVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantNullPtrValVar ID: " << getId();
Expand All @@ -322,7 +327,8 @@ const std::string ConstantNullPtrValVar::toString() const {
return rawstr.str();
}

const std::string GlobalObjVar::toString() const {
const std::string GlobalObjVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "GlobalObjNode ID: " << getId();
Expand All @@ -334,7 +340,8 @@ const std::string GlobalObjVar::toString() const {
return rawstr.str();
}

const std::string ConstantDataObjVar::toString() const {
const std::string ConstantDataObjVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantDataObjVar ID: " << getId();
Expand All @@ -346,7 +353,8 @@ const std::string ConstantDataObjVar::toString() const {
return rawstr.str();
}

const std::string ConstantFPObjVar::toString() const {
const std::string ConstantFPObjVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantFPObjVar ID: " << getId();
Expand All @@ -358,7 +366,8 @@ const std::string ConstantFPObjVar::toString() const {
return rawstr.str();
}

const std::string ConstantIntObjVar::toString() const {
const std::string ConstantIntObjVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantIntObjVar ID: " << getId();
Expand All @@ -370,7 +379,8 @@ const std::string ConstantIntObjVar::toString() const {
return rawstr.str();
}

const std::string ConstantNullPtrObjVar::toString() const {
const std::string ConstantNullPtrObjVar::toString() const
{
std::string str;
std::stringstream rawstr(str);
rawstr << "ConstantNullPtrObjVar ID: " << getId();
Expand Down

0 comments on commit 32c2a51

Please sign in to comment.