svf-lib 1.0.848 → 1.0.849

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

@@ -553,7 +553,7 @@ private:
     }
 
     /// Add a temp field value node, this method can only invoked by getGepValVar
-    NodeID addGepValNode(const Value* curInst,const Value* val, const LocationSet& ls, NodeID i, const Type *type, u32_t fieldidx);
+    NodeID addGepValNode(const Value* curInst,const Value* val, const LocationSet& ls, NodeID i, const Type *type);
     /// Add a field obj node, this method can only invoked by getGepObjVar
     NodeID addGepObjNode(const MemObj* obj, const LocationSet& ls);
     /// Add a field-insensitive node, this method can only invoked by getFIGepObjNode

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

@@ -395,7 +395,6 @@ class GepValVar: public ValVar
 private:
     LocationSet ls;	// LocationSet
     const Type *gepValType;
-    u32_t fieldIdx;
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -419,8 +418,8 @@ public:
     //@}
 
     /// Constructor
-    GepValVar(const Value* val, NodeID i, const LocationSet& l, const Type *ty, u32_t idx) :
-        ValVar(val, i, GepValNode), ls(l), gepValType(ty), fieldIdx(idx)
+    GepValVar(const Value* val, NodeID i, const LocationSet& l, const Type *ty) :
+        ValVar(val, i, GepValNode), ls(l), gepValType(ty)
     {
     }
 
@@ -443,11 +442,6 @@ public:
         return gepValType;
     }
 
-    u32_t getFieldIdx() const
-    {
-        return fieldIdx;
-    }
-
     virtual const std::string toString() const;
 };
 

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

@@ -354,13 +354,9 @@ public:
 
     ///Get a reference to the components of struct_info.
     /// Number of flattenned elements of an array or struct
-    const u32_t getNumOfFlattenElements(const Type *T);
-    /// Number of flattenned fields of a struct
-    const u32_t getNumOfFlattenFields(const StructType *T);
+    u32_t getNumOfFlattenElements(const Type *T);
     /// Flatterned element idx of an array or struct by considering stride
-    const std::vector<u32_t>& getFlattenedElemIdxVec(const Type *T);
-    /// Flatterned field index information of a struct ignoring any array field
-    const std::vector<u32_t>& getFlattenedFieldIdxVec(const Type *T);
+    u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
 
     const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
 

package/SVF-linux/include/SVF-FE/SVFIRBuilder.h

@@ -109,41 +109,9 @@ public:
         return pag->getVarargNode(func);
     }
     //@}
-
-    /// Handle globals including (global variable and functions)
-    //@{
-    void visitGlobal(SVFModule* svfModule);
-    void InitialGlobal(const GlobalVariable *gvar, Constant *C,
-                       u32_t offset);
-    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset);
-    //@}
-
-    /// Process constant expression
-    void processCE(const Value *val);
-
-    /// Infer field index from byteoffset.
-    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
-
-    /// Compute offset of a gep instruction or gep constant expression
-    bool computeGepOffset(const User *V, LocationSet& ls);
-
-    /// Get the base type and max offset
-    const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields, const Value* sz);
-
-    /// Handle direct call
-    void handleDirectCall(CallSite cs, const SVFFunction *F);
-
-    /// Handle indirect call
-    void handleIndCall(CallSite cs);
-
     /// Update SVFIR given a call graph (creating new CallPE and RetPE for resolved indirect calls)
     void updateCallGraph(PTACallGraph* callgraph);
 
-    /// Handle external call
-    //@{
-    virtual void handleExtCall(CallSite cs, const SVFFunction *F);
-    void addComplexConsForExt(Value *D, Value *S, const Value* sz);
-    //@}
 
     /// Our visit overrides.
     //@{
@@ -238,6 +206,39 @@ public:
     }
     //}@
 
+protected:
+    /// Handle globals including (global variable and functions)
+    //@{
+    void visitGlobal(SVFModule* svfModule);
+    void InitialGlobal(const GlobalVariable *gvar, Constant *C,
+                       u32_t offset);
+    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset);
+    //@}
+
+    /// Process constant expression
+    void processCE(const Value *val);
+
+    /// Infer field index from byteoffset.
+    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
+
+    /// Compute offset of a gep instruction or gep constant expression
+    bool computeGepOffset(const User *V, LocationSet& ls);
+
+    /// Get the base type and max offset
+    const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields, const Value* sz);
+
+    /// Handle direct call
+    void handleDirectCall(CallSite cs, const SVFFunction *F);
+
+    /// Handle indirect call
+    void handleIndCall(CallSite cs);
+
+    /// Handle external call
+    //@{
+    virtual void handleExtCall(CallSite cs, const SVFFunction *F);
+    void addComplexConsForExt(Value *D, Value *S, const Value* sz);
+    //@}
+
     /// Set current basic block in order to keep track of control flow information
     inline void setCurrentLocation(const Value* val, const BasicBlock* bb)
     {
@@ -275,9 +276,7 @@ public:
         return nullPtr;
     }
 
-public:
-
-    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx);
+    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType);
 
     void setCurrentBBAndValueForPAGEdge(PAGEdge* edge);
 

package/SVF-linux/include/SVF-FE/SymbolTableBuilder.h

@@ -69,7 +69,7 @@ public:
     /// Handle constant expression
     // @{
     void handleGlobalCE(const GlobalVariable *G);
-    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
+    void handleGlobalInitializerCE(const Constant *C);
     void handleCE(const Value *val);
     // @}
 

package/SVF-linux/include/Util/Options.h

@@ -211,6 +211,7 @@ public:
     // SymbolTableInfo.cpp
     static const llvm::cl::opt<bool> LocMemModel;
     static const llvm::cl::opt<bool> ModelConsts;
+    static const llvm::cl::opt<bool> ModelArrays;
     static const llvm::cl::opt<bool> SymTabPrint;
 
     // Conditions.cpp

package/package.json

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