svf-lib 1.0.2219 → 1.0.2221

package/SVF-osx/Release-build/include/SVF-LLVM/LLVMModule.h

@@ -58,9 +58,9 @@ public:
     typedef Map<const Function*, FunObjVar*> LLVMFun2FunObjVarMap;
     typedef Map<const BasicBlock*, SVFBasicBlock*> LLVMBB2SVFBBMap;
     typedef Map<const Instruction*, SVFInstruction*> LLVMInst2SVFInstMap;
-    typedef Map<const Argument*, SVFArgument*> LLVMArgument2SVFArgumentMap;
-    typedef Map<const Constant*, SVFConstant*> LLVMConst2SVFConstMap;
-    typedef Map<const Value*, SVFOtherValue*> LLVMValue2SVFOtherValueMap;
+    typedef Map<const Argument*, SVFLLVMValue*> LLVMArgument2SVFArgumentMap;
+    typedef Map<const Constant*, SVFLLVMValue*> LLVMConst2SVFConstMap;
+    typedef Map<const Value*, SVFLLVMValue*> LLVMValue2SVFOtherValueMap;
     typedef Map<const SVFLLVMValue*, const Value*> SVFValue2LLVMValueMap;
     typedef Map<const SVFValue*, const Value*> SVFBaseNode2LLVMValueMap;
     typedef Map<const Type*, SVFType*> LLVMType2SVFTypeMap;
@@ -254,12 +254,12 @@ public:
         addToSVFVar2LLVMValueMap(inst, svfInst);
     }
 
-    inline void addArgumentMap(const Argument* arg, SVFArgument* svfArg)
+    inline void addArgumentMap(const Argument* arg, SVFLLVMValue* svfArg)
     {
         LLVMArgument2SVFArgument[arg] = svfArg;
         setValueAttr(arg,svfArg);
     }
-    inline void addGlobalValueMap(const GlobalValue* glob, SVFGlobalValue* svfglob)
+    inline void addGlobalValueMap(const GlobalValue* glob, SVFLLVMValue* svfglob)
     {
         if (auto glob_var = llvm::dyn_cast<llvm::GlobalVariable>(glob);
                 hasGlobalRep(glob_var))
@@ -269,17 +269,17 @@ public:
         LLVMConst2SVFConst[glob] = svfglob;
         setValueAttr(glob,svfglob);
     }
-    inline void addConstantDataMap(const ConstantData* cd, SVFConstantData* svfcd)
+    inline void addConstantDataMap(const ConstantData* cd, SVFLLVMValue* svfcd)
     {
         LLVMConst2SVFConst[cd] = svfcd;
         setValueAttr(cd,svfcd);
     }
-    inline void addOtherConstantMap(const Constant* cons, SVFConstant* svfcons)
+    inline void addOtherConstantMap(const Constant* cons, SVFLLVMValue* svfcons)
     {
         LLVMConst2SVFConst[cons] = svfcons;
         setValueAttr(cons,svfcons);
     }
-    inline void addOtherValueMap(const Value* ov, SVFOtherValue* svfov)
+    inline void addOtherValueMap(const Value* ov, SVFLLVMValue* svfov)
     {
         LLVMValue2SVFOtherValue[ov] = svfov;
         setValueAttr(ov,svfov);
@@ -353,14 +353,14 @@ public:
         return it->second;
     }
 
-    inline SVFArgument* getSVFArgument(const Argument* arg) const
+    inline SVFLLVMValue* getSVFArgument(const Argument* arg) const
     {
         LLVMArgument2SVFArgumentMap::const_iterator it = LLVMArgument2SVFArgument.find(arg);
         assert(it!=LLVMArgument2SVFArgument.end() && "SVF Argument not found!");
         return it->second;
     }
 
-    inline SVFGlobalValue* getSVFGlobalValue(const GlobalValue* g) const
+    inline SVFLLVMValue* getSVFGlobalValue(const GlobalValue* g) const
     {
         if (auto glob_var = llvm::dyn_cast<llvm::GlobalVariable>(g);
                 hasGlobalRep(glob_var))
@@ -369,14 +369,13 @@ public:
         }
         LLVMConst2SVFConstMap::const_iterator it = LLVMConst2SVFConst.find(g);
         assert(it!=LLVMConst2SVFConst.end() && "SVF Global not found!");
-        assert(SVFUtil::isa<SVFGlobalValue>(it->second) && "not a SVFGlobal type!");
-        return SVFUtil::cast<SVFGlobalValue>(it->second);
+        return it->second;
     }
 
-    SVFConstantData* getSVFConstantData(const ConstantData* cd);
-    SVFConstant* getOtherSVFConstant(const Constant* oc);
+    SVFLLVMValue* getSVFConstantData(const ConstantData* cd);
+    SVFLLVMValue* getOtherSVFConstant(const Constant* oc);
 
-    SVFOtherValue* getSVFOtherValue(const Value* ov);
+    SVFLLVMValue* getSVFOtherValue(const Value* ov);
 
     /// Get the corresponding Function based on its name
     inline const SVFFunction* getSVFFunction(const std::string& name)

package/SVF-osx/Release-build/include/SVF-LLVM/SVFLLVMValue.h

@@ -63,16 +63,7 @@ public:
     {
         SVFVal,
         SVFFunc,
-        SVFBB,
         SVFInst,
-        SVFCall,
-        SVFVCall,
-        SVFGlob,
-        SVFArg,
-        SVFConst,
-        SVFConstData,
-        SVFMetaAsValue,
-        SVFOther
     };
 
 private:
@@ -85,9 +76,9 @@ protected:
     std::string name;       ///< Short name of value for printing & debugging
     std::string sourceLoc;  ///< Source code information of this value
     /// Constructor without name
-    SVFLLVMValue(const SVFType* ty, SVFValKind k)
+    SVFLLVMValue(const SVFType* ty, SVFValKind k = SVFVal)
         : kind(k), ptrInUncalledFun(false),
-          constDataOrAggData(SVFConstData == k), type(ty), sourceLoc("NoLoc")
+          constDataOrAggData(false), type(ty), sourceLoc("NoLoc")
     {
     }
 
@@ -405,9 +396,7 @@ public:
 
     static inline bool classof(const SVFLLVMValue *node)
     {
-        return node->getKind() == SVFInst ||
-               node->getKind() == SVFCall ||
-               node->getKind() == SVFVCall;
+        return node->getKind() == SVFInst;
     }
 
     inline const SVFBasicBlock* getParent() const
@@ -426,242 +415,6 @@ public:
     }
 };
 
-class SVFCallInst : public SVFInstruction
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-    friend class LLVMModuleSet;
-    friend class SVFIRBuilder;
-
-private:
-    std::vector<const SVFLLVMValue*> args;
-    bool varArg;
-    const SVFLLVMValue* calledVal;
-
-protected:
-    ///@{ attributes to be set only through Module builders e.g., LLVMModule
-    inline void addArgument(const SVFLLVMValue* a)
-    {
-        args.push_back(a);
-    }
-    inline void setCalledOperand(const SVFLLVMValue* v)
-    {
-        calledVal = v;
-    }
-    /// @}
-
-public:
-    SVFCallInst(const SVFType* ty, const SVFBasicBlock* b, bool va, bool tm, SVFValKind k = SVFCall) :
-        SVFInstruction(ty, b, tm, false, k), varArg(va), calledVal(nullptr)
-    {
-    }
-    SVFCallInst(void) = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFCall || node->getKind() == SVFVCall;
-    }
-    static inline bool classof(const SVFInstruction *node)
-    {
-        return node->getKind() == SVFCall || node->getKind() == SVFVCall;
-    }
-    inline u32_t arg_size() const
-    {
-        return args.size();
-    }
-    inline bool arg_empty() const
-    {
-        return args.empty();
-    }
-    inline const SVFLLVMValue* getArgOperand(u32_t i) const
-    {
-        assert(i < arg_size() && "out of bound access of the argument");
-        return args[i];
-    }
-    inline u32_t getNumArgOperands() const
-    {
-        return arg_size();
-    }
-    inline const SVFLLVMValue* getCalledOperand() const
-    {
-        return calledVal;
-    }
-    inline bool isVarArg() const
-    {
-        return varArg;
-    }
-    inline const SVFFunction* getCalledFunction() const
-    {
-        return SVFUtil::dyn_cast<SVFFunction>(calledVal);
-    }
-    inline  const FunObjVar* getCaller() const
-    {
-        return getFunction();
-    }
-};
-
-class SVFConstant : public SVFLLVMValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-public:
-    SVFConstant(const SVFType* ty, SVFValKind k = SVFConst): SVFLLVMValue(ty, k)
-    {
-    }
-    SVFConstant() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFConst ||
-               node->getKind() == SVFGlob ||
-               node->getKind() == SVFConstData;
-    }
-
-};
-
-class SVFGlobalValue : public SVFConstant
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-    friend class LLVMModuleSet;
-
-private:
-    const SVFLLVMValue* realDefGlobal;  /// the definition of a function across multiple modules
-
-protected:
-    inline void setDefGlobalForMultipleModule(const SVFLLVMValue* defg)
-    {
-        realDefGlobal = defg;
-    }
-
-public:
-    SVFGlobalValue(const SVFType* ty): SVFConstant(ty, SVFLLVMValue::SVFGlob), realDefGlobal(nullptr)
-    {
-    }
-    SVFGlobalValue(std::string&& name, const SVFType* ty) : SVFGlobalValue(ty)
-    {
-        setName(std::move(name));
-    }
-    SVFGlobalValue() = delete;
-
-    inline const SVFLLVMValue* getDefGlobalForMultipleModule() const
-    {
-        if(realDefGlobal==nullptr)
-            return this;
-        return realDefGlobal;
-    }
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFGlob;
-    }
-    static inline bool classof(const SVFConstant *node)
-    {
-        return node->getKind() == SVFGlob;
-    }
-};
-
-class SVFArgument : public SVFLLVMValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-private:
-    const SVFFunction* fun;
-    u32_t argNo;
-    bool uncalled;
-public:
-    SVFArgument(const SVFType* ty, const SVFFunction* fun, u32_t argNo,
-                bool uncalled)
-        : SVFLLVMValue(ty, SVFLLVMValue::SVFArg), fun(fun), argNo(argNo),
-          uncalled(uncalled)
-    {
-    }
-    SVFArgument() = delete;
-
-    inline const SVFFunction* getParent() const
-    {
-        return fun;
-    }
-
-    ///  Return the index of this formal argument in its containing function.
-    /// For example in "void foo(int a, float b)" a is 0 and b is 1.
-    inline u32_t getArgNo() const
-    {
-        return argNo;
-    }
-
-    inline bool isArgOfUncalledFunction() const
-    {
-        return uncalled;
-    }
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFArg;
-    }
-};
-
-class SVFConstantData : public SVFConstant
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-public:
-    SVFConstantData(const SVFType* ty, SVFValKind k = SVFConstData)
-        : SVFConstant(ty, k)
-    {
-    }
-    SVFConstantData() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFConstData;
-    }
-    static inline bool classof(const SVFConstantData *node)
-    {
-        return node->getKind() == SVFConstData;
-    }
-};
-
-class SVFOtherValue : public SVFLLVMValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-public:
-    SVFOtherValue(const SVFType* ty, SVFValKind k = SVFLLVMValue::SVFOther)
-        : SVFLLVMValue(ty, k)
-    {
-    }
-    SVFOtherValue() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFOther || node->getKind() == SVFMetaAsValue;
-    }
-};
-
-/*
- * This class is only for LLVM's MetadataAsValue
-*/
-class SVFMetadataAsValue : public SVFOtherValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-public:
-    SVFMetadataAsValue(const SVFType* ty)
-        : SVFOtherValue(ty, SVFLLVMValue::SVFMetaAsValue)
-    {
-    }
-    SVFMetadataAsValue() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFMetaAsValue;
-    }
-    static inline bool classof(const SVFOtherValue *node)
-    {
-        return node->getKind() == SVFMetaAsValue;
-    }
-};
-
 
 /// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
 /// Converts an SVFValue to corresponding LLVM::Value, then get the string

package/SVF-osx/Release-build/include/SVF-LLVM/SVFModule.h

@@ -44,10 +44,10 @@ class SVFModule
 
 public:
     typedef std::vector<const SVFFunction*> FunctionSetType;
-    typedef std::vector<SVFGlobalValue*> GlobalSetType;
-    typedef std::vector<SVFGlobalValue*> AliasSetType;
-    typedef std::vector<SVFConstant*> ConstantType;
-    typedef std::vector<SVFOtherValue*> OtherValueType;
+    typedef std::vector<SVFLLVMValue*> GlobalSetType;
+    typedef std::vector<SVFLLVMValue*> AliasSetType;
+    typedef std::vector<SVFLLVMValue*> ConstantType;
+    typedef std::vector<SVFLLVMValue*> OtherValueType;
 
     /// Iterators type def
     typedef FunctionSetType::iterator iterator;
@@ -86,21 +86,19 @@ public:
     {
         FunctionSet.push_back(svfFunc);
     }
-    inline void addGlobalSet(SVFGlobalValue* glob)
+    inline void addGlobalSet(SVFLLVMValue* glob)
     {
         GlobalSet.push_back(glob);
-        addConstant(glob);
     }
-    inline void addAliasSet(SVFGlobalValue* alias)
+    inline void addAliasSet(SVFLLVMValue* alias)
     {
         AliasSet.push_back(alias);
-        addConstant(alias);
     }
-    inline void addConstant(SVFConstant* cd)
+    inline void addConstant(SVFLLVMValue* cd)
     {
         ConstantSet.push_back(cd);
     }
-    inline void addOtherValue(SVFOtherValue* ov)
+    inline void addOtherValue(SVFLLVMValue* ov)
     {
         OtherValueSet.push_back(ov);
     }

package/package.json

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