svf-tools 1.0.1048 → 1.0.1049

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1048",
+  "version": "1.0.1049",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/lib/SVFIR/SVFVariables.cpp

@@ -169,7 +169,7 @@ const std::string GepValVar::toString() const
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
-        rawstr << valueOnlyToString();
+        rawstr << getBaseNode()->valueOnlyToString();
     }
     return rawstr.str();
 }
@@ -203,7 +203,7 @@ const std::string GepObjVar::toString() const
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
-        rawstr << valueOnlyToString();
+        rawstr << getBaseObj()->valueOnlyToString();
     }
     return rawstr.str();
 }

package/svf-llvm/lib/LLVMUtil.cpp

@@ -767,33 +767,17 @@ const std::string SVFValue::valueOnlyToString() const
 {
     std::string str;
     llvm::raw_string_ostream rawstr(str);
-    if (const SVF::CallGraphNode* fun = SVFUtil::dyn_cast<CallGraphNode>(this))
-    {
-        rawstr << "Function: " << fun->getFunction()->getName() << " ";
-    }
+    assert(
+        !SVFUtil::isa<GepObjVar>(this) && !SVFUtil::isa<GepValVar>(this) &&
+        !SVFUtil::isa<DummyObjVar>(this) &&!SVFUtil::isa<DummyValVar>(this) &&
+        !SVFUtil::isa<BlackHoleValVar>(this) &&
+        "invalid value, refer to their toString method");
+    auto llvmVal =
+        LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
+    if (llvmVal)
+        rawstr << " " << *llvmVal << " ";
     else
-    {
-        const SVFValue* baseNode = this;
-        if (const GepValVar* valVar = SVFUtil::dyn_cast<GepValVar>(this))
-        {
-            baseNode = valVar->getBaseNode();
-        }
-        else if (const GepObjVar* objVar = SVFUtil::dyn_cast<GepObjVar>(this))
-        {
-            baseNode = objVar->getBaseObj();
-        }
-        if (SVFUtil::isa<DummyObjVar, DummyValVar, BlackHoleValVar>(baseNode))
-            rawstr << "";
-        else
-        {
-            auto llvmVal =
-                LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(baseNode);
-            if (llvmVal)
-                rawstr << " " << *llvmVal << " ";
-            else
-                rawstr << "";
-        }
-    }
+        rawstr << "";
     rawstr << getSourceLoc();
     return rawstr.str();
 }

package/svf-llvm/tools/Example/svf-ex.cpp

@@ -62,7 +62,7 @@ std::string printPts(PointerAnalysis* pta, const SVFVar* svfval)
     {
         rawstr << " " << *ii << " ";
         PAGNode* targetObj = pta->getPAG()->getGNode(*ii);
-        rawstr << "(" << targetObj->valueOnlyToString() << ")\t ";
+        rawstr << "(" << targetObj->toString() << ")\t ";
     }
 
     return rawstr.str();