Correctly handle normal coroutine results while synthesizing coroutine continuation.

Author: asl

lib/IRGen/GenCall.cpp

@@ -4830,7 +4830,9 @@ emitRetconCoroutineEntry(IRGenFunction &IGF, CanSILFunctionType fnType,
                          llvm::Intrinsic::ID idIntrinsic, Size bufferSize,
                          Alignment bufferAlignment) {
   auto prototype =
-    IGF.IGM.getOpaquePtr(IGF.IGM.getAddrOfContinuationPrototype(fnType));
+    IGF.IGM.getOpaquePtr(
+      IGF.IGM.getAddrOfContinuationPrototype(fnType,
+                                             fnType->getInvocationGenericSignature()));
 
   // Use malloc and free as our allocator.
   auto allocFn = IGF.IGM.getOpaquePtr(IGF.IGM.getMallocFn());

lib/IRGen/GenDecl.cpp

@@ -6187,13 +6187,14 @@ IRGenModule::getAddrOfDefaultAssociatedConformanceAccessor(
 }
 
 llvm::Function *
-IRGenModule::getAddrOfContinuationPrototype(CanSILFunctionType fnType) {
+IRGenModule::getAddrOfContinuationPrototype(CanSILFunctionType fnType,
+                                            CanGenericSignature sig) {
   LinkEntity entity = LinkEntity::forCoroutineContinuationPrototype(fnType);
 
   llvm::Function *&entry = GlobalFuncs[entity];
   if (entry) return entry;
 
-  GenericContextScope scope(*this, fnType->getInvocationGenericSignature());
+  GenericContextScope scope(*this, sig);
   auto signature = Signature::forCoroutineContinuation(*this, fnType);
   LinkInfo link = LinkInfo::get(*this, entity, NotForDefinition);
   entry = createFunction(*this, link, signature);

lib/IRGen/GenFunc.cpp

@@ -1457,7 +1457,8 @@ class CoroPartialApplicationForwarderEmission
     auto prototype = subIGF.IGM.getOpaquePtr(
       subIGF.IGM.getAddrOfContinuationPrototype(
         cast<SILFunctionType>(
-          unsubstType->mapTypeOutOfContext()->getCanonicalType())));
+          unsubstType->mapTypeOutOfContext()->getCanonicalType()),
+        origType->getInvocationGenericSignature()));
 
     // Use malloc and free as our allocator.
     auto allocFn = subIGF.IGM.getOpaquePtr(subIGF.IGM.getMallocFn());

lib/IRGen/IRGenModule.h

@@ -1834,7 +1834,8 @@ private:                                                                       \
 
   void emitDynamicReplacementOriginalFunctionThunk(SILFunction *f);
 
-  llvm::Function *getAddrOfContinuationPrototype(CanSILFunctionType fnType);
+  llvm::Function *getAddrOfContinuationPrototype(CanSILFunctionType fnType,
+                                                 CanGenericSignature sig);
   Address getAddrOfSILGlobalVariable(SILGlobalVariable *var,
                                      const TypeInfo &ti,
                                      ForDefinition_t forDefinition);

lib/IRGen/IRGenSIL.cpp

@@ -4788,13 +4788,13 @@ void IRGenSILFunction::visitEndApply(BeginApplyInst *i, EndApplyInst *ei) {
 
   if (!isAbort) {
     auto resultType = call->getType();
+    Explosion e;
     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);
     }
+    setLoweredExplosion(ei, e);
   }
 
   coroutine.Temporaries.destroyAll(*this);