[TSAR, Memory] Minor fixes after rebase onto master

Author: yukatan1701

lib/Analysis/Memory/DefinedMemory.cpp

@@ -310,8 +310,7 @@ std::pair<MemoryLocationRange, bool> aggregate(
   int64_t Offset;
   auto *BasePtr = GetPointerBaseWithConstantOffset(
       Loc.Ptr, Offset, Fwk->getDataLayout());
-  auto *GV{dyn_cast<GlobalValue>(GetUnderlyingObject(Loc.Ptr,
-      Fwk->getDataLayout(), 0))};
+  auto *GV{dyn_cast<GlobalValue>(getUnderlyingObject(Loc.Ptr, 0))};
   if (Fwk->getDataLayout().getTypeStoreSize(ElemType).isScalable() ||
       LocInfo.second->Subscripts.size() != ArrayPtr->getNumberOfDims() ||
       !Loc.LowerBound.hasValue() || !Loc.UpperBound.hasValue() ||
@@ -1145,11 +1144,10 @@ void ReachDFFwk::collapse(DFRegion *R) {
                                          const LocationSet &LS) -> bool {
     bool AreAllCollapsedOrAuxiliary = true;
     bool HasCollapsed = false;
-    auto *GV{dyn_cast<GlobalValue>(
-        GetUnderlyingObject(Loc.Ptr, getDataLayout(), 0))};
+    auto *GV{dyn_cast<GlobalValue>(getUnderlyingObject(Loc.Ptr, 0))};
     for (auto &OtherLoc : LS) {
       auto *OtherGV{dyn_cast<GlobalValue>(
-        GetUnderlyingObject(OtherLoc.Ptr, getDataLayout(), 0))};
+          getUnderlyingObject(OtherLoc.Ptr, 0))};
       if (GV == OtherGV) {
         if ((OtherLoc.Kind & MemoryLocationRange::LocKind::Collapsed) &&
             !(OtherLoc.Kind & MemoryLocationRange::LocKind::Auxiliary))
@@ -1215,7 +1213,7 @@ void ReachDFFwk::collapse(DFRegion *R) {
     for (auto &Loc : NewUses) {
       // Check if the location is strictly default, not collapsable.
       auto *GV{dyn_cast<GlobalValue>(
-          GetUnderlyingObject(Loc.Ptr, getDataLayout(), 0))};
+          getUnderlyingObject(Loc.Ptr, 0))};
       bool SkipExcessUse = false;
       LLVM_DEBUG(
         dbgs() << "Check location: ";
@@ -1231,7 +1229,7 @@ void ReachDFFwk::collapse(DFRegion *R) {
         bool AreAllCollapsed = true;
         for (auto &OtherLoc : NewUses) {
           auto *OtherGV{dyn_cast<GlobalValue>(
-            GetUnderlyingObject(OtherLoc.Ptr, getDataLayout(), 0))};
+            getUnderlyingObject(OtherLoc.Ptr, 0))};
           if (GV == OtherGV) {
             SameUnderlyingObjCount++;
             if (Loc.Ptr != OtherLoc.Ptr) {
@@ -1248,7 +1246,7 @@ void ReachDFFwk::collapse(DFRegion *R) {
         auto MaySkipNonCollapsable = true;
         for (auto &OtherLoc : NewUses) {
           auto *OtherGV{dyn_cast<GlobalValue>(
-            GetUnderlyingObject(OtherLoc.Ptr, getDataLayout(), 0))};
+            getUnderlyingObject(OtherLoc.Ptr, 0))};
           if (GV == OtherGV) {
             if (!(OtherLoc.Kind & MemoryLocationRange::LocKind::Auxiliary) &&
                 !(OtherLoc.Kind & MemoryLocationRange::LocKind::Collapsed) &&

lib/Transform/IR/RedundantEdgeElimination.cpp

@@ -25,6 +25,7 @@
 
 #include "tsar/Transform/IR/Passes.h"
 #include <bcl/utility.h>
+#include <llvm/IR/Constants.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/Pass.h>
 #include <llvm/Support/Debug.h>

lib/Unparse/Utils.cpp

@@ -99,7 +99,7 @@ void printLocationSource(llvm::raw_ostream &O, const MemoryLocationRange &Loc,
     O << " (" << Loc.getKindAsString() << ") ";
     O << " [" << Loc.Ptr << "]";
     if (DL)
-      O << " [Underlying: " << GetUnderlyingObject(Loc.Ptr, *DL, 0) << "]";
+      O << " [Underlying: " << getUnderlyingObject(Loc.Ptr,  0) << "]";
   }
 }
 void printLocationSource(llvm::raw_ostream &O, const EstimateMemory &EM,