svf-lib 1.0.778 → 1.0.782

package/SVF-linux/include/MemoryModel/SVFIR.h

@@ -409,7 +409,7 @@ public:
     {
         const MemObj* obj = getObject(id);
         assert(obj && "not an object node?");
-        return SymbolTableInfo::isConstantObj(id) || obj->isConstant();
+        return SymbolTableInfo::isConstantObj(id) || obj->isConstDataOrConstGlobal();
     }
     inline bool isNonPointerObj(NodeID id) const
     {

package/SVF-linux/include/MemoryModel/SVFVariables.h

@@ -285,12 +285,16 @@ public:
     {
         return node->getNodeKind() == SVFVar::ValNode ||
                node->getNodeKind() == SVFVar::GepValNode ||
+               node->getNodeKind() == SVFVar::RetNode ||
+               node->getNodeKind() == SVFVar::VarargNode ||
                node->getNodeKind() == SVFVar::DummyValNode;
     }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::ValNode ||
                node->getNodeKind() == SVFVar::GepValNode ||
+               node->getNodeKind() == SVFVar::RetNode ||
+               node->getNodeKind() == SVFVar::VarargNode ||
                node->getNodeKind() == SVFVar::DummyValNode;
     }
     //@}
@@ -578,7 +582,7 @@ public:
 /*
  * Unique Return node of a procedure
  */
-class RetPN: public SVFVar
+class RetPN: public ValVar
 {
 
 public:
@@ -592,6 +596,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::RetNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::RetNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::RetNode;
@@ -600,7 +608,7 @@ public:
 
     /// Constructor
     RetPN(const SVFFunction* val, NodeID i) :
-        SVFVar(val->getLLVMFun(), i, RetNode)
+        ValVar(val->getLLVMFun(), i, RetNode)
     {
     }
 
@@ -617,7 +625,7 @@ public:
 /*
  * Unique vararg node of a procedure
  */
-class VarArgPN: public SVFVar
+class VarArgPN: public ValVar
 {
 
 public:
@@ -631,6 +639,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::VarargNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::VarargNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::VarargNode;
@@ -639,7 +651,7 @@ public:
 
     /// Constructor
     VarArgPN(const SVFFunction* val, NodeID i) :
-        SVFVar(val->getLLVMFun(), i, VarargNode)
+        ValVar(val->getLLVMFun(), i, VarargNode)
     {
     }
 
@@ -672,6 +684,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::DummyValNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::DummyValNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::DummyValNode;
@@ -712,6 +728,11 @@ public:
         return node->getNodeKind() == SVFVar::DummyObjNode
                || node->getNodeKind() == SVFVar::CloneDummyObjNode;
     }
+    static inline bool classof(const ObjVar *node)
+    {
+        return node->getNodeKind() == SVFVar::DummyObjNode
+               || node->getNodeKind() == SVFVar::CloneDummyObjNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::DummyObjNode

package/SVF-linux/include/MemoryModel/SymbolTableInfo.h

@@ -53,10 +53,10 @@ public:
     /// Symbol types
     enum SYMTYPE
     {
+        NullPtr,
+        BlkPtr,
         BlackHole,
         ConstantObj,
-        BlkPtr,
-        NullPtr,
         ValSymbol,
         ObjSymbol,
         RetSymbol,
@@ -479,9 +479,10 @@ public:
     bool isArray() const;
     bool isVarStruct() const;
     bool isVarArray() const;
-    bool isConstStruct() const;
-    bool isConstArray() const;
-    bool isConstant() const;
+    bool isConstantStruct() const;
+    bool isConstantArray() const;
+    bool isConstDataOrConstGlobal() const;
+    bool isConstantData() const;
     bool hasPtrObj() const;
     bool isNonPtrFieldObj(const LocationSet& ls) const;
     //@}
@@ -591,8 +592,9 @@ public:
         VAR_ARRAY_OBJ = 0x40,  // object contains array
         CONST_STRUCT_OBJ = 0x80,  // constant struct
         CONST_ARRAY_OBJ = 0x100,  // constant array
-        CONST_OBJ = 0x200,  // constant object str e.g.
-        HASPTR_OBJ = 0x400		// non pointer object including compound type have field that is a pointer type
+        CONST_GLOBAL_OBJ = 0x200,  // global constant object
+        CONST_DATA = 0x400,  // constant object str e.g. 5, 10, 1.0
+        HASPTR_OBJ = 0x800		// the object stores a pointer address
     } MEMTYPE;
 
 private:
@@ -689,7 +691,7 @@ public:
     {
         return hasFlag(VAR_STRUCT_OBJ);
     }
-    inline bool isConstStruct()
+    inline bool isConstantStruct()
     {
         return hasFlag(CONST_STRUCT_OBJ);
     }
@@ -701,7 +703,7 @@ public:
     {
         return hasFlag(VAR_ARRAY_OBJ);
     }
-    inline bool isConstArray()
+    inline bool isConstantArray()
     {
         return  hasFlag(CONST_ARRAY_OBJ);
     }
@@ -709,9 +711,13 @@ public:
     {
         return hasFlag(VAR_ARRAY_OBJ) || hasFlag(CONST_ARRAY_OBJ);
     }
-    inline bool isConstant()
+    inline bool isConstDataOrConstGlobal()
+    {
+        return hasFlag(CONST_GLOBAL_OBJ) || hasFlag(CONST_DATA);
+    }
+    inline bool isConstantData()
     {
-        return hasFlag(CONST_OBJ);
+        return hasFlag(CONST_DATA);
     }
     inline bool hasPtrObj()
     {

package/SVF-osx/include/MemoryModel/SVFVariables.h

@@ -285,12 +285,16 @@ public:
     {
         return node->getNodeKind() == SVFVar::ValNode ||
                node->getNodeKind() == SVFVar::GepValNode ||
+               node->getNodeKind() == SVFVar::RetNode ||
+               node->getNodeKind() == SVFVar::VarargNode ||
                node->getNodeKind() == SVFVar::DummyValNode;
     }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::ValNode ||
                node->getNodeKind() == SVFVar::GepValNode ||
+               node->getNodeKind() == SVFVar::RetNode ||
+               node->getNodeKind() == SVFVar::VarargNode ||
                node->getNodeKind() == SVFVar::DummyValNode;
     }
     //@}
@@ -578,7 +582,7 @@ public:
 /*
  * Unique Return node of a procedure
  */
-class RetPN: public SVFVar
+class RetPN: public ValVar
 {
 
 public:
@@ -592,6 +596,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::RetNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::RetNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::RetNode;
@@ -600,7 +608,7 @@ public:
 
     /// Constructor
     RetPN(const SVFFunction* val, NodeID i) :
-        SVFVar(val->getLLVMFun(), i, RetNode)
+        ValVar(val->getLLVMFun(), i, RetNode)
     {
     }
 
@@ -617,7 +625,7 @@ public:
 /*
  * Unique vararg node of a procedure
  */
-class VarArgPN: public SVFVar
+class VarArgPN: public ValVar
 {
 
 public:
@@ -631,6 +639,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::VarargNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::VarargNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::VarargNode;
@@ -639,7 +651,7 @@ public:
 
     /// Constructor
     VarArgPN(const SVFFunction* val, NodeID i) :
-        SVFVar(val->getLLVMFun(), i, VarargNode)
+        ValVar(val->getLLVMFun(), i, VarargNode)
     {
     }
 
@@ -672,6 +684,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::DummyValNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::DummyValNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::DummyValNode;
@@ -712,6 +728,11 @@ public:
         return node->getNodeKind() == SVFVar::DummyObjNode
                || node->getNodeKind() == SVFVar::CloneDummyObjNode;
     }
+    static inline bool classof(const ObjVar *node)
+    {
+        return node->getNodeKind() == SVFVar::DummyObjNode
+               || node->getNodeKind() == SVFVar::CloneDummyObjNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::DummyObjNode

package/SVF-osx/include/MemoryModel/SymbolTableInfo.h

@@ -53,10 +53,10 @@ public:
     /// Symbol types
     enum SYMTYPE
     {
+        NullPtr,
+        BlkPtr,
         BlackHole,
         ConstantObj,
-        BlkPtr,
-        NullPtr,
         ValSymbol,
         ObjSymbol,
         RetSymbol,

package/package.json

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