svf-tools 1.0.458 → 1.0.461

package/lib/MTA/MTAResultValidator.cpp

@@ -78,8 +78,8 @@ std::vector<std::string> MTAResultValidator::getStringArg(const Instruction* ins
         std::vector<std::string> strvec;
         return strvec;
     }
-    const StringRef vthdcxtstring = cxtarray->getAsCString();
-    return split(vthdcxtstring.str(), ',');
+    const std::string vthdcxtstring = cxtarray->getAsCString().str();
+    return split(vthdcxtstring, ',');
 }
 
 CallStrCxt MTAResultValidator::getCxtArg(const Instruction* inst, unsigned int arg_num)

package/lib/MTA/TCT.cpp

@@ -10,6 +10,7 @@
 #include "MTA/MTA.h"
 #include "SVF-FE/DataFlowUtil.h"
 #include "SVF-FE/BasicTypes.h"
+#include "SVF-FE/LLVMUtil.h"
 
 #include <string>
 

package/lib/MemoryModel/LocationSet.cpp

@@ -32,6 +32,7 @@
 #include "Util/Options.h"
 #include "MemoryModel/LocationSet.h"
 #include "Util/SVFUtil.h"
+#include "SVF-FE/LLVMUtil.h"
 
 using namespace SVF;
 using namespace SVFUtil;

package/lib/MemoryModel/SVFVariables.cpp

@@ -29,6 +29,7 @@
 
 #include "MemoryModel/SVFVariables.h"
 #include "Util/Options.h"
+#include "SVF-FE/LLVMUtil.h"
 
 using namespace SVF;
 using namespace SVFUtil;
@@ -225,5 +226,13 @@ const std::string CloneFIObjVar::toString() const
     return rawstr.str();
 }
 
-
+/// Whether it is constant data, i.e., "0", "1.001", "str"
+/// or llvm's metadata, i.e., metadata !4087
+bool SVFVar::isConstantData() const
+{
+    if (hasValue())
+        return SVFUtil::isConstantData(value);
+    else
+        return false;
+}
 

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -34,6 +34,7 @@
 #include "Util/Options.h"
 #include "Util/SVFModule.h"
 #include "Util/SVFUtil.h"
+#include "SVF-FE/LLVMUtil.h"
 
 using namespace std;
 using namespace SVF;
@@ -784,3 +785,28 @@ const std::string MemObj::toString() const
     return rawstr.str();
 }
 
+/// Get different kinds of syms
+//@{
+SymID SymbolTableInfo::getValSym(const Value *val)
+{
+
+    if(SymbolTableInfo::isNullPtrSym(val))
+        return nullPtrSymID();
+    else if (SVFUtil::isBlackholeSym(val))
+        return blkPtrSymID();
+    else
+    {
+        ValueToIDMapTy::const_iterator iter =  valSymMap.find(val);
+        assert(iter!=valSymMap.end() &&"value sym not found");
+        return iter->second;
+    }
+}
+
+bool SymbolTableInfo::hasValSym(const Value* val)
+{
+    if (SymbolTableInfo::isNullPtrSym(val) || SVFUtil::isBlackholeSym(val))
+        return true;
+    else
+        return (valSymMap.find(val) != valSymMap.end());
+}
+

package/lib/SVF-FE/DCHG.cpp

@@ -628,7 +628,7 @@ void DCHGraph::getVFnsFromVtbls(CallSite cs, const VTableSet &vtbls, VFunSet &vi
                  */
                 if (funName.size() == 0)
                 {
-                    virtualFunctions.insert(SVFUtil::getFunction(callee->getName()));
+                    virtualFunctions.insert(SVFUtil::getFunction(callee->getName().str()));
                 }
                 else if (funName[0] == '~')
                 {
@@ -644,7 +644,7 @@ void DCHGraph::getVFnsFromVtbls(CallSite cs, const VTableSet &vtbls, VFunSet &vi
                      */
                     if (calleeName[0] == '~')
                     {
-                        virtualFunctions.insert(SVFUtil::getFunction(callee->getName()));
+                        virtualFunctions.insert(SVFUtil::getFunction(callee->getName().str()));
                     }
                 }
                 else
@@ -655,7 +655,7 @@ void DCHGraph::getVFnsFromVtbls(CallSite cs, const VTableSet &vtbls, VFunSet &vi
                      */
                     if (funName.compare(calleeName) == 0)
                     {
-                        virtualFunctions.insert(SVFUtil::getFunction(callee->getName()));
+                        virtualFunctions.insert(SVFUtil::getFunction(callee->getName().str()));
                     }
                 }
             }
@@ -966,7 +966,7 @@ std::string DCHGraph::diTypeToStr(const DIType *t)
 
     if (const DIBasicType *bt = SVFUtil::dyn_cast<DIBasicType>(t))
     {
-        ss << std::string(bt->getName());
+        ss << bt->getName().str();
     }
     else if (const DIDerivedType *dt = SVFUtil::dyn_cast<DIDerivedType>(t))
     {
@@ -1009,7 +1009,7 @@ std::string DCHGraph::diTypeToStr(const DIType *t)
         }
         else if (dt->getTag() == dwarf::DW_TAG_typedef)
         {
-            ss << std::string(dt->getName()) << "->" << diTypeToStr(dt->getBaseType());
+            ss << dt->getName().str() << "->" << diTypeToStr(dt->getBaseType());
         }
     }
     else if (const DICompositeType *ct = SVFUtil::dyn_cast<DICompositeType>(t))
@@ -1036,7 +1036,7 @@ std::string DCHGraph::diTypeToStr(const DIType *t)
 
             if (ct->getName() != "")
             {
-                ss << std::string(ct->getName());
+                ss << ct->getName().str();
             }
             else
             {
@@ -1050,7 +1050,7 @@ std::string DCHGraph::diTypeToStr(const DIType *t)
                     // It can also give a Subprogram type if the class just had non-virtual functions.
                     if (const DISubprogram *sp = SVFUtil::dyn_cast<DISubprogram>(fields[i]))
                     {
-                        ss << std::string(sp->getName());
+                        ss << sp->getName().str();
                     }
                     else if (const DIDerivedType *mt = SVFUtil::dyn_cast<DIDerivedType>(fields[i]))
                     {
@@ -1117,7 +1117,7 @@ std::string DCHGraph::diTypeToStr(const DIType *t)
             ss << ")";
         }
 
-        ss << std::string(st->getName());
+        ss << st->getName().str();
     }
 
     return ss.str();

package/lib/Util/ExeState.cpp

@@ -28,6 +28,7 @@
 #include "Util/ExeState.h"
 #include "MemoryModel/SVFIR.h"
 #include <iomanip>
+#include "SVF-FE/LLVMUtil.h"
 
 using namespace SVF;
 using namespace SVFUtil;

package/lib/Util/PTAStat.cpp

@@ -291,9 +291,17 @@ void PTAStat::callgraphStat()
 void PTAStat::printStat(string statname)
 {
 
-    StringRef fullName(SymbolTableInfo::SymbolInfo()->getModule()->getModuleIdentifier());
-    StringRef name = fullName.split('/').second;
-    moduleName = name.split('.').first.str();
+    std::string moduleName(SymbolTableInfo::SymbolInfo()->getModule()->getModuleIdentifier());
+    std::vector<std::string> names = SVFUtil::split(moduleName,'/');
+    if (names.size() > 1)
+    {
+        moduleName = names[1];
+        names = SVFUtil::split(moduleName,'.');
+        if (names.size() > 0)
+        {
+            moduleName = names[0];
+        }
+    }
 
     SVFUtil::outs() << "\n*********" << statname << "***************\n";
     SVFUtil::outs() << "################ (program : " << moduleName << ")###############\n";

package/lib/Util/SVFUtil.cpp

@@ -293,16 +293,16 @@ std::string SVFUtil::getSourceLoc(const Value* val)
             llvm::DILocation* Loc = SVFUtil::cast<llvm::DILocation>(N);                   // DILocation is in DebugInfo.h
             unsigned Line = Loc->getLine();
             unsigned Column = Loc->getColumn();
-            StringRef File = Loc->getFilename();
+            std::string File = Loc->getFilename().str();
             //StringRef Dir = Loc.getDirectory();
-            if(File.str().empty() || Line == 0)
+            if(File.empty() || Line == 0)
             {
                 auto inlineLoc = Loc->getInlinedAt();
                 if(inlineLoc)
                 {
                     Line = inlineLoc->getLine();
                     Column = inlineLoc->getColumn();
-                    File = inlineLoc->getFilename();
+                    File = inlineLoc->getFilename().str();
                 }
             }
             rawstr << "ln: " << Line << "  cl: " << Column << "  fl: " << File;

package/lib/Util/ThreadAPI.cpp

@@ -317,10 +317,18 @@ void ThreadAPI::performAPIStat(SVFModule* module)
 
     }
 
-    StringRef n(module->getModuleIdentifier());
-    StringRef name = n.split('/').second;
-    name = name.split('.').first;
-    SVFUtil::outs() << "################ (program : " << name.str()
+    std::string name(module->getModuleIdentifier());
+    std::vector<std::string> fullNames = SVFUtil::split(name,'/');
+    if (fullNames.size() > 1)
+    {
+        name = fullNames[1];
+        fullNames = SVFUtil::split(name,'.');
+        if (fullNames.size() > 0 )
+        {
+            name = fullNames[0];
+        }
+    }
+    SVFUtil::outs() << "################ (program : " << name
                     << ")###############\n";
     SVFUtil::outs().flags(std::ios::left);
     unsigned field_width = 20;

package/package.json

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