[Coroutines] Revised again with reviewer feedback.

Author: tnowicki

llvm/lib/Transforms/Coroutines/CoroShape.h

@@ -58,10 +58,6 @@ struct LLVM_LIBRARY_VISIBILITY Shape {
   SmallVector<CoroAwaitSuspendInst *, 4> CoroAwaitSuspends;
   SmallVector<CallInst *, 2> SymmetricTransfers;
 
-  // Values invalidated by invalidateCoroutine() and cleanCoroutine()
-  SmallVector<CoroFrameInst *, 8> CoroFrames;
-  SmallVector<CoroSaveInst *, 2> UnusedCoroSaves;
-
   // Values invalidated by replaceSwiftErrorOps()
   SmallVector<CallInst *, 2> SwiftErrorOps;
 
@@ -74,9 +70,6 @@ struct LLVM_LIBRARY_VISIBILITY Shape {
     CoroAwaitSuspends.clear();
     SymmetricTransfers.clear();
 
-    CoroFrames.clear();
-    UnusedCoroSaves.clear();
-
     SwiftErrorOps.clear();
 
     FrameTy = nullptr;
@@ -85,13 +78,16 @@ struct LLVM_LIBRARY_VISIBILITY Shape {
   }
 
   // Scan the function and collect the above intrinsics for later processing
-  void analyze(Function &F);
+  void analyze(Function &F, SmallVectorImpl<CoroFrameInst *> &CoroFrames,
+               SmallVectorImpl<CoroSaveInst *> &UnusedCoroSaves);
   // If for some reason, we were not able to find coro.begin, bailout.
-  void invalidateCoroutine(Function &F);
+  void invalidateCoroutine(Function &F,
+                           SmallVectorImpl<CoroFrameInst *> &CoroFrames);
   // Perform ABI related initial transformation
   void initABI();
   // Remove orphaned and unnecessary intrinsics
-  void cleanCoroutine();
+  void cleanCoroutine(SmallVectorImpl<CoroFrameInst *> &CoroFrames,
+                      SmallVectorImpl<CoroSaveInst *> &UnusedCoroSaves);
 
   // Field indexes for special fields in the switch lowering.
   struct SwitchFieldIndex {
@@ -271,13 +267,16 @@ struct LLVM_LIBRARY_VISIBILITY Shape {
   Shape() = default;
   explicit Shape(Function &F, bool OptimizeFrame = false)
       : OptimizeFrame(OptimizeFrame) {
-    analyze(F);
+    SmallVector<CoroFrameInst *, 8> CoroFrames;
+    SmallVector<CoroSaveInst *, 2> UnusedCoroSaves;
+
+    analyze(F, CoroFrames, UnusedCoroSaves);
     if (!CoroBegin) {
-      invalidateCoroutine(F);
+      invalidateCoroutine(F, CoroFrames);
       return;
     }
     initABI();
-    cleanCoroutine();
+    cleanCoroutine(CoroFrames, UnusedCoroSaves);
   }
 };
 

llvm/lib/Transforms/Coroutines/Coroutines.cpp

@@ -189,7 +189,9 @@ static CoroSaveInst *createCoroSave(CoroBeginInst *CoroBegin,
 }
 
 // Collect "interesting" coroutine intrinsics.
-void coro::Shape::analyze(Function &F) {
+void coro::Shape::analyze(Function &F,
+                          SmallVectorImpl<CoroFrameInst *> &CoroFrames,
+                          SmallVectorImpl<CoroSaveInst *> &UnusedCoroSaves) {
   clear();
 
   bool HasFinalSuspend = false;
@@ -341,7 +343,8 @@ void coro::Shape::analyze(Function &F) {
 }
 
 // If for some reason, we were not able to find coro.begin, bailout.
-void coro::Shape::invalidateCoroutine(Function &F) {
+void coro::Shape::invalidateCoroutine(
+    Function &F, SmallVectorImpl<CoroFrameInst *> &CoroFrames) {
   assert(!CoroBegin);
   {
     // Replace coro.frame which are supposed to be lowered to the result of
@@ -474,7 +477,9 @@ void coro::Shape::initABI() {
   }
 }
 
-void coro::Shape::cleanCoroutine() {
+void coro::Shape::cleanCoroutine(
+    SmallVectorImpl<CoroFrameInst *> &CoroFrames,
+    SmallVectorImpl<CoroSaveInst *> &UnusedCoroSaves) {
   // The coro.frame intrinsic is always lowered to the result of coro.begin.
   for (CoroFrameInst *CF : CoroFrames) {
     CF->replaceAllUsesWith(CoroBegin);