Add a reset function for memlocation

Swift SVN r32780
ryansun · Oct 20, 2015 · fe3929a · fe3929a
1 parent 6fe4314
commit fe3929a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/include/swift/SIL/MemLocation.h b/include/swift/SIL/MemLocation.h
@@ -155,6 +155,13 @@ class MemLocation {
   /// construct the projection path to the field accessed.
   void initialize(SILValue val);
 
+  /// Reset the memory location, i.e. clear base and path. 
+  void reset() {
+    Base = SILValue();
+    Path.reset();
+    Kind = NormalKey;
+  }
+
   /// Get the first level locations based on this location's first level
   /// projection.
   void getFirstLevelMemLocations(MemLocationList &Locs, SILModule *Mod);

diff --git a/lib/SILPasses/UtilityPasses/MemLocationPrinter.cpp b/lib/SILPasses/UtilityPasses/MemLocationPrinter.cpp
@@ -60,11 +60,11 @@ class MemLocationPrinter : public SILFunctionTransform {
   /// This tests the expand function in MemLocation class.
   ///
   void printMemExpansion(SILFunction &Fn) {
+    MemLocation L;
     MemLocationList Locs;
     unsigned Counter = 0;
     for (auto &BB : Fn) {
       for (auto &II : BB) {
-        MemLocation L;
         if (auto *LI = dyn_cast<LoadInst>(&II)) {
           L.initialize(LI->getOperand());
           if (!L.isValid())
@@ -84,6 +84,7 @@ class MemLocationPrinter : public SILFunctionTransform {
         for (auto &Loc : Locs) {
           llvm::outs() << Loc;
         }
+        L.reset();
         Locs.clear();
       }
     }