svf-lib 1.0.1792 → 1.0.1794

package/SVF-linux/svf/include/AbstractExecution/SVFIR2ConsExeState.h

@@ -97,7 +97,6 @@ public:
     /// Init ConZ3Expr for ObjVar
     void initObjVar(const ObjVar *objVar, u32_t varId);
 
-    void initValVar(const ValVar *objVar, u32_t varId);
 
     void initSVFVar(u32_t varId);
 

package/SVF-linux/svf/include/AbstractExecution/SVFIR2ItvExeState.h

@@ -94,8 +94,6 @@ public:
 
     void applySummary(IntervalExeState &es);
 
-    /// Init ValVar
-    void initValVar(const ValVar *valVar, u32_t varId);
 
     /// Init ObjVar
     void initObjVar(const ObjVar *objVar, u32_t varId);

package/SVF-linux/svf/include/SVFIR/SymbolTableInfo.h

@@ -460,7 +460,6 @@ public:
     bool isConstantArray() const;
     bool isConstDataOrConstGlobal() const;
     bool isConstDataOrAggData() const;
-    bool hasPtrObj() const;
     //@}
 
     /// Operator overloading
@@ -496,7 +495,6 @@ public:
         CONST_ARRAY_OBJ = 0x100,  // constant array
         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:
@@ -646,10 +644,6 @@ public:
     {
         return hasFlag(CONST_DATA);
     }
-    inline bool hasPtrObj()
-    {
-        return hasFlag(HASPTR_OBJ);
-    }
     //@}
 };
 

package/SVF-linux/svf-llvm/include/SVF-LLVM/LLVMUtil.h

@@ -353,27 +353,6 @@ void removeUnusedGlobalVariables(Module* module);
 /// Delete unused functions, annotations and global variables in extapi.bc
 void removeUnusedFuncsAndAnnotationsAndGlobalVariables(std::vector<Function*> removedFuncList);
 
-inline u32_t SVFType2ByteSize(const SVFType* type)
-{
-    const llvm::Type* llvm_rhs = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(type);
-    const llvm::PointerType* llvm_rhs_ptr = SVFUtil::dyn_cast<PointerType>(llvm_rhs);
-    assert(llvm_rhs_ptr && "not a pointer type?");
-    // TODO: getPtrElementType need type inference
-    const Type *ptrElementType = getPtrElementType(llvm_rhs_ptr);
-    u32_t llvm_rhs_size = LLVMUtil::getTypeSizeInBytes(ptrElementType);
-    u32_t llvm_elem_size = -1;
-    if (ptrElementType->isArrayTy() && llvm_rhs_size > 0)
-    {
-        size_t array_len = ptrElementType->getArrayNumElements();
-        llvm_elem_size = llvm_rhs_size / array_len;
-    }
-    else
-    {
-        llvm_elem_size =llvm_rhs_size;
-    }
-    return llvm_elem_size;
-}
-
 /// Get the corresponding Function based on its name
 inline const SVFFunction* getFunction(const std::string& name)
 {

package/SVF-osx/svf/include/DDA/DDAVFSolver.h

@@ -189,17 +189,23 @@ protected:
             backtraceAlongDirectVF(gepPts,dpm);
             unionDDAPts(pts, processGepPts(SVFUtil::cast<GepSVFGNode>(node),gepPts));
         }
-        else if(SVFUtil::isa<LoadSVFGNode>(node))
+        else if(const LoadSVFGNode* load = SVFUtil::dyn_cast<LoadSVFGNode>(node))
         {
+            if(load->getPAGDstNode()->isPointer() == false)
+                return;
+
             CPtSet loadpts;
             startNewPTCompFromLoadSrc(loadpts,dpm);
             for(typename CPtSet::iterator it = loadpts.begin(), eit = loadpts.end(); it!=eit; ++it)
             {
-                backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm,*it,node));
+                backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm,*it,load));
             }
         }
-        else if(SVFUtil::isa<StoreSVFGNode>(node))
+        else if(const StoreSVFGNode* store = SVFUtil::dyn_cast<StoreSVFGNode>(node))
         {
+            if(store->getPAGSrcNode()->isPointer() == false)
+                return;
+
             if(isMustAlias(getLoadDpm(dpm),dpm))
             {
                 DBOUT(DDDA, SVFUtil::outs() << "+++must alias for load and store:");
@@ -217,17 +223,17 @@ protected:
                 {
                     if(propagateViaObj(*it,getLoadCVar(dpm)))
                     {
-                        backtraceToStoreSrc(pts,getDPImWithOldCond(dpm,*it,node));
+                        backtraceToStoreSrc(pts,getDPImWithOldCond(dpm,*it,store));
 
-                        if(isStrongUpdate(storepts,SVFUtil::cast<StoreSVFGNode>(node)))
+                        if(isStrongUpdate(storepts,store))
                         {
                             DBOUT(DDDA, SVFUtil::outs() << "backward strong update for obj " << dpm.getCurNodeID() << "\n");
-                            DOSTAT(addSUStat(dpm,node);)
+                            DOSTAT(addSUStat(dpm,store);)
                         }
                         else
                         {
-                            DOSTAT(rmSUStat(dpm,node);)
-                            backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm,*it,node));
+                            DOSTAT(rmSUStat(dpm,store);)
+                            backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm,*it,store));
                         }
                     }
                     else
@@ -347,7 +353,7 @@ protected:
     {
         const SVFGNode* node = oldDpm.getLoc();
         NodeID obj = oldDpm.getCurNodeID();
-        if (_pag->isConstantObj(obj) || _pag->isNonPointerObj(obj))
+        if (_pag->isConstantObj(obj))
             return;
         const SVFGEdgeSet edgeSet(node->getInEdges());
         for (SVFGNode::const_iterator it = edgeSet.begin(), eit = edgeSet.end(); it != eit; ++it)

package/SVF-osx/svf/include/MemoryModel/PointerAnalysis.h

@@ -300,10 +300,6 @@ public:
     {
         return pag->isBlkObjOrConstantObj(ptd);
     }
-    inline bool isNonPointerObj(NodeID ptd) const
-    {
-        return pag->isNonPointerObj(ptd);
-    }
     //@}
 
     /// Whether this object is heap or array

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

@@ -434,8 +434,6 @@ public:
         return SymbolTableInfo::isConstantObj(id) ||
                obj->isConstDataOrConstGlobal();
     }
-    /// Whether an object can point to any other object or any of its fields is a pointer type.
-    bool isNonPointerObj(NodeID id) const;
     //@}
 
     /// Base and Offset methods for Value and Object node

package/SVF-osx/svf/include/SVFIR/SymbolTableInfo.h

@@ -457,7 +457,6 @@ public:
     bool isConstDataOrConstGlobal() const;
     bool isConstDataOrAggData() const;
     bool hasPtrObj() const;
-    bool isNonPtrFieldObj(const APOffset& apOffset) const;
     //@}
 
     /// Operator overloading
@@ -647,7 +646,6 @@ public:
     {
         return hasFlag(HASPTR_OBJ);
     }
-    virtual bool isNonPtrFieldObj(const APOffset& apOffset);
     //@}
 };
 

package/package.json

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