svf-lib 1.0.2309 → 1.0.2311

package/SVF-linux-x86_64/Release-build/include/Util/Options.h

@@ -4,14 +4,10 @@
 #define OPTIONS_H_
 
 #include <sstream>
-#include "FastCluster/fastcluster.h"
 #include "Util/CommandLine.h"
 #include "Util/PTAStat.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "Util/NodeIDAllocator.h"
-#include "MSSA/MemSSA.h"
-#include "WPA/WPAPass.h"
-#include "AE/Svfexe/AbstractInterpretation.h"
 
 namespace SVF
 {
@@ -54,7 +50,7 @@ public:
     /// TODO: we can separate it into two options, and make Clusterer::cluster take in a method
     ///       argument rather than plugging Options::ClusterMethod *inside* Clusterer::cluster
     ///       directly, but it seems we will always want single anyway, and this is for testing.
-    static const OptionMap<enum hclust_fast_methods> ClusterMethod;
+    static const OptionMap<u32_t> ClusterMethod;
 
     /// Cluster partitions separately.
     static const Option<bool> RegionedClustering;
@@ -143,7 +139,7 @@ public:
     static const Option<bool> DumpMSSA;
     static const Option<std::string> MSSAFun;
     // static const llvm::cl::opt<string> MSSAFun;
-    static const OptionMap<MemSSA::MemPartition> MemPar;
+    static const OptionMap<u32_t> MemPar;
 
     // SVFG builder (SVFGBuilder.cpp)
     static const Option<bool> SVFGWithIndirectCall;
@@ -223,7 +219,7 @@ public:
     static const Option<bool> SABERFULLSVFG;
     static const Option<bool> PrintAliases;
     static OptionMultiple<PointerAnalysis::PTATY> PASelected;
-    static OptionMultiple<WPAPass::AliasCheckRule> AliasRule;
+    static OptionMultiple<u32_t> AliasRule;
 
     // DOTGraphTraits
     static const Option<bool> ShowHiddenNode;
@@ -246,7 +242,7 @@ public:
     // Abstract Execution
     static const Option<u32_t> WidenDelay;
     /// recursion handling mode, Default: TOP
-    static const OptionMap<AbstractInterpretation::HandleRecur> HandleRecur;
+    static const OptionMap<u32_t> HandleRecur;
     /// the max time consumptions (seconds). Default: 4 hours 14400s
     static const Option<u32_t> Timeout;
     /// bug info output file, Default: output.db

package/SVF-osx/Release-build/include/SVFIR/SVFType.h

@@ -197,15 +197,15 @@ private:
     StInfo* typeinfo;   ///< SVF's TypeInfo
     bool isSingleValTy; ///< The type represents a single value, not struct or
     u32_t byteSize; ///< LLVM Byte Size
+    u32_t id;
     ///< array
 
 protected:
-    SVFType(bool svt, SVFTyKind k, u32_t Sz = 1)
+    SVFType(bool svt, SVFTyKind k, u32_t i = 0, u32_t Sz = 1)
         : kind(k), typeinfo(nullptr),
-          isSingleValTy(svt), byteSize(Sz)
+          isSingleValTy(svt), byteSize(Sz), id(i)
     {
     }
-
 public:
     SVFType(void) = delete;
     virtual ~SVFType() {}
@@ -222,6 +222,11 @@ public:
     virtual void print(std::ostream& os) const = 0;
 
 
+    u32_t getId() const
+    {
+        return id;
+    }
+
     inline void setTypeInfo(StInfo* ti)
     {
         typeinfo = ti;
@@ -275,8 +280,8 @@ class SVFPointerType : public SVFType
     friend class SVFIRReader;
 
 public:
-    SVFPointerType(u32_t byteSize = 1)
-        : SVFType(true, SVFPointerTy, byteSize)
+    SVFPointerType(u32_t i, u32_t byteSize = 1)
+        : SVFType(true, SVFPointerTy, i, byteSize)
     {
     }
 
@@ -297,7 +302,7 @@ private:
     short signAndWidth; ///< For printing
 
 public:
-    SVFIntegerType(u32_t byteSize = 1) : SVFType(true, SVFIntegerTy, byteSize) {}
+    SVFIntegerType(u32_t i, u32_t byteSize = 1) : SVFType(true, SVFIntegerTy, i, byteSize) {}
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFIntegerTy;
@@ -327,8 +332,8 @@ private:
     bool varArg;
 
 public:
-    SVFFunctionType(const SVFType* rt, const std::vector<const SVFType*>& p, bool isvararg)
-        : SVFType(false, SVFFunctionTy, 1), retTy(rt), params(p), varArg(isvararg)
+    SVFFunctionType(u32_t i, const SVFType* rt, const std::vector<const SVFType*>& p, bool isvararg)
+        : SVFType(false, SVFFunctionTy,  i, 1), retTy(rt), params(p), varArg(isvararg)
     {
     }
 
@@ -363,9 +368,13 @@ class SVFStructType : public SVFType
 private:
     /// @brief Field for printing & debugging
     std::string name;
+    std::vector<const SVFType*> fields;
 
 public:
-    SVFStructType(u32_t byteSize = 1) : SVFType(false, SVFStructTy, byteSize) {}
+    SVFStructType(u32_t i, std::vector<const SVFType *> &f, u32_t byteSize = 1) :
+        SVFType(false, SVFStructTy, i, byteSize), fields(f)
+    {
+    }
 
     static inline bool classof(const SVFType* node)
     {
@@ -386,6 +395,11 @@ public:
     {
         name = std::move(structName);
     }
+
+    const std::vector<const SVFType*>& getFieldTypes() const
+    {
+        return fields;
+    }
 };
 
 class SVFArrayType : public SVFType
@@ -398,8 +412,8 @@ private:
     const SVFType* typeOfElement; /// For printing & debugging
 
 public:
-    SVFArrayType(u32_t byteSize = 1)
-        : SVFType(false, SVFArrayTy, byteSize), numOfElement(0), typeOfElement(nullptr)
+    SVFArrayType(u32_t i, u32_t byteSize = 1)
+        : SVFType(false, SVFArrayTy, i, byteSize), numOfElement(0), typeOfElement(nullptr)
     {
     }
 
@@ -437,7 +451,7 @@ private:
     std::string repr; /// Field representation for printing
 
 public:
-    SVFOtherType(bool isSingleValueTy, u32_t byteSize = 1) : SVFType(isSingleValueTy, SVFOtherTy, byteSize) {}
+    SVFOtherType(u32_t i, bool isSingleValueTy, u32_t byteSize = 1) : SVFType(isSingleValueTy, SVFOtherTy, i, byteSize) {}
 
     static inline bool classof(const SVFType* node)
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.2309",
+  "version": "1.0.2311",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {