[TSAR, Memory] Remove DataLayout from printLocationSource()

Author: yukatan1701

include/tsar/Unparse/Utils.h

@@ -79,9 +79,7 @@ void printLocationSource(llvm::raw_ostream &O, const llvm::MemoryLocation &Loc,
 /// Print information available from a source code for the specified memory
 /// location and its size (<location, size>).
 void printLocationSource(llvm::raw_ostream &O, const MemoryLocationRange &Loc,
-    const llvm::DominatorTree *DT = nullptr, 
-    const llvm::DataLayout *DL = nullptr,
-    bool IsDebug = false);
+    const llvm::DominatorTree *DT = nullptr, bool IsDebug = false);
 
 /// Print information available from a source code for the specified memory
 /// location and its size (<location, size>).

lib/Analysis/Memory/DefinedMemory.cpp

@@ -586,8 +586,7 @@ std::pair<MemoryLocationRange, bool> aggregate(
       "Array location must be of the `collapsed` kind!");
   LLVM_DEBUG(
     dbgs() << "[AGGREGATE] Aggregated location: ";
-    printLocationSource(dbgs(), ResLoc, &Fwk->getDomTree(),
-                        &Fwk->getDataLayout(), true);
+    printLocationSource(dbgs(), ResLoc, &Fwk->getDomTree(), true);
     dbgs() << "\n";
   );
   ResLoc.Kind |= Loc.Kind & LocKind::Auxiliary;
@@ -730,16 +729,16 @@ void intializeDefUseSetLog(
   }
   dbgs() << "Outward exposed must define locations:\n";
   for (auto &Loc : DU.getDefs())
-    printLocationSource(dbgs(), Loc, &DT, &DL, true), dbgs() << "\n";
+    printLocationSource(dbgs(), Loc, &DT, true), dbgs() << "\n";
   dbgs() << "Outward exposed may define locations:\n";
   for (auto &Loc : DU.getMayDefs())
-    printLocationSource(dbgs(), Loc, &DT, &DL,true), dbgs() << "\n";
+    printLocationSource(dbgs(), Loc, &DT, true), dbgs() << "\n";
   dbgs() << "Outward exposed uses:\n";
   for (auto &Loc : DU.getUses())
-    printLocationSource(dbgs(), Loc, &DT, &DL,true), dbgs() << "\n";
+    printLocationSource(dbgs(), Loc, &DT, true), dbgs() << "\n";
   dbgs() << "Explicitly accessed locations:\n";
   for (auto &Loc : DU.getExplicitAccesses())
-    printLocationSource(dbgs(), Loc, &DT, &DL, true), dbgs() << "\n";
+    printLocationSource(dbgs(), Loc, &DT, true), dbgs() << "\n";
   for (auto *I : DU.getExplicitUnknowns())
     I->print(dbgs()), dbgs() << "\n";
   dbgs() << "[END DEFUSE]\n";

lib/Analysis/Memory/LiveMemory.cpp

@@ -155,12 +155,10 @@ bool DataFlowTraits<LiveDFFwk*>::transferFunction(
   }
   dbgs() << "IN:\n";
   for (auto &Loc : newIn)
-    (printLocationSource(dbgs(), Loc, DFF->getDomTree(), nullptr, true),
-     dbgs() << "\n");
+    (printLocationSource(dbgs(), Loc, DFF->getDomTree(), true), dbgs() << "\n");
   dbgs() << "OUT:\n";
   for (auto &Loc : LS->getOut())
-    (printLocationSource(dbgs(), Loc, DFF->getDomTree(), nullptr, true),
-     dbgs() << "\n");
+    (printLocationSource(dbgs(), Loc, DFF->getDomTree(), true), dbgs() << "\n");
   dbgs() << "[END LIVE]\n";
   );
   if (LS->getIn() != newIn) {

lib/Analysis/Memory/MemoryLocationRange.cpp

@@ -819,9 +819,9 @@ llvm::Optional<MemoryLocationRange> intersect(
   // exactly.
   LLVM_DEBUG(
     llvm::dbgs() << "[INTERSECT] Intersect locations:\n";
-    printLocationSource(llvm::dbgs() << "\t", LHS, nullptr, nullptr, true);
+    printLocationSource(llvm::dbgs() << "\t", LHS, nullptr, true);
     llvm::dbgs() << "\n";
-    printLocationSource(llvm::dbgs() << "\t", RHS, nullptr, nullptr, true);
+    printLocationSource(llvm::dbgs() << "\t", RHS, nullptr, true);
     llvm::dbgs() << "\n";
   );
   if (LHS.Ptr != RHS.Ptr)

lib/Unparse/Utils.cpp

@@ -62,7 +62,7 @@ void printLocationSource(llvm::raw_ostream &O, const llvm::MemoryLocation &Loc,
 }
 
 void printLocationSource(llvm::raw_ostream &O, const MemoryLocationRange &Loc,
-    const DominatorTree *DT, const llvm::DataLayout *DL, bool IsDebug) {
+    const DominatorTree *DT, bool IsDebug) {
   O << "<";
   printLocationSource(O, Loc.Ptr, DT);
   O << ", ";
@@ -98,8 +98,7 @@ void printLocationSource(llvm::raw_ostream &O, const MemoryLocationRange &Loc,
     }
     O << " (" << Loc.getKindAsString() << ") ";
     O << " [" << Loc.Ptr << "]";
-    if (DL)
-      O << " [Underlying: " << getUnderlyingObject(Loc.Ptr,  0) << "]";
+    O << " [Underlying: " << getUnderlyingObject(Loc.Ptr, 0) << "]";
   }
 }
 void printLocationSource(llvm::raw_ostream &O, const EstimateMemory &EM,