svf-tools 1.0.1045 → 1.0.1046

package/package.json

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

package/svf-llvm/include/SVF-LLVM/SVFLLVMValue.h

@@ -71,10 +71,6 @@ public:
         SVFArg,
         SVFConst,
         SVFConstData,
-        SVFConstInt,
-        SVFConstFP,
-        SVFNullPtr,
-        SVFBlackHole,
         SVFMetaAsValue,
         SVFOther
     };
@@ -138,14 +134,6 @@ public:
     {
         return ptrInUncalledFun;
     }
-    inline bool isblackHole() const
-    {
-        return getKind() == SVFBlackHole;;
-    }
-    inline bool isNullPtr() const
-    {
-        return getKind() == SVFNullPtr;
-    }
     inline virtual void setSourceLoc(const std::string& sourceCodeInfo)
     {
         sourceLoc = sourceCodeInfo;
@@ -526,11 +514,7 @@ public:
     {
         return node->getKind() == SVFConst ||
                node->getKind() == SVFGlob ||
-               node->getKind() == SVFConstData ||
-               node->getKind() == SVFConstInt ||
-               node->getKind() == SVFConstFP ||
-               node->getKind() == SVFNullPtr ||
-               node->getKind() == SVFBlackHole;
+               node->getKind() == SVFConstData;
     }
 
 };
@@ -629,124 +613,11 @@ public:
 
     static inline bool classof(const SVFLLVMValue *node)
     {
-        return node->getKind() == SVFConstData ||
-               node->getKind() == SVFConstInt ||
-               node->getKind() == SVFConstFP ||
-               node->getKind() == SVFNullPtr ||
-               node->getKind() == SVFBlackHole;
-    }
-    static inline bool classof(const SVFConstantData *node)
-    {
-        return node->getKind() == SVFConstData ||
-               node->getKind() == SVFConstInt ||
-               node->getKind() == SVFConstFP ||
-               node->getKind() == SVFNullPtr ||
-               node->getKind() == SVFBlackHole;
-    }
-};
-
-class SVFConstantInt : public SVFConstantData
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-private:
-    u64_t zval;
-    s64_t sval;
-public:
-    SVFConstantInt(const SVFType* ty, u64_t z, s64_t s)
-        : SVFConstantData(ty, SVFLLVMValue::SVFConstInt), zval(z), sval(s)
-    {
-    }
-    SVFConstantInt() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFConstInt;
-    }
-    static inline bool classof(const SVFConstantData *node)
-    {
-        return node->getKind() == SVFConstInt;
-    }
-    //  Return the constant as a 64-bit unsigned integer value after it has been zero extended as appropriate for the type of this constant.
-    inline u64_t getZExtValue () const
-    {
-        return zval;
-    }
-    // Return the constant as a 64-bit integer value after it has been sign extended as appropriate for the type of this constant
-    inline s64_t getSExtValue () const
-    {
-        return sval;
-    }
-};
-
-class SVFConstantFP : public SVFConstantData
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-private:
-    float dval;
-public:
-    SVFConstantFP(const SVFType* ty, double d)
-        : SVFConstantData(ty, SVFLLVMValue::SVFConstFP), dval(d)
-    {
-    }
-    SVFConstantFP() = delete;
-
-    inline double getFPValue () const
-    {
-        return dval;
-    }
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFConstFP;
-    }
-    static inline bool classof(const SVFConstantData *node)
-    {
-        return node->getKind() == SVFConstFP;
-    }
-};
-
-class SVFConstantNullPtr : public SVFConstantData
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-public:
-    SVFConstantNullPtr(const SVFType* ty)
-        : SVFConstantData(ty, SVFLLVMValue::SVFNullPtr)
-    {
-    }
-    SVFConstantNullPtr() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFNullPtr;
-    }
-    static inline bool classof(const SVFConstantData *node)
-    {
-        return node->getKind() == SVFNullPtr;
-    }
-};
-
-class SVFBlackHoleValue : public SVFConstantData
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-public:
-    SVFBlackHoleValue(const SVFType* ty)
-        : SVFConstantData(ty, SVFLLVMValue::SVFBlackHole)
-    {
-    }
-    SVFBlackHoleValue() = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFBlackHole;
+        return node->getKind() == SVFConstData;
     }
     static inline bool classof(const SVFConstantData *node)
     {
-        return node->getKind() == SVFBlackHole;
+        return node->getKind() == SVFConstData;
     }
 };
 

package/svf-llvm/lib/LLVMModule.cpp

@@ -1211,9 +1211,10 @@ void LLVMModuleSet::dumpModulesToFile(const std::string& suffix)
 
 NodeID LLVMModuleSet::getValueNode(const SVFLLVMValue *val)
 {
-    if (val->isNullPtr())
+    auto llvm_value = llvmModuleSet->getLLVMValue(val);
+    if (SVFUtil::isa<ConstantPointerNull>(llvm_value))
         return svfir->nullPtrSymID();
-    else if (val->isblackHole())
+    else if (SVFUtil::isa<UndefValue>(llvm_value))
         return svfir->blkPtrSymID();
     else
     {
@@ -1224,7 +1225,7 @@ NodeID LLVMModuleSet::getValueNode(const SVFLLVMValue *val)
 }
 bool LLVMModuleSet::hasValueNode(const SVFLLVMValue *val)
 {
-    if (val->isNullPtr() || val->isblackHole())
+    if (SVFUtil::isa<ConstantPointerNull, UndefValue>(llvmModuleSet->getLLVMValue(val)))
         return true;
     else
         return (valSymMap.find(val) != valSymMap.end());
@@ -1326,55 +1327,7 @@ SVFConstantData* LLVMModuleSet::getSVFConstantData(const ConstantData* cd)
     }
     else
     {
-        SVFConstantData* svfcd = nullptr;
-        if(const ConstantInt* cint = SVFUtil::dyn_cast<ConstantInt>(cd))
-        {
-            /// bitwidth == 1 : cint has value from getZExtValue() because `bool true` will be translated to -1 using sign extension (i.e., getSExtValue).
-            /// bitwidth <=64 1 : cint has value from getSExtValue()
-            /// bitwidth >64 1 : cint has value 0 because it represents an invalid int
-            if(cint->getBitWidth() == 1)
-                svfcd = new SVFConstantInt(getSVFType(cint->getType()), cint->getZExtValue(), cint->getZExtValue());
-            else if(cint->getBitWidth() <= 64 && cint->getBitWidth() > 1)
-                svfcd = new SVFConstantInt(getSVFType(cint->getType()), cint->getZExtValue(), cint->getSExtValue());
-            else
-                svfcd = new SVFConstantInt(getSVFType(cint->getType()), 0, 0);
-        }
-        else if(const ConstantFP* cfp = SVFUtil::dyn_cast<ConstantFP>(cd))
-        {
-            double dval = 0;
-            // TODO: Why only double is considered? What about float?
-            if (cfp->isNormalFP())
-            {
-                const llvm::fltSemantics& semantics = cfp->getValueAPF().getSemantics();
-                if (&semantics == &llvm::APFloat::IEEEhalf() ||
-                        &semantics == &llvm::APFloat::IEEEsingle() ||
-                        &semantics == &llvm::APFloat::IEEEdouble() ||
-                        &semantics == &llvm::APFloat::IEEEquad() ||
-                        &semantics == &llvm::APFloat::x87DoubleExtended())
-                {
-                    dval = cfp->getValueAPF().convertToDouble();
-                }
-                else
-                {
-                    assert (false && "Unsupported floating point type");
-                    abort();
-                }
-            }
-            else
-            {
-                // other cfp type, like isZero(), isInfinity(), isNegative(), etc.
-                // do nothing
-            }
-            svfcd = new SVFConstantFP(getSVFType(cd->getType()), dval);
-        }
-        else if(SVFUtil::isa<ConstantPointerNull>(cd))
-            svfcd = new SVFConstantNullPtr(getSVFType(cd->getType()));
-        else if (SVFUtil::isa<UndefValue>(cd))
-            svfcd = new SVFBlackHoleValue(getSVFType(cd->getType()));
-        else
-            svfcd = new SVFConstantData(getSVFType(cd->getType()));
-
-
+        SVFConstantData* svfcd = new SVFConstantData(getSVFType(cd->getType()));
         svfModule->addConstant(svfcd);
         addConstantDataMap(cd,svfcd);
         return svfcd;