svf-tools 1.0.556 → 1.0.559

package/include/Util/PTAStat.h

@@ -21,7 +21,7 @@
 //===----------------------------------------------------------------------===//
 
 /*
- * AndersenStat.h
+ * PTAStat.h
  *
  *  Created on: Oct 12, 2013
  *      Author: Yulei Sui
@@ -32,12 +32,11 @@
 
 #include "Util/BasicTypes.h"
 #include "MemoryModel/PointsTo.h"
+#include "Util/SVFStat.h"
 #include <iostream>
 #include <map>
 #include <string>
 
-using namespace std;
-
 namespace SVF
 {
 
@@ -46,7 +45,7 @@ class PointerAnalysis;
 /*!
  * Pointer Analysis Statistics
  */
-class PTAStat
+class PTAStat: public SVFStat
 {
 public:
     static const char* TotalAnalysisTime; ///< Total analysis time
@@ -118,49 +117,20 @@ public:
 
     static const char* NumOfNullPointer;	///< Number of pointers points-to null
 
-    typedef Map<const char*,u32_t> NUMStatMap;
-
-    typedef Map<const char*,double> TIMEStatMap;
-
-    enum ClockType
-    {
-        Wall,
-        CPU,
-    };
-
     PTAStat(PointerAnalysis* p);
     virtual ~PTAStat() {}
 
-    virtual inline void startClk()
-    {
-        startTime = getClk(true);
-    }
-    virtual inline void endClk()
-    {
-        endTime = getClk(true);
-    }
-    /// When mark is true, real clock is always returned. When mark is false, it is
-    /// only returned when Options::MarkedClocksOnly is not set.
-    /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
-    static double getClk(bool mark=false);
-
-    NUMStatMap generalNumMap;
     NUMStatMap PTNumStatMap;
-    TIMEStatMap timeStatMap;
     NodeBS localVarInRecursion;
 
     double startTime;
     double endTime;
 
-    virtual void performStat();
-
-    virtual void printStat(string str = "");
-
-    virtual void performStatPerQuery(NodeID) {}
+    void performStat() override;
 
-    virtual void printStatPerQuery(NodeID, const PointsTo&) {}
+    virtual void printStat(std::string str = "") override;
 
-    virtual void callgraphStat();
+    void callgraphStat() override;
 private:
     void bitcastInstStat();
     void branchStat();

package/include/Util/SVFStat.h

@@ -0,0 +1,95 @@
+//===- SVFStat.h -- Base class for statistics---------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2017>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * SVFStat.h
+ *
+ *  Created on: Sep 1, 2022
+ *      Author: Xiao Cheng
+ */
+
+#ifndef SVF_SVFSTAT_H
+#define SVF_SVFSTAT_H
+
+namespace SVF
+{
+
+
+/*!
+ * Pointer Analysis Statistics
+ */
+class SVFStat
+{
+public:
+
+    typedef OrderedMap<const char *, u32_t> NUMStatMap;
+
+    typedef OrderedMap<const char *, double> TIMEStatMap;
+
+    enum ClockType
+    {
+        Wall,
+        CPU,
+    };
+
+    SVFStat();
+
+    virtual ~SVFStat() {}
+
+    virtual inline void startClk()
+    {
+        startTime = getClk(true);
+    }
+
+    virtual inline void endClk()
+    {
+        endTime = getClk(true);
+    }
+
+    /// When mark is true, real clock is always returned. When mark is false, it is
+    /// only returned when Options::MarkedClocksOnly is not set.
+    /// Default call for getClk is unmarked, while MarkedClocksOnly is false by default.
+    static double getClk(bool mark = false);
+
+    NUMStatMap generalNumMap;
+    TIMEStatMap timeStatMap;
+
+    double startTime;
+    double endTime;
+
+    virtual void performStat() = 0;
+
+    virtual void printStat(std::string str = "") = 0;
+
+    virtual void performStatPerQuery(NodeID) {}
+
+    virtual void printStatPerQuery(NodeID, const PointsTo &) {}
+
+    virtual void callgraphStat() {}
+
+private:
+
+    std::string moduleName;
+}; // End class SVFStat
+
+} // End namespace SVF
+#endif //SVF_SVFSTAT_H

package/include/WPA/AndersenPWC.h

@@ -104,7 +104,7 @@ class AndersenSFR : public AndersenSCD
 public:
     typedef Map<NodeID, NodeBS> NodeStrides;
     typedef Map<NodeID, NodeSet> FieldReps;
-    typedef Map<NodeID, pair<NodeID, NodeSet>> SFRTrait;
+    typedef Map<NodeID, std::pair<NodeID, NodeSet>> SFRTrait;
 
 private:
     static AndersenSFR* sfrAndersen;

package/lib/DDA/DDAPass.cpp

@@ -18,6 +18,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 char DDAPass::ID = 0;
 

package/lib/DDA/DDAStat.cpp

@@ -15,6 +15,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 DDAStat::DDAStat(FlowDDA* pta) : PTAStat(pta), flowDDA(pta), contextDDA(nullptr)
 {

package/lib/Graphs/SVFGReadWrite.cpp

@@ -37,6 +37,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 // Format of file
 // __Nodes__

package/lib/Graphs/SVFGStat.cpp

@@ -32,6 +32,7 @@
 #include "Graphs/PTACallGraph.h"
 
 using namespace SVF;
+using namespace std;
 
 const char* MemSSAStat::TotalTimeOfConstructMemSSA = "TotalMSSATime";	///< Total time for constructing memory SSA
 const char* MemSSAStat::TimeOfGeneratingMemRegions  = "GenRegionTime";	///< Time for allocating regions

package/lib/SVF-FE/CHGBuilder.cpp

@@ -49,6 +49,7 @@ using namespace SVF;
 using namespace SVFUtil;
 using namespace cppUtil;
 using namespace LLVMUtil;
+using namespace std;
 
 const string pureVirtualFunName = "__cxa_pure_virtual";
 

package/lib/Util/ExtAPI.cpp

@@ -307,7 +307,7 @@ std::vector<ExtAPI::Operation> ExtAPI::getAllOperations(std::string funName)
     {
         cJSON *obj = item->child;
         //  Get the first operation of the function
-        obj = obj -> next -> next;
+        obj = obj -> next -> next -> next -> next;
         std::vector<ExtAPI::Operation *> operations;
         while (obj)
         {
@@ -358,7 +358,7 @@ ExtAPI::extType ExtAPI::get_type(const std::string& funName)
     if (item != nullptr)
     {
         //  Get the first operation of the function
-        cJSON *obj = item->child;
+        cJSON *obj = item->child->next->next;
         if (strcmp(obj->string, JSON_OPT_FUNCTIONTYPE) == 0)
             type = obj->valuestring;
         else
@@ -387,7 +387,7 @@ u32_t ExtAPI::isOverwrittenAppFunction(const SVF::SVFFunction *callee)
     if (item != nullptr)
     {
         cJSON *obj = item->child;
-        obj = obj->next;
+        obj = obj->next->next->next;
         if (strcmp(obj->string, JSON_OPT_OVERWRITE) == 0)
             return obj->valueint;
         else
@@ -473,6 +473,42 @@ bool ExtAPI::is_realloc(const SVFFunction *F)
     return t == EFT_REALLOC;
 }
 
+// Does (F) have the same return type(pointer or nonpointer) and same number of arguments
+bool ExtAPI::is_sameSignature(const SVFFunction *F)
+{
+    cJSON *item = get_FunJson(F->getName());
+    // If return type is pointer
+    bool isPointer = false;
+    // The number of arguments
+    u32_t argNum = 0;
+    if (item != nullptr)
+    {
+        // Get the "return" attribute
+        cJSON *obj = item->child;
+        if (strlen(obj->valuestring) == 0) // e.g. "return":  ""
+            assert(false && "'return' should not be empty!");
+        // If "return": "..." includes "*", the return type of extern function is a pointer
+        if (strstr(obj->valuestring, "*") != NULL)
+            isPointer = true;
+        // Get the "arguments" attribute
+        obj = obj -> next;
+        if (strlen(obj->valuestring) == 0) // e.g. "arguments":  "",
+            assert(false && "'arguments' should not be empty!");
+        // If "arguments":  "()", the number of arguments is 0, otherwise, number >= 1;
+        if (strcmp(obj->valuestring, "()") != 0)
+        {
+            argNum++;
+            for (u32_t i = 0; i < strlen(obj->valuestring); i++)
+                if (obj->valuestring[i] == ',') // Calculate the number of arguments based on the number of ","
+                    argNum++;
+        }
+    }
+    if (F->arg_size() != argNum) // The number of arguments is different
+        return false;
+    // Is the return type the same?
+    return F->getLLVMFun()->getReturnType()->isPointerTy() == isPointer;
+}
+
 // Should (F) be considered "external" (either not defined in the program
 //   or a user-defined version of a known alloc or no-op)?
 bool ExtAPI::is_ext(const SVFFunction *F)
@@ -489,9 +525,11 @@ bool ExtAPI::is_ext(const SVFFunction *F)
         if (t != EFT_NULL)
         {
             u32_t overwrittenAppFunction = isOverwrittenAppFunction(F);
+            if (!is_sameSignature(F))
+                res = 0;
             // overwrittenAppFunction = 1: Execute function specification in ExtAPI.json
             // F is considered as external function
-            if (overwrittenAppFunction == 1)
+            else if (overwrittenAppFunction == 1)
                 res = 1;
             // overwrittenAppFunction = 0: Execute user-defined functions
             // F is not considered as external function

package/lib/Util/PTAStat.cpp

@@ -35,6 +35,7 @@
 #include "Util/Options.h"
 
 using namespace SVF;
+using namespace std;
 
 const char* PTAStat:: TotalAnalysisTime = "TotalTime";	///< SVFIR value nodes ？？
 const char* PTAStat:: SCCDetectionTime = "SCCDetectTime"; ///< Total SCC detection time
@@ -105,29 +106,9 @@ const char* PTAStat:: MaxNumOfNodesInSCC = "MaxNodesInSCC";	///< max Number of n
 
 const char* PTAStat:: NumOfNullPointer = "NullPointer";	///< Number of pointers points-to null
 
-PTAStat::PTAStat(PointerAnalysis* p) : startTime(0), endTime(0), pta(p)
+PTAStat::PTAStat(PointerAnalysis* p) : SVFStat(), startTime(0), endTime(0), pta(p)
 {
-    assert((Options::ClockType == ClockType::Wall || Options::ClockType == ClockType::CPU)
-           && "PTAStat: unknown clock type!");
-}
-
-double PTAStat::getClk(bool mark)
-{
-    if (Options::MarkedClocksOnly && !mark) return 0.0;
-
-    if (Options::ClockType == ClockType::Wall)
-    {
-        struct timespec time;
-        clock_gettime(CLOCK_MONOTONIC, &time);
-        return (double)(time.tv_nsec + time.tv_sec * 1000000000) / 1000000.0;
-    }
-    else if (Options::ClockType == ClockType::CPU)
-    {
-        return CLOCK_IN_MS();
-    }
 
-    assert(false && "PTAStat::getClk: unknown clock type");
-    abort();
 }
 
 void PTAStat::performStat()

package/lib/Util/SVFStat.cpp

@@ -0,0 +1,58 @@
+//===- SVFStat.cpp -- Base class for statistics---------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2017>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * SVFStat.cpp
+ *
+ *  Created on: Sep 1, 2022
+ *      Author: Xiao Cheng
+ */
+
+#include "Util/Options.h"
+#include "Util/SVFStat.h"
+
+using namespace SVF;
+
+SVFStat::SVFStat() : startTime(0), endTime(0)
+{
+    assert((Options::ClockType == ClockType::Wall || Options::ClockType == ClockType::CPU)
+           && "PTAStat: unknown clock type!");
+}
+
+double SVFStat::getClk(bool mark)
+{
+    if (Options::MarkedClocksOnly && !mark) return 0.0;
+
+    if (Options::ClockType == ClockType::Wall)
+    {
+        struct timespec time;
+        clock_gettime(CLOCK_MONOTONIC, &time);
+        return (double)(time.tv_nsec + time.tv_sec * 1000000000) / 1000000.0;
+    }
+    else if (Options::ClockType == ClockType::CPU)
+    {
+        return CLOCK_IN_MS();
+    }
+
+    assert(false && "PTAStat::getClk: unknown clock type");
+    abort();
+}

package/lib/WPA/Andersen.cpp

@@ -36,6 +36,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 
 u32_t AndersenBase::numOfProcessedAddr = 0;

package/lib/WPA/AndersenSCD.cpp

@@ -33,6 +33,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 AndersenSCD* AndersenSCD::scdAndersen = nullptr;
 

package/lib/WPA/AndersenSFR.cpp

@@ -32,6 +32,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 AndersenSFR *AndersenSFR::sfrAndersen = nullptr;
 

package/lib/WPA/AndersenStat.cpp

@@ -33,6 +33,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 u32_t AndersenStat::_MaxPtsSize = 0;
 u32_t AndersenStat::_NumOfCycles = 0;

package/lib/WPA/AndersenWaveDiff.cpp

@@ -32,6 +32,7 @@
 
 using namespace SVF;
 using namespace SVFUtil;
+using namespace std;
 
 AndersenWaveDiff* AndersenWaveDiff::diffWave = nullptr;
 

package/package.json

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