svf-lib 1.0.1734 → 1.0.1736

package/SVF-linux/svf/include/MemoryModel/AccessPath.h

@@ -65,12 +65,13 @@ public:
     typedef std::vector<IdxOperandPair> IdxOperandPairs;
 
     /// Constructor
-    AccessPath(APOffset o = 0) : fldIdx(o) {}
+    AccessPath(APOffset o = 0, const SVFType* srcTy = nullptr) : fldIdx(o), gepSourceElementType(srcTy) {}
 
     /// Copy Constructor
     AccessPath(const AccessPath& ap)
         : fldIdx(ap.fldIdx),
-          idxOperandPairs(ap.getIdxOperandPairVec())
+          idxOperandPairs(ap.getIdxOperandPairVec()),
+          gepSourceElementType(ap.getGepSourceElementType())
     {
     }
 
@@ -84,12 +85,13 @@ public:
     {
         fldIdx = rhs.fldIdx;
         idxOperandPairs = rhs.getIdxOperandPairVec();
+        gepSourceElementType = rhs.gepSourceElementType;
         return *this;
     }
     inline bool operator==(const AccessPath& rhs) const
     {
         return this->fldIdx == rhs.fldIdx &&
-               this->idxOperandPairs == rhs.idxOperandPairs;
+               this->idxOperandPairs == rhs.idxOperandPairs && this->gepSourceElementType == rhs.gepSourceElementType;
     }
     //@}
 
@@ -107,6 +109,10 @@ public:
     {
         return idxOperandPairs;
     }
+    inline const SVFType* getGepSourceElementType() const
+    {
+        return gepSourceElementType;
+    }
     //@}
 
     /**
@@ -167,6 +173,9 @@ private:
 
     APOffset fldIdx;	///< Accumulated Constant Offsets
     IdxOperandPairs idxOperandPairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>
+    const SVFType* gepSourceElementType;   /// source element type in gep instruction,
+    /// e.g., %f1 = getelementptr inbounds %struct.MyStruct, %struct.MyStruct* %arrayidx, i32 0, i32 0
+    /// the source element type is %struct.MyStruct
 };
 
 } // End namespace SVF

package/SVF-osx/svf/include/Graphs/ConsGEdge.h

@@ -303,7 +303,7 @@ public:
     /// Get location set of the gep edge
     inline APOffset getConstantFieldIdx() const
     {
-        return ap.getConstantFieldIdx();
+        return ap.getConstantStructFldIdx();
     }
 
 };

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

@@ -91,7 +91,7 @@ public:
 
     /// Get methods
     //@{
-    inline APOffset getConstantFieldIdx() const
+    inline APOffset getConstantStructFldIdx() const
     {
         return fldIdx;
     }
@@ -172,7 +172,7 @@ template <> struct std::hash<SVF::AccessPath>
     {
         SVF::Hash<std::pair<SVF::NodeID, SVF::NodeID>> h;
         std::hash<SVF::AccessPath::IdxOperandPairs> v;
-        return h(std::make_pair(ap.getConstantFieldIdx(),
+        return h(std::make_pair(ap.getConstantStructFldIdx(),
                                 v(ap.getIdxOperandPairVec())));
     }
 };

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

@@ -516,10 +516,10 @@ public:
         return getAccessPath().computeConstantOffset();
     }
     /// Field index of the gep statement if it access the field of a struct
-    inline APOffset getConstantFieldIdx() const
+    inline APOffset getConstantStructFldIdx() const
     {
         assert(isVariantFieldGep()==false && "Can't retrieve the AccessPath if using a variable field index (pointer arithmetic) for struct field access ");
-        return getAccessPath().getConstantFieldIdx();
+        return getAccessPath().getConstantStructFldIdx();
     }
     /// Gep statement with a variant field index (pointer arithmetic) for struct field access
     inline bool isVariantFieldGep() const

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

@@ -416,7 +416,7 @@ public:
     /// offset of the base value variable
     inline APOffset getConstantFieldIdx() const
     {
-        return ap.getConstantFieldIdx();
+        return ap.getConstantStructFldIdx();
     }
 
     /// Return name of a LLVM value

package/package.json

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