Skip to content

Commit

Permalink
fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jumormt committed Jan 24, 2025
1 parent c0ae81c commit d80210a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions svf-llvm/lib/SVFIRBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ void SVFIRBuilder::initialiseNodes()

SymbolTableInfo* symTable = pag->getSymbolInfo();

pag->addBlackholeObjNode(nullptr);
pag->addConstantObjNode(nullptr);
pag->addBlackholePtrNode(nullptr);
pag->addBlackholeObjNode();
pag->addConstantObjNode();
pag->addBlackholePtrNode();
addNullPtrNode();

// Iterate over all value symbols in the symbol table
Expand Down
8 changes: 4 additions & 4 deletions svf-llvm/lib/SVFIRExtAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void SVFIRBuilder::addComplexConsForExt(Value *D, Value *S, const Value* szValue

if (fields.size() == 1 && (LLVMUtil::isConstDataOrAggData(D) || LLVMUtil::isConstDataOrAggData(S)))
{
NodeID dummy = pag->addDummyValNode(nullptr);
NodeID dummy = pag->addDummyValNode();
addLoadEdge(vnD,dummy);
addStoreEdge(dummy,vnS);
return;
Expand All @@ -120,7 +120,7 @@ void SVFIRBuilder::addComplexConsForExt(Value *D, Value *S, const Value* szValue
fields[index].getConstantStructFldIdx());
NodeID dField = getGepValVar(D,fields[index],dElementType);
NodeID sField = getGepValVar(S,fields[index],sElementType);
NodeID dummy = pag->addDummyValNode(nullptr);
NodeID dummy = pag->addDummyValNode();
addLoadEdge(sField,dummy);
addStoreEdge(dummy,dField);
}
Expand All @@ -145,8 +145,8 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
if (arg->getType()->isPointerTy())
{
NodeID vnArg = pag->getValueNode(arg);
NodeID dummy = pag->addDummyValNode(nullptr);
NodeID obj = pag->addDummyObjNode(arg->getType(), nullptr);
NodeID dummy = pag->addDummyValNode();
NodeID obj = pag->addDummyObjNode(arg->getType());
if (vnArg && dummy && obj)
{
addAddrWithHeapSz(obj, dummy, cs);
Expand Down
26 changes: 13 additions & 13 deletions svf/include/SVFIR/SVFIR.h
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,13 @@ class SVFIR : public IRGraph
NodeBS& getAllFieldsObjVars(NodeID id);
NodeBS getFieldsAfterCollapse(NodeID id);
//@}
inline NodeID addDummyValNode(const ICFGNode* node)
inline NodeID addDummyValNode()
{
return addDummyValNode(NodeIDAllocator::get()->allocateValueId(), node);
return addDummyValNode(NodeIDAllocator::get()->allocateValueId(), nullptr);
}
inline NodeID addDummyObjNode(const SVFType* type, const ICFGNode* node)
inline NodeID addDummyObjNode(const SVFType* type)
{
return addDummyObjNode(NodeIDAllocator::get()->allocateObjectId(), type, node);
return addDummyObjNode(NodeIDAllocator::get()->allocateObjectId(), type);
}
/// Whether a node is a valid pointer
//@{
Expand Down Expand Up @@ -713,31 +713,31 @@ class SVFIR : public IRGraph
{
return addValNode(new DummyValVar(i, node));
}
inline NodeID addDummyObjNode(NodeID i, const SVFType* type, const ICFGNode* node)
inline NodeID addDummyObjNode(NodeID i, const SVFType* type)
{
if (symInfo->idToObjTypeInfoMap().find(i) == symInfo->idToObjTypeInfoMap().end())
{
ObjTypeInfo* ti = symInfo->createObjTypeInfo(type);
symInfo->idToObjTypeInfoMap()[i] = ti;
return addObjNode(new DummyObjVar(i, ti, node, type));
return addObjNode(new DummyObjVar(i, ti, nullptr, type));
}
else
{
return addObjNode(new DummyObjVar(i, symInfo->getObjTypeInfo(i), node, type));
return addObjNode(new DummyObjVar(i, symInfo->getObjTypeInfo(i), nullptr, type));
}
}

inline NodeID addBlackholeObjNode(const ICFGNode* node)
inline NodeID addBlackholeObjNode()
{
return addObjNode(new DummyObjVar(getBlackHoleNode(), symInfo->getObjTypeInfo(getBlackHoleNode()), node));
return addObjNode(new DummyObjVar(getBlackHoleNode(), symInfo->getObjTypeInfo(getBlackHoleNode()), nullptr));
}
inline NodeID addConstantObjNode(const ICFGNode* node)
inline NodeID addConstantObjNode()
{
return addObjNode(new DummyObjVar(getConstantNode(), symInfo->getObjTypeInfo(getConstantNode()), node));
return addObjNode(new DummyObjVar(getConstantNode(), symInfo->getObjTypeInfo(getConstantNode()), nullptr));
}
inline NodeID addBlackholePtrNode(const ICFGNode* node)
inline NodeID addBlackholePtrNode()
{
return addDummyValNode(getBlkPtr(), node);
return addDummyValNode(getBlkPtr(), nullptr);
}
//@}

Expand Down
4 changes: 2 additions & 2 deletions svf/lib/CFL/CFLAlias.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ void CFLAlias::heapAllocatorViaIndCall(const CallICFGNode* cs)
}
else
{
NodeID valNode = svfir->addDummyValNode(nullptr);
NodeID objNode = svfir->addDummyObjNode(cs->getType(), nullptr);
NodeID valNode = svfir->addDummyValNode();
NodeID objNode = svfir->addDummyObjNode(cs->getType());
callsite2DummyValPN.insert(std::make_pair(cs,valNode));
graph->addCFLNode(valNode, new CFLNode(valNode));
graph->addCFLNode(objNode, new CFLNode(objNode));
Expand Down
4 changes: 2 additions & 2 deletions svf/lib/CFL/CFLGraphBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ CFLGraph* AliasCFLGraphBuilder::buildBiPEGgraph(ConstraintGraph *graph, Kind sta
}
if (DerefNode == nullptr)
{
NodeID refId = pag->addDummyValNode(nullptr);
NodeID refId = pag->addDummyValNode();
CFLDerefNode = new CFLNode(refId);
cflGraph->addCFLNode(refId, CFLDerefNode);
/// Add Addr Edge
Expand Down Expand Up @@ -386,7 +386,7 @@ CFLGraph* AliasCFLGraphBuilder::buildBiPEGgraph(ConstraintGraph *graph, Kind sta
}
if (DerefNode == nullptr)
{
NodeID refId = pag->addDummyValNode(nullptr);
NodeID refId = pag->addDummyValNode();
CFLDerefNode = new CFLNode(refId);
cflGraph->addCFLNode(refId, CFLDerefNode);
/// Add Addr Edge
Expand Down
4 changes: 2 additions & 2 deletions svf/lib/WPA/Andersen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ void AndersenBase::heapAllocatorViaIndCall(const CallICFGNode* cs, NodePairSet &
}
else
{
NodeID valNode = pag->addDummyValNode(nullptr);
NodeID objNode = pag->addDummyObjNode(cs->getType(), nullptr);
NodeID valNode = pag->addDummyValNode();
NodeID objNode = pag->addDummyObjNode(cs->getType());
addPts(valNode,objNode);
callsite2DummyValPN.insert(std::make_pair(cs,valNode));
consCG->addConstraintNode(new ConstraintNode(valNode),valNode);
Expand Down

0 comments on commit d80210a

Please sign in to comment.