svf-tools 1.0.672 → 1.0.673

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.672",
+  "version": "1.0.673",
   "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/include/MemoryModel/LocationSet.h

@@ -36,15 +36,19 @@
 
 #include "SVFIR/SVFValue.h"
 
+
 namespace SVF
 {
 
+class SVFVar;
+
+
 /*
- * Location set represents a set of locations in a memory block with following offsets:
- *     { offset + \sum_{i=0}^N (stride_i * j_i) | 0 \leq j_i < M_i }
- * where N is the size of number-stride pair vector, M_i (stride_i) is i-th number (stride)
- * in the number-stride pair vector.
- */
+* Location set represents a set of locations in a memory block with following offsets:
+*     { offset + \sum_{i=0}^N (stride_i * j_i) | 0 \leq j_i < M_i }
+* where N is the size of number-stride pair vector, M_i (stride_i) is i-th number (stride)
+* in the number-stride pair vector.
+*/
 class LocationSet
 {
     friend class SymbolTableInfo;
@@ -54,7 +58,7 @@ public:
         NonOverlap, Overlap, Subset, Superset, Same
     };
 
-    typedef std::vector<std::pair<const SVFValue*, const SVFType*> > OffsetValueVec;
+    typedef std::vector<const SVFVar*> OffsetVarVec;
 
     /// Constructor
     LocationSet(s32_t o = 0) : fldIdx(o)
@@ -62,7 +66,7 @@ public:
 
     /// Copy Constructor
     LocationSet(const LocationSet& ls)
-        : fldIdx(ls.fldIdx), offsetValues(ls.getOffsetValueVec())
+        : fldIdx(ls.fldIdx), offsetVars(ls.getOffsetVarVec())
     {
     }
 
@@ -75,13 +79,13 @@ public:
     inline const LocationSet& operator= (const LocationSet& rhs)
     {
         fldIdx = rhs.fldIdx;
-        offsetValues = rhs.getOffsetValueVec();
+        offsetVars = rhs.getOffsetVarVec();
         return *this;
     }
     inline bool operator==(const LocationSet& rhs) const
     {
         return this->fldIdx == rhs.fldIdx
-               && this->offsetValues == rhs.offsetValues;
+               && this->offsetVars == rhs.offsetVars;
     }
     //@}
 
@@ -95,19 +99,20 @@ public:
     {
         fldIdx = idx;
     }
-    inline const OffsetValueVec& getOffsetValueVec() const
+    inline const OffsetVarVec& getOffsetVarVec() const
     {
-        return offsetValues;
+        return offsetVars;
     }
     //@}
 
-    /// Return accumulated constant offset given OffsetValueVec
+    /// Return accumulated constant offset given OffsetVarVec
     s32_t accumulateConstantOffset() const;
 
     /// Return element number of a type.
     u32_t getElementNum(const SVFType* type) const;
 
-    bool addOffsetValue(const SVFValue* offsetValue, const SVFType* type);
+
+    bool addOffsetVar(const SVFVar* var);
 
     /// Return TRUE if this is a constant location set.
     bool isConstantOffset() const;
@@ -130,7 +135,7 @@ private:
     NodeBS computeAllLocations() const;
 
     s32_t fldIdx;	///< Accumulated Constant Offsets
-    OffsetValueVec offsetValues;	///< a vector of actual offset in the form of Values
+    OffsetVarVec offsetVars;	///< a vector of actual offset in the form of SVF Vars
 };
 
 } // End namespace SVF
@@ -140,8 +145,8 @@ template <> struct std::hash<SVF::LocationSet>
     size_t operator()(const SVF::LocationSet &ls) const
     {
         SVF::Hash<std::pair<SVF::NodeID, SVF::NodeID>> h;
-        std::hash<SVF::LocationSet::OffsetValueVec> v;
-        return h(std::make_pair(ls.accumulateConstantFieldIdx(), v(ls.getOffsetValueVec())));
+        std::hash<SVF::LocationSet::OffsetVarVec> v;
+        return h(std::make_pair(ls.accumulateConstantFieldIdx(), v(ls.getOffsetVarVec())));
     }
 };
 

package/svf/include/SVFIR/SVFStatements.h

@@ -444,9 +444,9 @@ public:
     {
         return ls;
     }
-    inline const LocationSet::OffsetValueVec& getOffsetValueVec() const
+    inline const LocationSet::OffsetVarVec getOffsetVarVec() const
     {
-        return getLocationSet().getOffsetValueVec();
+        return getLocationSet().getOffsetVarVec();
     }
     /// Return TRUE if this is a constant location set.
     inline bool isConstantOffset() const

package/svf/lib/AbstractExecution/SVFIR2ItvExeState.cpp

@@ -104,15 +104,15 @@ SVFIR2ItvExeState::VAddrs SVFIR2ItvExeState::getGepObjAddress(u32_t pointer, u32
 
 std::pair<s32_t, s32_t> SVFIR2ItvExeState::getGepOffset(const GepStmt *gep)
 {
-    if (gep->getOffsetValueVec().empty())
+    if (gep->getOffsetVarVec().empty())
         return std::make_pair(gep->getConstantFieldIdx(), gep->getConstantFieldIdx());
 
     s32_t totalOffsetLb = 0;
     s32_t totalOffsetUb = 0;
-    for (int i = gep->getOffsetValueVec().size() - 1; i >= 0; i--)
+    for (int i = gep->getOffsetVarVec().size() - 1; i >= 0; i--)
     {
-        const SVFValue *value = gep->getOffsetValueVec()[i].first;
-        const SVFType *type = gep->getOffsetValueVec()[i].second;
+        const SVFValue *value = gep->getOffsetVarVec()[i]->getValue();
+        const SVFType *type = gep->getOffsetVarVec()[i]->getType();
         const SVFConstantInt *op = SVFUtil::dyn_cast<SVFConstantInt>(value);
         s32_t offsetLb = 0;
         s32_t offsetUb = 0;

package/svf/lib/Graphs/VFG.cpp

@@ -755,7 +755,15 @@ void VFG::connectDirectVFGEdges()
             /// for all other cases, like copy/gep/load/ret, connect the RHS pointer to its def
             if (stmtNode->getPAGSrcNode()->isConstDataOrAggDataButNotNullPtr() == false)
                 addIntraDirectVFEdge(getDef(stmtNode->getPAGSrcNode()), nodeId);
-
+            if (const GepStmt* gepStmt = SVFUtil::dyn_cast<GepStmt>(stmtNode->getPAGEdge()))
+            {
+                for (const auto &var: gepStmt->getOffsetVarVec())
+                {
+                    if(var->isConstDataOrAggDataButNotNullPtr() || isInterestedPAGNode(var) == false)
+                        continue;
+                    addIntraDirectVFEdge(getDef(var), nodeId);
+                }
+            }
             /// for store, connect the RHS/LHS pointer to its def
             if(SVFUtil::isa<StoreVFGNode>(stmtNode) && (stmtNode->getPAGDstNode()->isConstDataOrAggDataButNotNullPtr() == false))
             {

package/svf/lib/MemoryModel/LocationSet.cpp

@@ -37,20 +37,20 @@ using namespace SVF;
 using namespace SVFUtil;
 
 /*!
- * Add offset value to vector offsetValues
+ * Add offset value to vector offsetVars
  */
-bool LocationSet::addOffsetValue(const SVFValue* offsetVal, const SVFType* type)
+bool LocationSet::addOffsetVar(const SVFVar* var)
 {
-    offsetValues.push_back(std::make_pair(offsetVal,type));
+    offsetVars.push_back(var);
     return true;
 }
 
 /// Return true if all offset values are constants
 bool LocationSet::isConstantOffset() const
 {
-    for(auto it : offsetValues)
+    for(auto it : offsetVars)
     {
-        if(SVFUtil::isa<SVFConstantInt>(it.first) == false)
+        if(SVFUtil::isa<SVFConstantInt>(it->getValue()) == false)
             return false;
     }
     return true;
@@ -120,14 +120,14 @@ s32_t LocationSet::accumulateConstantOffset() const
 
     assert(isConstantOffset() && "not a constant offset");
 
-    if(offsetValues.empty())
+    if(offsetVars.empty())
         return accumulateConstantFieldIdx();
 
     s32_t totalConstOffset = 0;
-    for(int i = offsetValues.size() - 1; i >= 0; i--)
+    for(int i = offsetVars.size() - 1; i >= 0; i--)
     {
-        const SVFValue* value = offsetValues[i].first;
-        const SVFType* type = offsetValues[i].second;
+        const SVFValue* value = offsetVars[i]->getValue();
+        const SVFType* type = offsetVars[i]->getType();
         const SVFConstantInt* op = SVFUtil::dyn_cast<SVFConstantInt>(value);
         assert(op && "not a constant offset?");
         if(type==nullptr)
@@ -161,10 +161,10 @@ LocationSet LocationSet::operator+ (const LocationSet& rhs) const
 {
     LocationSet ls(rhs);
     ls.fldIdx += accumulateConstantFieldIdx();
-    OffsetValueVec::const_iterator it = getOffsetValueVec().begin();
-    OffsetValueVec::const_iterator eit = getOffsetValueVec().end();
+    OffsetVarVec::const_iterator it = getOffsetVarVec().begin();
+    OffsetVarVec::const_iterator eit = getOffsetVarVec().end();
     for (; it != eit; ++it)
-        ls.addOffsetValue(it->first, it->second);
+        ls.addOffsetVar(*it);
 
     return ls;
 }
@@ -176,14 +176,14 @@ bool LocationSet::operator< (const LocationSet& rhs) const
         return (fldIdx < rhs.fldIdx);
     else
     {
-        const OffsetValueVec& pairVec = getOffsetValueVec();
-        const OffsetValueVec& rhsPairVec = rhs.getOffsetValueVec();
+        const OffsetVarVec& pairVec = getOffsetVarVec();
+        const OffsetVarVec& rhsPairVec = rhs.getOffsetVarVec();
         if (pairVec.size() != rhsPairVec.size())
             return (pairVec.size() < rhsPairVec.size());
         else
         {
-            OffsetValueVec::const_iterator it = pairVec.begin();
-            OffsetValueVec::const_iterator rhsIt = rhsPairVec.begin();
+            OffsetVarVec::const_iterator it = pairVec.begin();
+            OffsetVarVec::const_iterator rhsIt = rhsPairVec.begin();
             for (; it != pairVec.end() && rhsIt != rhsPairVec.end(); ++it, ++rhsIt)
             {
                 return (*it) < (*rhsIt);
@@ -223,12 +223,12 @@ std::string LocationSet::dump() const
 
     rawstr << "LocationSet\tField_Index: " << accumulateConstantFieldIdx();
     rawstr << ",\tNum-Stride: {";
-    const OffsetValueVec& vec = getOffsetValueVec();
-    OffsetValueVec::const_iterator it = vec.begin();
-    OffsetValueVec::const_iterator eit = vec.end();
+    const OffsetVarVec& vec = getOffsetVarVec();
+    OffsetVarVec::const_iterator it = vec.begin();
+    OffsetVarVec::const_iterator eit = vec.end();
     for (; it != eit; ++it)
     {
-        rawstr << " (value: " << it->first->toString() << " type: " << it->second << ")";
+        rawstr << " (var: " << (*it)->toString() << ")";
     }
     rawstr << " }\n";
     return rawstr.str();

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

@@ -41,7 +41,7 @@ namespace SVF
 
 class SymbolTableBuilder
 {
-
+    friend class SVFIRBuilder;
 private:
     SymbolTableInfo* symInfo;
 

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -38,6 +38,7 @@
 #include "SVF-LLVM/LLVMLoopAnalysis.h"
 #include "Util/Options.h"
 #include "SVF-LLVM/CHGBuilder.h"
+#include "SVF-LLVM/SymbolTableBuilder.h"
 
 using namespace std;
 using namespace SVF;
@@ -276,7 +277,8 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
     {
         const Type* gepTy = *gi;
         const Value* offsetVal = gi.getOperand();
-        ls.addOffsetValue(LLVMModuleSet::getLLVMModuleSet()->getSVFValue(offsetVal), LLVMModuleSet::getLLVMModuleSet()->getSVFType(gepTy));
+        const SVFValue* offsetSvfVal = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(offsetVal);
+        ls.addOffsetVar(getPAG()->getGNode(getPAG()->getValueNode(offsetSvfVal)));
 
         //The int value of the current index operand
         const ConstantInt* op = SVFUtil::dyn_cast<ConstantInt>(offsetVal);
@@ -1123,7 +1125,14 @@ const Type* SVFIRBuilder::getBaseTypeAndFlattenedFields(const Value* V, std::vec
         LocationSet ls(ei);
         // make a ConstantInt and create char for the content type due to byte-wise copy
         const ConstantInt* offset = ConstantInt::get(context, llvm::APInt(32, ei));
-        ls.addOffsetValue(LLVMModuleSet::getLLVMModuleSet()->getSVFValue(offset), nullptr);
+        const SVFValue* svfOffset = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(offset);
+        if (!pag->getSymbolInfo()->hasValSym(svfOffset))
+        {
+            SymbolTableBuilder builder(pag->getSymbolInfo());
+            builder.collectSym(offset);
+            pag->addValNode(svfOffset, pag->getSymbolInfo()->getValSym(svfOffset));
+        }
+        ls.addOffsetVar(getPAG()->getGNode(getPAG()->getValueNode(svfOffset)));
         fields.push_back(ls);
     }
     return T;

package/svf-llvm/lib/SymbolTableBuilder.cpp

@@ -150,6 +150,10 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
                         inst))
                 {
                     collectSym(gep->getPointerOperand());
+                    for (u32_t i = 0; i < gep->getNumOperands(); ++i)
+                    {
+                        collectSym(gep->getOperand(i));
+                    }
                 }
                 else if (const SelectInst *sel = SVFUtil::dyn_cast<SelectInst>(inst))
                 {
@@ -247,7 +251,6 @@ void SymbolTableBuilder::collectSym(const Value *val)
     //TODO: filter the non-pointer type // if (!SVFUtil::isa<PointerType>(val->getType()))  return;
 
     DBOUT(DMemModel, outs() << "collect sym from ##" << LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val)->toString() << " \n");
-
     //TODO handle constant expression value here??
     handleCE(val);
 
@@ -370,10 +373,14 @@ void SymbolTableBuilder::handleCE(const Value *val)
             DBOUT(DMemModelCE,
                   outs() << "handle constant expression " << LLVMModuleSet::getLLVMModuleSet()->getSVFValue(ref)->toString() << "\n");
             collectVal(ce);
-            collectVal(ce->getOperand(0));
+
             // handle the recursive constant express case
             // like (gep (bitcast (gep X 1)) 1); the inner gep is ce->getOperand(0)
-            handleCE(ce->getOperand(0));
+            for (u32_t i = 0; i < ce->getNumOperands(); ++i)
+            {
+                collectVal(ce->getOperand(i));
+                handleCE(ce->getOperand(i));
+            }
         }
         else if (const ConstantExpr* ce = isCastConstantExpr(ref))
         {