svf-tools 1.0.595 → 1.0.597

package/lib/Graphs/GraphWriter.cpp

@@ -0,0 +1,53 @@
+//===- GraphWriter.cpp - Implements GraphWriter support routines ----------===//
+//
+// From the LLVM Project with some modifications, under the Apache License v2.0
+// with LLVM Exceptions. See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+
+#include "Graphs/GraphWriter.h"
+
+#include <string>
+
+std::string SVF::DOT::EscapeStr(const std::string &Label)
+{
+    std::string Str(Label);
+    for (unsigned i = 0; i != Str.length(); ++i)
+        switch (Str[i])
+        {
+        case '\n':
+            Str.insert(Str.begin()+i, '\\');  // Escape character...
+            ++i;
+            Str[i] = 'n';
+            break;
+        case '\t':
+            Str.insert(Str.begin()+i, ' ');  // Convert to two spaces
+            ++i;
+            Str[i] = ' ';
+            break;
+        case '\\':
+            if (i+1 != Str.length())
+                switch (Str[i+1])
+                {
+                case 'l':
+                    continue; // don't disturb \l
+                case '|':
+                case '{':
+                case '}':
+                    Str.erase(Str.begin()+i);
+                    continue;
+                default:
+                    break;
+                }
+        case '{':
+        case '}':
+        case '<':
+        case '>':
+        case '|':
+        case '"':
+            Str.insert(Str.begin()+i, '\\');  // Escape character...
+            ++i;  // don't infinite loop
+            break;
+        }
+    return Str;
+}

package/lib/Graphs/ICFG.cpp

@@ -449,7 +449,7 @@ void ICFG::dump(const std::string& file, bool simple)
  */
 void ICFG::view()
 {
-    llvm::ViewGraph(this, "Interprocedural Control-Flow Graph");
+    SVF::ViewGraph(this, "Interprocedural Control-Flow Graph");
 }
 
 /*!
@@ -517,7 +517,7 @@ void ICFG::updateCallGraph(PTACallGraph* callgraph)
 /*!
  * GraphTraits specialization
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>

package/lib/Graphs/IRGraph.cpp

@@ -109,11 +109,11 @@ void IRGraph::dump(std::string name)
  */
 void IRGraph::view()
 {
-    llvm::ViewGraph(this, "ProgramAssignmentGraph");
+    SVF::ViewGraph(this, "ProgramAssignmentGraph");
 }
 
 
-namespace llvm
+namespace SVF
 {
 /*!
  * Write value flow graph into dot file for debugging

package/lib/Graphs/PTACallGraph.cpp

@@ -321,10 +321,10 @@ void PTACallGraph::dump(const std::string& filename)
 
 void PTACallGraph::view()
 {
-    llvm::ViewGraph(this, "Call Graph");
+    SVF::ViewGraph(this, "Call Graph");
 }
 
-namespace llvm
+namespace SVF
 {
 
 /*!

package/lib/Graphs/SVFG.cpp

@@ -761,7 +761,7 @@ void SVFG::performStat()
 /*!
  * GraphTraits specialization
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<SVFG*> : public DOTGraphTraits<SVFIR*>

package/lib/Graphs/VFG.cpp

@@ -935,7 +935,7 @@ void VFG::dump(const std::string& file, bool simple)
  */
 void VFG::view()
 {
-    llvm::ViewGraph(this, "Value Flow Graph");
+    SVF::ViewGraph(this, "Value Flow Graph");
 }
 
 
@@ -1091,7 +1091,7 @@ const SVFValue* ArgumentVFGNode::getValue() const
 /*!
  * GraphTraits specialization
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<VFG*> : public DOTGraphTraits<SVFIR*>

package/lib/MTA/TCT.cpp

@@ -557,7 +557,7 @@ TCTEdge* TCT::getGraphEdge(TCTNode* src, TCTNode* dst, TCTEdge::CEDGEK kind)
     }
     return nullptr;
 }
-namespace llvm
+namespace SVF
 {
 
 /*!

package/lib/SVF-LLVM/LLVMModule.cpp

@@ -36,6 +36,7 @@
 #include "SVF-LLVM/BreakConstantExpr.h"
 #include "SVF-LLVM/SymbolTableBuilder.h"
 #include "MSSA/SVFGBuilder.h"
+#include "llvm/Support/FileSystem.h"
 
 using namespace std;
 using namespace SVF;
@@ -847,8 +848,6 @@ void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)
         svffun->setIsUncalledFunction(LLVMUtil::isUncalledFunction(func));
         svffun->setDefFunForMultipleModule(getSVFFunction(LLVMUtil::getDefFunForMultipleModule(func)));
     }
-    if (val->hasName())
-        svfvalue->setHasName();
 
     svfvalue->setSourceLoc(LLVMUtil::getSourceLoc(val));
 }

package/lib/SVF-LLVM/LLVMUtil.cpp

@@ -636,6 +636,46 @@ void LLVMUtil::getPrevInsts(const Instruction* curInst, std::vector<const Instru
     }
 }
 
+/// Check whether this value points-to a constant object
+bool LLVMUtil::isConstantObjSym(const SVFValue* val)
+{
+    return isConstantObjSym(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(val));
+}
+
+/*!
+ * Check whether this value points-to a constant object
+ */
+bool LLVMUtil::isConstantObjSym(const Value* val)
+{
+    if (const GlobalVariable* v = SVFUtil::dyn_cast<GlobalVariable>(val))
+    {
+        if (cppUtil::isValVtbl(v))
+            return false;
+        else if (!v->hasInitializer())
+        {
+            if(v->isExternalLinkage(v->getLinkage()))
+                return false;
+            else
+                return true;
+        }
+        else
+        {
+            StInfo *stInfo = LLVMModuleSet::getLLVMModuleSet()->getSVFType(v->getInitializer()->getType())->getTypeInfo();
+            const std::vector<const SVFType*> &fields = stInfo->getFlattenFieldTypes();
+            for (std::vector<const SVFType*>::const_iterator it = fields.begin(), eit = fields.end(); it != eit; ++it)
+            {
+                const SVFType* elemTy = *it;
+                assert(!SVFUtil::isa<SVFFunctionType>(elemTy) && "Initializer of a global is a function?");
+                if (SVFUtil::isa<SVFPointerType>(elemTy))
+                    return false;
+            }
+
+            return v->isConstant();
+        }
+    }
+    return LLVMUtil::isConstDataOrAggData(val);
+}
+
 namespace SVF
 {
 const std::string SVFValue::toString() const

package/lib/SVF-LLVM/SVFIRBuilder.cpp

@@ -223,7 +223,7 @@ void SVFIRBuilder::initialiseNodes()
     {
         DBOUT(DPAGBuild, outs() << "add address edges for constant node " << iter->second << "\n");
         const SVFValue* val = iter->first;
-        if (iter->second == pag->getSymbolInfo()->constantSymID())
+        if (isConstantObjSym(val))
         {
             NodeID ptr = pag->getValueNode(val);
             if(ptr!= pag->getBlkPtr() && ptr!= pag->getNullPtr())

package/lib/SVF-LLVM/SymbolTableBuilder.cpp

@@ -744,40 +744,6 @@ u32_t SymbolTableBuilder::getObjSize(const Type* ety)
     return numOfFields;
 }
 
-/*!
- * Check whether this value points-to a constant object
- */
-bool SymbolTableBuilder::isConstantObjSym(const Value* val)
-{
-    if (const GlobalVariable* v = SVFUtil::dyn_cast<GlobalVariable>(val))
-    {
-        if (cppUtil::isValVtbl(v))
-            return false;
-        else if (!v->hasInitializer())
-        {
-            if(v->isExternalLinkage(v->getLinkage()))
-                return false;
-            else
-                return true;
-        }
-        else
-        {
-            StInfo *stInfo = getOrAddSVFTypeInfo(v->getInitializer()->getType());
-            const std::vector<const SVFType*> &fields = stInfo->getFlattenFieldTypes();
-            for (std::vector<const SVFType*>::const_iterator it = fields.begin(), eit = fields.end(); it != eit; ++it)
-            {
-                const SVFType* elemTy = *it;
-                assert(!SVFUtil::isa<SVFFunctionType>(elemTy) && "Initializer of a global is a function?");
-                if (SVFUtil::isa<SVFPointerType>(elemTy))
-                    return false;
-            }
-
-            return v->isConstant();
-        }
-    }
-    return LLVMUtil::isConstDataOrAggData(val);
-}
-
 /// Number of flattenned elements of an array or struct
 u32_t SymbolTableBuilder::getNumOfFlattenElements(const Type* T)
 {

package/lib/SVFIR/SVFValue.cpp

@@ -155,7 +155,6 @@ bool SVFFunction::isVarArg() const
 SVFBasicBlock::SVFBasicBlock(const std::string& b, const SVFType* ty, const SVFFunction* f):
     SVFValue(b, ty, SVFValue::SVFBB), fun(f)
 {
-    name = hasName() ? getName(): "";
 }
 
 SVFBasicBlock::~SVFBasicBlock()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.595",
+  "version": "1.0.597",
   "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": {