Revert "Merge pull request #80350 from drexin/wip-147872231-6.1"

This reverts commit aa6f1d5, reversing
changes made to 0414cb2.

Author: shahmishal

lib/IRGen/GenCall.cpp

@@ -6346,12 +6346,10 @@ void irgen::emitAsyncReturn(IRGenFunction &IGF, AsyncContextLayout &asyncLayout,
       if (combinedTy->isVoidTy()) {
         assert(result.empty() && "Unexpected result values");
       } else {
-        Explosion native = nativeSchema.mapIntoNative(
-            IGM, IGF, result, funcResultTypeInContext, /*isOutlined*/ false);
         if (auto *structTy = dyn_cast<llvm::StructType>(combinedTy)) {
           llvm::Value *nativeAgg = llvm::UndefValue::get(structTy);
-          for (unsigned i = 0, e = native.size(); i < e; ++i) {
-            llvm::Value *elt = native.claimNext();
+          for (unsigned i = 0, e = result.size(); i < e; ++i) {
+            llvm::Value *elt = result.claimNext();
             auto *nativeTy = structTy->getElementType(i);
             elt = convertForDirectError(IGF, elt, nativeTy,
                                         /*forExtraction*/ false);
@@ -6362,9 +6360,9 @@ void irgen::emitAsyncReturn(IRGenFunction &IGF, AsyncContextLayout &asyncLayout,
           while (!out.empty()) {
             nativeResultsStorage.push_back(out.claimNext());
           }
-        } else if (!native.empty()) {
+        } else if (!result.empty()) {
           auto *converted = convertForDirectError(
-              IGF, native.claimNext(), combinedTy, /*forExtraction*/ false);
+              IGF, result.claimNext(), combinedTy, /*forExtraction*/ false);
           nativeResultsStorage.push_back(converted);
         } else {
           nativeResultsStorage.push_back(llvm::UndefValue::get(combinedTy));

test/IRGen/typed_throws.swift

@@ -349,13 +349,3 @@ func callSmallErrorLargerResult() {
     }
   }
 }
-
-struct SomeStruct {
-    let x: Int
-    let y: UInt32
-    let z: UInt32
-}
-
-func someFunc() async throws(SmallError) -> SomeStruct {
-    SomeStruct(x: 42, y: 23, z: 25)
-}