From d80210a28eab2c1473492c3b2e7a258659fe44d0 Mon Sep 17 00:00:00 2001 From: jumormt Date: Fri, 24 Jan 2025 14:16:36 +1100 Subject: [PATCH] fix comments --- svf-llvm/lib/SVFIRBuilder.cpp | 6 +++--- svf-llvm/lib/SVFIRExtAPI.cpp | 8 ++++---- svf/include/SVFIR/SVFIR.h | 26 +++++++++++++------------- svf/lib/CFL/CFLAlias.cpp | 4 ++-- svf/lib/CFL/CFLGraphBuilder.cpp | 4 ++-- svf/lib/WPA/Andersen.cpp | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/svf-llvm/lib/SVFIRBuilder.cpp b/svf-llvm/lib/SVFIRBuilder.cpp index 7028944b7..7d4a51ebd 100644 --- a/svf-llvm/lib/SVFIRBuilder.cpp +++ b/svf-llvm/lib/SVFIRBuilder.cpp @@ -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 diff --git a/svf-llvm/lib/SVFIRExtAPI.cpp b/svf-llvm/lib/SVFIRExtAPI.cpp index a73f3ed02..b30357b7c 100644 --- a/svf-llvm/lib/SVFIRExtAPI.cpp +++ b/svf-llvm/lib/SVFIRExtAPI.cpp @@ -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; @@ -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); } @@ -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); diff --git a/svf/include/SVFIR/SVFIR.h b/svf/include/SVFIR/SVFIR.h index 5961e9d1f..9c397e7d5 100644 --- a/svf/include/SVFIR/SVFIR.h +++ b/svf/include/SVFIR/SVFIR.h @@ -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 //@{ @@ -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); } //@} diff --git a/svf/lib/CFL/CFLAlias.cpp b/svf/lib/CFL/CFLAlias.cpp index c4c0ed558..2ed412b38 100644 --- a/svf/lib/CFL/CFLAlias.cpp +++ b/svf/lib/CFL/CFLAlias.cpp @@ -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)); diff --git a/svf/lib/CFL/CFLGraphBuilder.cpp b/svf/lib/CFL/CFLGraphBuilder.cpp index 5a4940c64..a36973e5b 100644 --- a/svf/lib/CFL/CFLGraphBuilder.cpp +++ b/svf/lib/CFL/CFLGraphBuilder.cpp @@ -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 @@ -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 diff --git a/svf/lib/WPA/Andersen.cpp b/svf/lib/WPA/Andersen.cpp index 7d80ba6b7..1c0e17de6 100644 --- a/svf/lib/WPA/Andersen.cpp +++ b/svf/lib/WPA/Andersen.cpp @@ -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);