[Async CC] Put direct returns after indirect returns.

For callers who do not know the actual type of the called function, e.g.
when the called function is the result of a partial apply, the offset to
the direct returns would otherwise not be known.

Author: nate-chandler

lib/IRGen/GenCall.cpp

@@ -121,6 +121,17 @@ AsyncContextLayout irgen::getAsyncContextLayout(
     indirectReturnInfos.push_back(indirectResult);
   }
 
+  //     ResultTypes directResults...;
+  auto directResults = fnConv.getDirectSILResults();
+  for (auto result : directResults) {
+    auto ty =
+        fnConv.getSILType(result, IGF.IGM.getMaximalTypeExpansionContext());
+    auto &ti = IGF.getTypeInfoForLowered(ty.getASTType());
+    valTypes.push_back(ty);
+    typeInfos.push_back(&ti);
+    directReturnInfos.push_back(result);
+  }
+
   //   SelfType self?;
   bool hasLocalContextParameter = hasSelfContextParameter(substitutedType);
   bool canHaveValidError = substitutedType->hasErrorResult();
@@ -203,17 +214,6 @@ AsyncContextLayout irgen::getAsyncContextLayout(
     trailingWitnessInfo = AsyncContextLayout::TrailingWitnessInfo();
   }
 
-  //     ResultTypes directResults...;
-  auto directResults = fnConv.getDirectSILResults();
-  for (auto result : directResults) {
-    auto ty =
-        fnConv.getSILType(result, IGF.IGM.getMaximalTypeExpansionContext());
-    auto &ti = IGF.getTypeInfoForLowered(ty.getASTType());
-    valTypes.push_back(ty);
-    typeInfos.push_back(&ti);
-    directReturnInfos.push_back(result);
-  }
-
   return AsyncContextLayout(
       IGF.IGM, LayoutStrategy::Optimal, valTypes, typeInfos, IGF, originalType,
       substitutedType, substitutionMap, std::move(bindings),

lib/IRGen/GenCall.h

@@ -115,13 +115,21 @@ namespace irgen {
     unsigned getFirstIndirectReturnIndex() {
       return getErrorIndex() + getErrorCount();
     }
+    unsigned getIndexAfterIndirectReturns() {
+      return getFirstIndirectReturnIndex() + getIndirectReturnCount();
+    }
+    unsigned getFirstDirectReturnIndex() {
+      return getIndexAfterIndirectReturns();
+    }
+    unsigned getIndexAfterDirectReturns() {
+      return getFirstDirectReturnIndex() + getDirectReturnCount();
+    }
     unsigned getLocalContextIndex() {
       assert(hasLocalContext());
-      return getFirstIndirectReturnIndex() + getIndirectReturnCount();
+      return getIndexAfterDirectReturns();
     }
     unsigned getIndexAfterLocalContext() {
-      return getFirstIndirectReturnIndex() + getIndirectReturnCount() +
-             (hasLocalContext() ? 1 : 0);
+      return getIndexAfterDirectReturns() + (hasLocalContext() ? 1 : 0);
     }
     unsigned getBindingsIndex() {
       assert(hasBindings());
@@ -145,9 +153,6 @@ namespace irgen {
     unsigned getIndexAfterTrailingWitnesses() {
       return getIndexAfterArguments() + (hasTrailingWitnesses() ? 2 : 0);
     }
-    unsigned getFirstDirectReturnIndex() {
-      return getIndexAfterTrailingWitnesses();
-    }
 
   public:
     bool canHaveError() { return canHaveValidError; }