svf-lib 1.0.1369 → 1.0.1371

package/SVF-osx/include/Graphs/GenericGraph.h

@@ -60,9 +60,8 @@ private:
 
 public:
     /// Constructor
-    GenericEdge(NodeTy* s, NodeTy* d, GEdgeFlag k): src(s),dst(d), edgeFlag(k)
+    GenericEdge(NodeTy* s, NodeTy* d, GEdgeFlag k) : src(s), dst(d), edgeFlag(k)
     {
-
     }
 
     /// Destructor
@@ -116,8 +115,9 @@ public:
 
     virtual inline bool operator==(const GenericEdge<NodeType>* rhs) const
     {
-        return (rhs->edgeFlag == this->edgeFlag && rhs->getSrcID() == this->getSrcID()
-                && rhs->getDstID() == this->getDstID());
+        return (rhs->edgeFlag == this->edgeFlag &&
+                rhs->getSrcID() == this->getSrcID() &&
+                rhs->getDstID() == this->getDstID());
     }
     //@}
 

package/SVF-osx/include/MTA/MTA.h

@@ -36,7 +36,6 @@
 
 #include <set>
 #include <vector>
-#include "SVF-LLVM/BasicTypes.h"
 #include "SVFIR/SVFValue.h"
 
 namespace SVF
@@ -77,7 +76,8 @@ public:
     /// Perform detection
     virtual void detect(SVFModule* module);
 
-    void dump(Module &module, MHP *mhp, LockAnalysis *lsa);
+    // Not implemented for now
+    // void dump(Module &module, MHP *mhp, LockAnalysis *lsa);
 
     MHP* getMHP()
     {

package/SVF-osx/include/MTA/MTAResultValidator.h

@@ -9,7 +9,6 @@
 #define MTARESULTVALIDATOR_H_
 
 #include "MTA/MHP.h"
-#include "SVF-LLVM/LLVMUtil.h"
 
 /*!
  * Validate the result of context-sensitive analysis, including context-sensitive

package/SVF-osx/include/MTA/MTAStat.h

@@ -31,11 +31,11 @@
 #define MTASTAT_H_
 
 #include "Util/PTAStat.h"
-#include "SVF-LLVM/BasicTypes.h"
 
 namespace SVF
 {
 
+class Instruction;
 class ThreadCallGraph;
 class TCT;
 class MHP;

package/SVF-osx/include/SVFIR/SVFStatements.h

@@ -33,12 +33,16 @@
 
 #include "Graphs/GenericGraph.h"
 #include "MemoryModel/LocationSet.h"
-#include "Graphs/ICFGNode.h"
 
 namespace SVF
 {
 
 class SVFVar;
+class ICFGNode;
+class IntraICFGNode;
+class CallICFGNode;
+class FunEntryICFGNode;
+class FunExitICFGNode;
 
 /*
  * SVFIR program statements (PAGEdges)
@@ -106,12 +110,9 @@ public:
     //@{
     inline const SVFInstruction* getInst() const
     {
-        if(const SVFInstruction* i = SVFUtil::dyn_cast<SVFInstruction>(value))
-        {
+        if (const SVFInstruction* i = SVFUtil::dyn_cast<SVFInstruction>(value))
             return i;
-        }
-        else
-            return nullptr;
+        return nullptr;
     }
     inline void setValue(const SVFValue* val)
     {
@@ -172,7 +173,7 @@ public:
     //@}
     /// Overloading operator << for dumping SVFVar value
     //@{
-    friend OutStream& operator<< (OutStream &o, const SVFStmt &edge)
+    friend OutStream& operator<<(OutStream& o, const SVFStmt& edge)
     {
         o << edge.toString();
         return o;
@@ -368,10 +369,7 @@ public:
     //@}
 
     /// constructor
-    StoreStmt(SVFVar* s, SVFVar* d, const IntraICFGNode* st) :
-        AssignStmt(s, d, makeEdgeFlagWithStoreInst(SVFStmt::Store, st))
-    {
-    }
+    StoreStmt(SVFVar* s, SVFVar* d, const IntraICFGNode* st);
 
     virtual const std::string toString() const override;
 };
@@ -514,10 +512,8 @@ public:
     //@}
 
     /// constructor
-    CallPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunEntryICFGNode* e, GEdgeKind k = SVFStmt::Call) :
-        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), call(i), entry(e)
-    {
-    }
+    CallPE(SVFVar* s, SVFVar* d, const CallICFGNode* i,
+           const FunEntryICFGNode* e, GEdgeKind k = SVFStmt::Call);
 
     /// Get method for the call instruction
     //@{
@@ -571,10 +567,8 @@ public:
     //@}
 
     /// constructor
-    RetPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunExitICFGNode* e, GEdgeKind k = SVFStmt::Ret) :
-        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), call(i), exit(e)
-    {
-    }
+    RetPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunExitICFGNode* e,
+          GEdgeKind k = SVFStmt::Ret);
 
     /// Get method for call instruction at caller
     //@{
@@ -614,9 +608,7 @@ private:
 protected:
     OPVars opVars;
     /// Constructor, only used by subclassess but not external users
-    MultiOpndStmt(SVFVar* r, const OPVars& opnds, GEdgeFlag k): SVFStmt(opnds.at(0), r, k), opVars(opnds)
-    {
-    }
+    MultiOpndStmt(SVFVar* r, const OPVars& opnds, GEdgeFlag k);
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -768,10 +760,7 @@ public:
     //@}
 
     /// constructor
-    SelectStmt(SVFVar* s, const OPVars& opnds, const SVFVar* cond) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::Select,opnds.at(1))), condition(cond)
-    {
-        assert(opnds.size()==2 && "SelectStmt can only have two operands!");
-    }
+    SelectStmt(SVFVar* s, const OPVars& opnds, const SVFVar* cond);
     virtual const std::string toString() const override;
 
     inline const SVFVar* getCondition() const
@@ -860,10 +849,7 @@ public:
     //@}
 
     /// constructor
-    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::Cmp,opnds.at(1))), predicate(pre)
-    {
-        assert(opnds.size()==2 && "CmpStmt can only have two operands!");
-    }
+    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre);
 
     u32_t getPredicate() const
     {
@@ -914,10 +900,7 @@ public:
     //@}
 
     /// constructor
-    BinaryOPStmt(SVFVar* s, const OPVars& opnds, u32_t oc) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::BinaryOp,opnds.at(1))), opcode(oc)
-    {
-        assert(opnds.size()==2 && "BinaryOPStmt can only have two operands!");
-    }
+    BinaryOPStmt(SVFVar* s, const OPVars& opnds, u32_t oc);
 
     u32_t getOpcode() const
     {
@@ -943,6 +926,12 @@ private:
 
     u32_t opcode;
 public:
+    /// OpCode for UnaryOPStmt, enum value is same to llvm::UnaryOperator
+    enum OpCode : unsigned
+    {
+        FNeg = 12
+    };
+
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const UnaryOPStmt *)

package/SVF-osx/include/Util/ExtAPI.h

@@ -36,7 +36,7 @@
 #include <string>
 #include <map>
 
-#define EXTAPI_JSON_PATH "/include/Util/ExtAPI.json"
+#define EXTAPI_JSON_PATH "svf/include/Util/ExtAPI.json"
 #define JSON_OPT_OVERWRITE "overwrite_app_function"
 #define JSON_OPT_FUNCTIONTYPE "type"
 
@@ -256,7 +256,7 @@ public:
         std::vector<std::string> operandStr;
         std::vector<NodeID> operands;
     };
-    static ExtAPI *getExtAPI(const std::string & = "");
+    static ExtAPI *getExtAPI(const std::string& = "");
 
     static void destory();
 
@@ -264,7 +264,7 @@ public:
     void add_entry(const char* funName, extType type, bool overwrite_app_function);
 
     // Get numeric index of the argument in external function
-    u32_t getArgPos(std::string s);
+    u32_t getArgPos(const std::string& s);
 
     // return value >= 0 is an argument node
     // return value = -1 is an inst node
@@ -272,7 +272,7 @@ public:
     // return value = -3 is an object node
     // return value = -4 is an offset
     // return value = -5 is an illegal operand format
-    s32_t getNodeIDType(std::string s);
+    s32_t getNodeIDType(const std::string& s);
 
     // Get the corresponding name in ext_t, e.g. "EXT_ADDR" in {"addr", EXT_ADDR},
     std::string get_opName(const std::string& s);
@@ -336,4 +336,4 @@ public:
 };
 } // End namespace SVF
 
-#endif
+#endif

package/package.json

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