svf-tools 1.0.378 → 1.0.382

package/SVF-doxygen/html/html/structstd_1_1hash_3_01SVF_1_1LocationSet_01_4.html

@@ -82,7 +82,7 @@ Public Member Functions</h2></td></tr>
 struct std::hash&lt; SVF::LocationSet &gt;</h3>
 
 
-<p class="definition">Definition at line <a class="el" href="LocationSet_8h_source.html#l00162">162</a> of file <a class="el" href="LocationSet_8h_source.html">LocationSet.h</a>.</p>
+<p class="definition">Definition at line <a class="el" href="LocationSet_8h_source.html#l00138">138</a> of file <a class="el" href="LocationSet_8h_source.html">LocationSet.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a id="a701401db0e876205424e9cc797fb5984"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a701401db0e876205424e9cc797fb5984">&#9670;&nbsp;</a></span>operator()()</h2>
@@ -108,10 +108,10 @@ struct std::hash&lt; SVF::LocationSet &gt;</h3>
 </table>
 </div><div class="memdoc">
 
-<p class="definition">Definition at line <a class="el" href="LocationSet_8h_source.html#l00163">163</a> of file <a class="el" href="LocationSet_8h_source.html">LocationSet.h</a>.</p>
-<div class="fragment"><div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;                                                      {</div><div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;        <a class="code" href="structSVF_1_1Hash.html">SVF::Hash&lt;std::pair&lt;SVF::NodeID, SVF::NodeID&gt;</a>&gt; h;</div><div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;        std::hash&lt;SVF::LocationSet::OffsetValueVec&gt; v;</div><div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;        <span class="keywordflow">return</span> h(std::make_pair(ls.<a class="code" href="classSVF_1_1LocationSet.html#ab987c41ffdae931d941f89d03ed09146">accumulateConstantFieldIdx</a>(), v(ls.<a class="code" href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">getOffsetValueVec</a>())));</div><div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    }</div><div class="ttc" id="classSVF_1_1LocationSet_html_ab987c41ffdae931d941f89d03ed09146"><div class="ttname"><a href="classSVF_1_1LocationSet.html#ab987c41ffdae931d941f89d03ed09146">SVF::LocationSet::accumulateConstantFieldIdx</a></div><div class="ttdeci">s64_t accumulateConstantFieldIdx() const</div><div class="ttdoc">Get methods. </div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00114">LocationSet.h:114</a></div></div>
+<p class="definition">Definition at line <a class="el" href="LocationSet_8h_source.html#l00139">139</a> of file <a class="el" href="LocationSet_8h_source.html">LocationSet.h</a>.</p>
+<div class="fragment"><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;                                                      {</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;        <a class="code" href="structSVF_1_1Hash.html">SVF::Hash&lt;std::pair&lt;SVF::NodeID, SVF::NodeID&gt;</a>&gt; h;</div><div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;        std::hash&lt;SVF::LocationSet::OffsetValueVec&gt; v;</div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keywordflow">return</span> h(std::make_pair(ls.<a class="code" href="classSVF_1_1LocationSet.html#ab987c41ffdae931d941f89d03ed09146">accumulateConstantFieldIdx</a>(), v(ls.<a class="code" href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">getOffsetValueVec</a>())));</div><div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    }</div><div class="ttc" id="classSVF_1_1LocationSet_html_ab987c41ffdae931d941f89d03ed09146"><div class="ttname"><a href="classSVF_1_1LocationSet.html#ab987c41ffdae931d941f89d03ed09146">SVF::LocationSet::accumulateConstantFieldIdx</a></div><div class="ttdeci">s64_t accumulateConstantFieldIdx() const</div><div class="ttdoc">Get methods. </div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00090">LocationSet.h:90</a></div></div>
 <div class="ttc" id="structSVF_1_1Hash_html"><div class="ttname"><a href="structSVF_1_1Hash.html">SVF::Hash</a></div><div class="ttdoc">provide extra hash function for std::pair handling </div><div class="ttdef"><b>Definition:</b> <a href="SVFBasicTypes_8h_source.html#l00052">SVFBasicTypes.h:52</a></div></div>
-<div class="ttc" id="classSVF_1_1LocationSet_html_a5a5ca0b81da0b34ab426bc6a28ed346c"><div class="ttname"><a href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">SVF::LocationSet::getOffsetValueVec</a></div><div class="ttdeci">const OffsetValueVec &amp; getOffsetValueVec() const</div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00122">LocationSet.h:122</a></div></div>
+<div class="ttc" id="classSVF_1_1LocationSet_html_a5a5ca0b81da0b34ab426bc6a28ed346c"><div class="ttname"><a href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">SVF::LocationSet::getOffsetValueVec</a></div><div class="ttdeci">const OffsetValueVec &amp; getOffsetValueVec() const</div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00098">LocationSet.h:98</a></div></div>
 </div><!-- fragment -->
 </div>
 </div>

package/include/MemoryModel/LocationSet.h

@@ -39,30 +39,6 @@
 namespace SVF
 {
 
-/*!
- * Field information of an aggregate object
- */
-class FlattenedFieldInfo
-{
-private:
-    u32_t flattenedFldIdx;
-    const Type* flattenedElemTy;
-public:
-    FlattenedFieldInfo(u32_t idx, const Type* ty) :
-        flattenedFldIdx(idx), flattenedElemTy(ty)
-    {
-    }
-    inline u32_t getFlattenFldIdx() const
-    {
-        return flattenedFldIdx;
-    }
-    inline const Type* getFlattenElemTy() const
-    {
-        return flattenedElemTy;
-    }
-};
-
-
 /*
  * 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 }

package/include/MemoryModel/SVFIR.h

@@ -329,7 +329,7 @@ public:
     }
     inline SVFStmt* getIntraPAGEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind)
     {
-        SVFStmt edge(src,dst,kind);
+        SVFStmt edge(src,dst,kind, false);
         const SVFStmt::SVFStmtSetTy& edgeSet = getSVFStmtSet(kind);
         SVFStmt::SVFStmtSetTy::const_iterator it = edgeSet.find(&edge);
         assert(it != edgeSet.end() && "can not find pag edge");

package/include/MemoryModel/SVFStatements.h

@@ -65,7 +65,7 @@ public:
     static u32_t totalEdgeNum;		///< Total edge number
 
     /// Constructor
-    SVFStmt(SVFVar* s, SVFVar* d, GEdgeFlag k);
+    SVFStmt(SVFVar* s, SVFVar* d, GEdgeFlag k, bool real=true);
     /// Destructor
     ~SVFStmt()
     {

package/include/MemoryModel/SVFVariables.h

@@ -503,7 +503,7 @@ public:
     /// Return the type of this gep object
     inline virtual const Type* getType() const
     {
-        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantFieldIdx());
+        return SymbolTableInfo::SymbolInfo()->getFlatternedElemType(mem->getType(), ls.accumulateConstantFieldIdx());
     }
 
     /// Return name of a LLVM value

package/include/MemoryModel/SymbolTableInfo.h

@@ -358,13 +358,12 @@ public:
     /// Flatterned element idx of an array or struct by considering stride
     u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
 
-    const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
-
     ///  struct A { int id; int salary; }; struct B { char name[20]; struct A a;}   B b;
-    ///  OriginalFieldType of b with field_idx 1 : Struct A
-    ///  FlatternedFieldType of b with field_idx 1 : int
-    const Type* getOriginalFieldType(const Type* baseType, u32_t field_idx);
-    const Type* getFlatternedFieldType(const Type* baseType, u32_t field_idx);
+    ///  OriginalElemType of b with field_idx 1 : Struct A
+    ///  FlatternedElemType of b with field_idx 1 : int
+    const Type* getOriginalElemType(const Type* baseType, u32_t origId);
+    /// Return the type of a flattened element given a flattened index
+    const Type* getFlatternedElemType(const Type* baseType, u32_t flatten_idx);
     //@}
 
     /// Collect type info
@@ -381,6 +380,9 @@ public:
     virtual void dump();
 
 protected:
+    /// Return the flattened field type for struct type only
+    const std::vector<const Type*>& getFlattenFieldTypes(const StructType *T);
+
     /// Collect the struct info
     virtual void collectStructInfo(const StructType *T);
     /// Collect the array info
@@ -507,13 +509,15 @@ private:
     /// Types of all fields of a struct
     Map<u32_t, const Type*> fldIdx2TypeMap;
     /// All field infos after flattening a struct
-    std::vector<FlattenedFieldInfo> finfo;
+    std::vector<const Type*> finfo;
     /// stride represents the number of repetitive elements if this StInfo represent an ArrayType. stride is 1 by default.
     u32_t stride; 
     /// number of elements after flattenning (including array elements)
     u32_t numOfFlattenElements; 
     /// number of fields after flattenning (ignoring array elements)
     u32_t numOfFlattenFields; 
+    /// Type vector of fields
+    std::vector<const Type*> flattenElementTypes;
     /// Max field limit
     static u32_t maxFieldLimit;
 
@@ -545,8 +549,7 @@ public:
     ///  OriginalFieldType of b with field_idx 1 : Struct A
     ///  FlatternedFieldType of b with field_idx 1 : int
     //{@
-    const Type* getOriginalFieldType(u32_t fldIdx);
-    const Type* getFlatternedFieldType(u32_t fldIdx);
+    const Type* getOriginalElemType(u32_t fldIdx);
 
     inline std::vector<u32_t>& getFlattenedFieldIdxVec()
     {
@@ -556,7 +559,11 @@ public:
     {
         return elemIdxVec;
     }
-    inline std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec()
+    inline std::vector<const Type*>& getFlattenElementTypes()
+    {
+        return flattenElementTypes;
+    }
+    inline std::vector<const Type*>& getFlattenFieldTypes()
     {
         return finfo;
     }

package/include/SVF-FE/SVFIRBuilder.h

@@ -205,16 +205,14 @@ public:
         // TODO: ignore here:
     }
     //}@
-    /// Compute offset of a gep instruction or gep constant expression
-    bool computeGepOffset(const User *V, LocationSet& ls);
-    
+
 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);
+    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset, Type* tpy);
     //@}
 
     /// Process constant expression
@@ -223,6 +221,12 @@ protected:
     /// 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 value of (i8* src and i8* dst) for external argument (e.g. memcpy(i8* dst, i8* src, int size))
+    const Value* getBaseValueForExtArg(const Value* V);
+
     /// Get the base type and max offset
     const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields, const Value* sz);
 

package/lib/Graphs/IRGraph.cpp

@@ -58,7 +58,7 @@ bool IRGraph::addEdge(SVFVar* src, SVFVar* dst, SVFStmt* edge)
  */
 SVFStmt* IRGraph::hasNonlabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind)
 {
-    SVFStmt edge(src,dst,kind);
+    SVFStmt edge(src,dst,kind, false);
     SVFStmt::SVFStmtSetTy::iterator it = KindToSVFStmtSetMap[kind].find(&edge);
     if (it != KindToSVFStmtSetMap[kind].end())
     {
@@ -72,7 +72,7 @@ SVFStmt* IRGraph::hasNonlabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK ki
  */
 SVFStmt* IRGraph::hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind, const SVFVar* op2)
 {
-    SVFStmt edge(src,op1,SVFStmt::makeEdgeFlagWithAddionalOpnd(kind,op2));
+    SVFStmt edge(src,op1,SVFStmt::makeEdgeFlagWithAddionalOpnd(kind,op2), false);
     SVFStmt::SVFStmtSetTy::iterator it = KindToSVFStmtSetMap[kind].find(&edge);
     if (it != KindToSVFStmtSetMap[kind].end())
     {
@@ -86,7 +86,7 @@ SVFStmt* IRGraph::hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind,
  */
 SVFStmt* IRGraph::hasLabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind, const ICFGNode* callInst)
 {
-    SVFStmt edge(src,dst,SVFStmt::makeEdgeFlagWithCallInst(kind,callInst));
+    SVFStmt edge(src,dst,SVFStmt::makeEdgeFlagWithCallInst(kind,callInst), false);
     SVFStmt::SVFStmtSetTy::iterator it = KindToSVFStmtSetMap[kind].find(&edge);
     if (it != KindToSVFStmtSetMap[kind].end())
     {

package/lib/MemoryModel/SVFStatements.cpp

@@ -43,11 +43,13 @@ SVFStmt::Var2LabelMap SVFStmt::var2LabelMap;
 /*!
  * SVFStmt constructor
  */
-SVFStmt::SVFStmt(SVFVar* s, SVFVar* d, GEdgeFlag k) :
-    GenericPAGEdgeTy(s,d,k),value(nullptr),basicBlock(nullptr),icfgNode(nullptr)
-{
-    edgeId = SVFIR::getPAG()->getTotalEdgeNum();
-    SVFIR::getPAG()->incEdgeNum();
+SVFStmt::SVFStmt(SVFVar* s, SVFVar* d, GEdgeFlag k, bool real) :
+    GenericPAGEdgeTy(s,d,k),value(nullptr),basicBlock(nullptr),icfgNode(nullptr),edgeId(UINT_MAX)
+{   
+    if(real){
+        edgeId = SVFIR::getPAG()->getTotalEdgeNum();
+        SVFIR::getPAG()->incEdgeNum();
+    }
 }
 
 /*!

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -67,21 +67,13 @@ void StInfo::addFldWithType(u32_t fldIdx, const Type* type, u32_t elemIdx)
 ///  OriginalFieldType of b with field_idx 1 : Struct A
 ///  FlatternedFieldType of b with field_idx 1 : int
 //{@
-const Type* StInfo::getOriginalFieldType(u32_t fldIdx)
+const Type* StInfo::getOriginalElemType(u32_t fldIdx)
 {
     Map<u32_t, const Type*>::const_iterator it = fldIdx2TypeMap.find(fldIdx);
     if(it!=fldIdx2TypeMap.end())
         return it->second;
     return nullptr;
 }
-const Type* StInfo::getFlatternedFieldType(u32_t fldIdx)
-{
-    for(FlattenedFieldInfo& fallenedFld : finfo){
-        if(fallenedFld.getFlattenFldIdx() == fldIdx)
-            return fallenedFld.getFlattenElemTy();
-    }
-    return nullptr;
-}
 
 SymbolTableInfo::TypeToFieldInfoMap::iterator SymbolTableInfo::getStructInfoIter(const Type *T)
 {
@@ -158,8 +150,8 @@ void SymbolTableInfo::collectArrayInfo(const ArrayType* ty)
     if(totalElemNum==0){
         stinfo->addFldWithType(0, elemTy, 0);
         stinfo->setNumOfFieldsAndElems(1, 1);
-        FlattenedFieldInfo field(0, elemTy);
-        stinfo->getFlattenedFieldInfoVec().push_back(field);
+        stinfo->getFlattenFieldTypes().push_back(elemTy);
+        stinfo->getFlattenElementTypes().push_back(elemTy);
         return;
     }
 
@@ -169,10 +161,8 @@ void SymbolTableInfo::collectArrayInfo(const ArrayType* ty)
     u32_t nfE = elemStInfo->getNumOfFlattenFields();
     for (u32_t j = 0; j < nfE; j++)
     {
-        u32_t idx = elemStInfo->getFlattenedFieldInfoVec()[j].getFlattenFldIdx();
-        const Type* fieldTy = elemStInfo->getFlattenedFieldInfoVec()[j].getFlattenElemTy();
-        FlattenedFieldInfo field(idx, fieldTy);
-        stinfo->getFlattenedFieldInfoVec().push_back(field);
+        const Type* fieldTy = elemStInfo->getFlattenFieldTypes()[j];
+        stinfo->getFlattenFieldTypes().push_back(fieldTy);
     }
 
     /// Flatten arrays, map each array element index `i` to flattened index `(i * nfE * totalElemNum)/outArrayElemNum`
@@ -181,6 +171,13 @@ void SymbolTableInfo::collectArrayInfo(const ArrayType* ty)
     for(u32_t i = 0; i < outArrayElemNum; i++)
         stinfo->addFldWithType(0, elemTy, (i * nfE * totalElemNum)/outArrayElemNum);
 
+    for(u32_t i = 0; i < totalElemNum; i++){
+        for(u32_t j = 0; j < nfE; j++){
+            stinfo->getFlattenElementTypes().push_back(elemStInfo->getFlattenFieldTypes()[j]);
+        }
+    }
+
+    assert(stinfo->getFlattenElementTypes().size() == nfE * totalElemNum && "typeForArray size incorrect!!!");
     stinfo->setNumOfFieldsAndElems(nfE, nfE * totalElemNum);
 }
 
@@ -213,23 +210,27 @@ void SymbolTableInfo::collectStructInfo(const StructType *sty)
             //Copy ST's info, whose element 0 is the size of ST itself.
             for (u32_t j = 0; j < nfE; j++)
             {
-                u32_t fldIdx = nf + subStinfo->getFlattenedFieldInfoVec()[j].getFlattenFldIdx();
-                const Type* elemTy = subStinfo->getFlattenedFieldInfoVec()[j].getFlattenElemTy();
-                FlattenedFieldInfo field(fldIdx, elemTy);
-                stinfo->getFlattenedFieldInfoVec().push_back(field);
+                const Type* elemTy = subStinfo->getFlattenFieldTypes()[j];
+                stinfo->getFlattenFieldTypes().push_back(elemTy);
             }
             nf += nfE;
             strideOffset += nfE * subStinfo->getStride();
+            for(u32_t tpi = 0; tpi < subStinfo->getStride(); tpi++){
+                for(u32_t tpj = 0; tpj < nfE; tpj++){
+                    stinfo->getFlattenElementTypes().push_back(subStinfo->getFlattenFieldTypes()[tpj]);
+                }
+            }
         }
         else     //simple type
         {
-            FlattenedFieldInfo field(nf, et);
-            stinfo->getFlattenedFieldInfoVec().push_back(field);
             nf += 1;
             strideOffset += 1;
+            stinfo->getFlattenFieldTypes().push_back(et);
+            stinfo->getFlattenElementTypes().push_back(et);
         }
     }
 
+    assert(stinfo->getFlattenElementTypes().size() == strideOffset && "typeForStruct size incorrect!");
     stinfo->setNumOfFieldsAndElems(nf,strideOffset);
 
     //Record the size of the complete struct and update max_struct.
@@ -252,9 +253,8 @@ void SymbolTableInfo::collectSimpleTypeInfo(const Type* ty)
     /// Only one field
     stinfo->addFldWithType(0, ty, 0);
 
-    FlattenedFieldInfo field(0, ty);
-    stinfo->getFlattenedFieldInfoVec().push_back(field);
-
+    stinfo->getFlattenFieldTypes().push_back(ty);
+    stinfo->getFlattenElementTypes().push_back(ty);
     stinfo->setNumOfFieldsAndElems(1,1);
 }
 
@@ -353,11 +353,10 @@ bool SymbolTableInfo::isConstantObjSym(const Value *val)
         else
         {
             StInfo *stInfo = getStructInfo(v->getInitializer()->getType());
-            const std::vector<FlattenedFieldInfo> &fields = stInfo->getFlattenedFieldInfoVec();
-            for (std::vector<FlattenedFieldInfo>::const_iterator it = fields.begin(), eit = fields.end(); it != eit; ++it)
+            const std::vector<const Type*> &fields = stInfo->getFlattenFieldTypes();
+            for (std::vector<const Type*>::const_iterator it = fields.begin(), eit = fields.end(); it != eit; ++it)
             {
-                const FlattenedFieldInfo &field = *it;
-                const Type *elemTy = field.getFlattenElemTy();
+                const Type *elemTy = *it;
                 assert(!SVFUtil::isa<FunctionType>(elemTy) && "Initializer of a global is a function?");
                 if (SVFUtil::isa<PointerType>(elemTy))
                     return false;
@@ -410,7 +409,7 @@ u32_t SymbolTableInfo::getFlattenedElemIdx(const Type *T, s64_t origId)
 {
     if(Options::ModelArrays){
         std::vector<u32_t>& so = getStructInfoIter(T)->second->getFlattenedElemIdxVec();
-        assert ((unsigned)origId <= so.size() && !so.empty() && "Array index out of bounds, can't get flattened index!");
+        assert ((unsigned)origId <= so.size() && !so.empty() && "element index out of bounds, can't get flattened index!");
         return so[origId];
     }
     else{
@@ -427,18 +426,29 @@ u32_t SymbolTableInfo::getFlattenedElemIdx(const Type *T, s64_t origId)
     }
 }
 
-const std::vector<FlattenedFieldInfo>& SymbolTableInfo::getFlattenedFieldInfoVec(const Type *T)
+const Type* SymbolTableInfo::getOriginalElemType(const Type* baseType, u32_t origId)
 {
-    return getStructInfoIter(T)->second->getFlattenedFieldInfoVec();
+    return getStructInfoIter(baseType)->second->getOriginalElemType(origId);
 }
 
-const Type* SymbolTableInfo::getOriginalFieldType(const Type* baseType, u32_t field_idx)
-{
-    return getStructInfoIter(baseType)->second->getOriginalFieldType(field_idx);
+/// Return the type of a flattened element given a flattened index
+const Type* SymbolTableInfo::getFlatternedElemType(const Type* baseType, u32_t flatten_idx){
+    if(Options::ModelArrays){
+        const std::vector<const Type*>& so = getStructInfoIter(baseType)->second->getFlattenElementTypes();
+        assert (flatten_idx <= so.size() && !so.empty() && "element index out of bounds, can't get element type!");
+        return so[flatten_idx];
+    }
+    else{
+        const std::vector<const Type*>& so = getStructInfoIter(baseType)->second->getFlattenFieldTypes();
+        assert (flatten_idx <= so.size() && !so.empty() && "element index out of bounds, can't get element type!");
+        return so[flatten_idx];
+    }
 }
 
-const Type* SymbolTableInfo::getFlatternedFieldType(const Type* baseType, u32_t field_idx){
-        return getStructInfoIter(baseType)->second->getFlatternedFieldType(field_idx);
+
+const std::vector<const Type*>& SymbolTableInfo::getFlattenFieldTypes(const StructType *T)
+{
+    return getStructInfoIter(T)->second->getFlattenFieldTypes();
 }
 
 /*
@@ -462,15 +472,15 @@ void SymbolTableInfo::printFlattenFields(const Type* type)
         outs() <<"  {Type: ";
         st->print(outs());
         outs() << "}\n";
-        std::vector<FlattenedFieldInfo>& finfo = getStructInfo(st)->getFlattenedFieldInfoVec();
+        std::vector<const Type*>& finfo = getStructInfo(st)->getFlattenFieldTypes();
         int field_idx = 0;
-        for(std::vector<FlattenedFieldInfo>::iterator it = finfo.begin(), eit = finfo.end();
+        for(std::vector<const Type*>::const_iterator it = finfo.begin(), eit = finfo.end();
                 it!=eit; ++it, field_idx++)
         {
-            outs() << " \tField_idx = " << (*it).getFlattenFldIdx();
+            outs() << " \tField_idx = " << field_idx;
             outs() << ", field type: ";
-            (*it).getFlattenElemTy()->print(outs());
-            outs() << ", field size: " << getTypeSizeInBytes((*it).getFlattenElemTy());
+            (*it)->print(outs());
+            outs() << ", field size: " << getTypeSizeInBytes((*it));
             outs() << "\n";
         }
         outs() << "\n";
@@ -625,22 +635,11 @@ bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
 
     if (SVFUtil::isa<StructType>(ety) || SVFUtil::isa<ArrayType>(ety))
     {
-        bool hasIntersection = false;
-        const vector<FlattenedFieldInfo> &infovec = SymbolTableInfo::SymbolInfo()->getFlattenedFieldInfoVec(ety);
-        vector<FlattenedFieldInfo>::const_iterator it = infovec.begin();
-        vector<FlattenedFieldInfo>::const_iterator eit = infovec.end();
-        for (; it != eit; ++it)
-        {
-            const FlattenedFieldInfo& fieldLS = *it;
-            if (ls.intersects(LocationSet(fieldLS.getFlattenFldIdx())))
-            {
-                hasIntersection = true;
-                if (fieldLS.getFlattenElemTy()->isPointerTy())
-                    return false;
-            }
-        }
-        //assert(hasIntersection && "cannot find field of specified offset");
-        return true;
+        const Type* elemTy = SymbolTableInfo::SymbolInfo()->getFlatternedElemType(ety, ls.accumulateConstantFieldIdx());
+        if(elemTy->isPointerTy())
+            return false;
+        else
+            return true;
     }
     else
     {