svf-tools 1.0.1247 → 1.0.1249

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1247",
+  "version": "1.0.1249",
   "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/include/Util/Options.h

@@ -177,7 +177,7 @@ public:
 
     // LLVMModule.cpp
     static const Option<std::string> Graphtxt;
-    static const Option<bool> SVFMain;
+    static Option<bool> SVFMain;
 
     // SymbolTableInfo.cpp
     static const Option<bool> LocMemModel;

package/svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -125,7 +125,7 @@ std::deque<const FunObjVar*> AbstractInterpretation::collectProgEntryFuns()
         if (cgNode->getInEdges().empty())
         {
             // If main exists, put it first for priority using deque's push_front
-            if (fun->getName() == "main")
+            if (SVFUtil::isProgEntryFunction(fun))
             {
                 entryFunctions.push_front(fun);
             }

package/svf/lib/MTA/MHP.cpp

@@ -567,7 +567,7 @@ bool MHP::isConnectedfromMain(const FunObjVar* fun)
     while (!worklist.empty())
     {
         const CallGraphNode* node = worklist.pop();
-        if ("main" == node->getFunction()->getName())
+        if (SVFUtil::isProgEntryFunction(node->getFunction()))
             return true;
         for (CallGraphNode::const_iterator nit = node->InEdgeBegin(), neit = node->InEdgeEnd(); nit != neit; nit++)
         {

package/svf/lib/Util/Options.cpp

@@ -540,7 +540,7 @@ const Option<std::string> Options::Graphtxt(
     ""
 );
 
-const Option<bool> Options::SVFMain(
+Option<bool> Options::SVFMain(
     "svf-main",
     "add svf.main()",
     false

package/svf/lib/Util/SVFUtil.cpp

@@ -441,5 +441,6 @@ bool SVFUtil::isExtCall(const FunObjVar* fun)
 
 bool SVFUtil::isProgEntryFunction(const FunObjVar* funObjVar)
 {
-    return funObjVar && funObjVar->getName() == "main";
+    const char* main_name=Options::SVFMain() ? "svf.main" : "main";
+    return funObjVar && funObjVar->getName() == main_name;
 }

package/svf-llvm/include/SVF-LLVM/LLVMUtil.h

@@ -33,6 +33,7 @@
 #include "Util/SVFUtil.h"
 #include "SVF-LLVM/BasicTypes.h"
 #include "Util/ThreadAPI.h"
+#include "Util/Options.h"
 
 namespace SVF
 {
@@ -112,7 +113,8 @@ const Function* getProgFunction(const std::string& funName);
 /// Check whether a function is an entry function (i.e., main)
 inline bool isProgEntryFunction(const Function* fun)
 {
-    return fun && fun->getName() == "main";
+    const char* main_name=Options::SVFMain() ? "svf.main" : "main";
+    return fun && fun->getName() == main_name;
 }
 
 /// Check whether this value is a black hole

package/svf-llvm/lib/LLVMModule.cpp

@@ -598,6 +598,11 @@ void LLVMModuleSet::addSVFMain()
         // return;
         Builder.CreateRetVoid();
     }
+    else
+    {
+        // use SVF::Options to record whether svf.main is added or not
+        Options::SVFMain.setValue(false);
+    }
 }
 
 void LLVMModuleSet::collectExtFunAnnotations(const Module* mod)