IRGen: Fix DenseMap interior pointer invalidation bug in IRGenSILFunction::visitEndApply.

Fixes rdar://144216380.

Author: jckarter

lib/IRGen/IRGenSIL.cpp

@@ -4764,42 +4764,49 @@ void IRGenSILFunction::visitAbortApplyInst(AbortApplyInst *i) {
 }
 
 void IRGenSILFunction::visitEndApply(BeginApplyInst *i, EndApplyInst *ei) {
-  const auto &coroutine = getLoweredCoroutine(i->getTokenResult());
-  bool isAbort = ei == nullptr;
-
-  auto sig = Signature::forCoroutineContinuation(IGM, i->getOrigCalleeType());
-
-  // Cast the continuation pointer to the right function pointer type.
-  auto continuation = coroutine.Continuation;
-  continuation = Builder.CreateBitCast(continuation,
-                                       sig.getType()->getPointerTo());
-
-  auto schemaAndEntity =
-    getCoroutineResumeFunctionPointerAuth(IGM, i->getOrigCalleeType());
-  auto pointerAuth = PointerAuthInfo::emit(*this, schemaAndEntity.first,
-                                           coroutine.Buffer.getAddress(),
-                                           schemaAndEntity.second);
-  auto callee = FunctionPointer::createSigned(i->getOrigCalleeType(),
-                                              continuation, pointerAuth, sig);
-
-  auto *call = Builder.CreateCall(callee, {
-      coroutine.Buffer.getAddress(),
-      llvm::ConstantInt::get(IGM.Int1Ty, isAbort)
-    });
+  {
+    const auto &coroutine = getLoweredCoroutine(i->getTokenResult());
+    bool isAbort = ei == nullptr;
+
+    auto sig = Signature::forCoroutineContinuation(IGM, i->getOrigCalleeType());
+
+    // Cast the continuation pointer to the right function pointer type.
+    auto continuation = coroutine.Continuation;
+    continuation = Builder.CreateBitCast(continuation,
+                                         sig.getType()->getPointerTo());
+
+    auto schemaAndEntity =
+      getCoroutineResumeFunctionPointerAuth(IGM, i->getOrigCalleeType());
+    auto pointerAuth = PointerAuthInfo::emit(*this, schemaAndEntity.first,
+                                             coroutine.Buffer.getAddress(),
+                                             schemaAndEntity.second);
+    auto callee = FunctionPointer::createSigned(i->getOrigCalleeType(),
+                                                continuation, pointerAuth, sig);
+
+    auto *call = Builder.CreateCall(callee, {
+        coroutine.Buffer.getAddress(),
+        llvm::ConstantInt::get(IGM.Int1Ty, isAbort)
+      });
 
-  if (!isAbort) {
-    auto resultType = call->getType();
-    if (!resultType->isVoidTy()) {
-      Explosion e;
-      // FIXME: Do we need to handle ABI-related conversions here?
-      // It seems we cannot have C function convention for coroutines, etc.
-      extractScalarResults(*this, resultType, call, e);
-      setLoweredExplosion(ei, e);
+    if (!isAbort) {
+      auto resultType = call->getType();
+      if (!resultType->isVoidTy()) {
+        Explosion e;
+        // FIXME: Do we need to handle ABI-related conversions here?
+        // It seems we cannot have C function convention for coroutines, etc.
+        extractScalarResults(*this, resultType, call, e);
+        
+        // NOTE: This inserts a new entry into the LoweredValues DenseMap,
+        // invalidating the reference held by `coroutine` in this scope.
+        setLoweredExplosion(ei, e);
+      }
     }
   }
 
+  // Re-fetch the coroutine state from its new location in the DenseMap after
+  // the invalidation above.
+  const auto &coroutine = getLoweredCoroutine(i->getTokenResult());
   coroutine.Temporaries.destroyAll(*this);
-
   emitDeallocYieldOnceCoroutineBuffer(*this, coroutine.Buffer);
 }
 

test/AutoDiff/validation-test/modify_accessor.swift

@@ -1,5 +1,3 @@
-// REQUIRES: rdar144216380
-
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test