improve isNonPtrFieldObj for pointer analysis

Author: yuleisui

lib/MemoryModel/SVFIR.cpp

@@ -696,15 +696,21 @@ bool SVFIR::isNonPointerObj(NodeID id) const
     SVFVar* node = getGNode(id);
     if (const FIObjVar* fiNode = SVFUtil::dyn_cast<FIObjVar>(node))
     {
-        return (fiNode->getMemObj()->isNonPtrFieldObj(0));
+        if(Options::FirstFieldEqBase)
+            return fiNode->getMemObj()->isNonPtrFieldObj(0);
+        else
+            return (fiNode->getMemObj()->hasPtrObj()==false);
     }
     else if (const GepObjVar* gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
     {
         return (gepNode->getMemObj()->isNonPtrFieldObj(gepNode->getLocationSet()));
     }
     else if (const DummyObjVar* dummyNode = SVFUtil::dyn_cast<DummyObjVar>(node))
     {
-        return (dummyNode->getMemObj()->hasPtrObj()==false);
+        if(Options::FirstFieldEqBase)
+            return dummyNode->getMemObj()->isNonPtrFieldObj(0);
+        else
+            return (dummyNode->getMemObj()->hasPtrObj()==false);
     }
     else
     {

lib/MemoryModel/SymbolTableInfo.cpp

@@ -614,8 +614,8 @@ u32_t SymbolTableInfo::getTypeSizeInBytes(const StructType *sty, u32_t field_idx
  */
 bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
 {
-    if (isHeap() || isStaticObj())
-        return false;
+    if (hasPtrObj() == false)
+        return true;
 
     const Type* ety = getType();
     while (const ArrayType *AT= SVFUtil::dyn_cast<ArrayType>(ety))
@@ -648,7 +648,6 @@ bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
     }
 }
 
-
 /*!
  * Set mem object to be field sensitive (up to maximum field limit)
  */