From efcf2deb55327abeb954ee83df6dbd8f7e281753 Mon Sep 17 00:00:00 2001 From: bjjwwang Date: Wed, 11 Dec 2024 12:38:26 +1100 Subject: [PATCH] rename GlobalValueValVar --- svf/include/SVFIR/SVFIR.h | 2 +- svf/include/SVFIR/SVFVariables.h | 4 ++-- svf/lib/SABER/SaberSVFGBuilder.cpp | 2 +- svf/lib/SVFIR/SVFFileSystem.cpp | 2 +- svf/lib/SVFIR/SVFVariables.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/svf/include/SVFIR/SVFIR.h b/svf/include/SVFIR/SVFIR.h index b978bf8e0..38c6b7cda 100644 --- a/svf/include/SVFIR/SVFIR.h +++ b/svf/include/SVFIR/SVFIR.h @@ -601,7 +601,7 @@ class SVFIR : public IRGraph inline NodeID addGlobalValueValNode(const SVFValue* curInst, const NodeID i, const ICFGNode* icfgNode) { - SVFVar* node = new GlobalValueValvar(curInst, i, icfgNode); + SVFVar* node = new GlobalValueValVar(curInst, i, icfgNode); return addNode(node, i); } diff --git a/svf/include/SVFIR/SVFVariables.h b/svf/include/SVFIR/SVFVariables.h index b9ea09622..2d3aa67be 100644 --- a/svf/include/SVFIR/SVFVariables.h +++ b/svf/include/SVFIR/SVFVariables.h @@ -776,7 +776,7 @@ class ConstantDataValVar: public ConstantValVar virtual const std::string toString() const; }; -class GlobalValueValvar: public ConstantValVar +class GlobalValueValVar : public ConstantValVar { friend class SVFIRWriter; friend class SVFIRReader; @@ -807,7 +807,7 @@ class GlobalValueValvar: public ConstantValVar //@} /// Constructor - GlobalValueValvar(const SVFValue* val, NodeID i, const ICFGNode* icn, + GlobalValueValVar(const SVFValue* val, NodeID i, const ICFGNode* icn, PNODEK ty = GlobalValueValNode) : ConstantValVar(val, i, icn, ty) { diff --git a/svf/lib/SABER/SaberSVFGBuilder.cpp b/svf/lib/SABER/SaberSVFGBuilder.cpp index 766f4616f..96fd1eacc 100644 --- a/svf/lib/SABER/SaberSVFGBuilder.cpp +++ b/svf/lib/SABER/SaberSVFGBuilder.cpp @@ -82,7 +82,7 @@ void SaberSVFGBuilder::collectGlobals(BVDataPTAImpl* pta) if(SVFUtil::isa(pag->getGNode(gepobj->getBaseNode()))) continue; } - if(pagNode->hasValue() && SVFUtil::isa(pagNode)) + if(pagNode->hasValue() && SVFUtil::isa(pagNode)) worklist.push_back(it->first); } diff --git a/svf/lib/SVFIR/SVFFileSystem.cpp b/svf/lib/SVFIR/SVFFileSystem.cpp index 935eb0bc2..12d86e30b 100644 --- a/svf/lib/SVFIR/SVFFileSystem.cpp +++ b/svf/lib/SVFIR/SVFFileSystem.cpp @@ -228,7 +228,7 @@ cJSON* SVFIRWriter::virtToJson(const SVFVar* var) CASE(FunValNode, FunValVar); CASE(ConstantValNode, ConstantValVar); CASE(ConstantDataValNode, ConstantDataValVar); - CASE(GlobalValueValNode, GlobalValueValvar); + CASE(GlobalValueValNode, GlobalValueValVar); CASE(BlackHoleNode, BlackHoleVar); CASE(ConstantFPValNode, ConstantFPValVar); CASE(ConstantIntValNode, ConstantIntValVar); diff --git a/svf/lib/SVFIR/SVFVariables.cpp b/svf/lib/SVFIR/SVFVariables.cpp index 36c0259cf..fe6a3b34e 100644 --- a/svf/lib/SVFIR/SVFVariables.cpp +++ b/svf/lib/SVFIR/SVFVariables.cpp @@ -235,7 +235,7 @@ const std::string ConstantDataValVar::toString() const { return rawstr.str(); } -const std::string GlobalValueValvar::toString() const { +const std::string GlobalValueValVar::toString() const { std::string str; std::stringstream rawstr(str); rawstr << "GlobalValueValVar ID: " << getId();