Revert "Merge pull request swiftlang#75379 from drexin/wip-132122011"

This reverts commit 618a9bf, reversing
changes made to 448596c.

Author: aschwaighofer

lib/IRGen/IRGenSIL.cpp

@@ -4385,7 +4385,6 @@ static void emitReturnInst(IRGenSILFunction &IGF,
     if (fnType->hasErrorResult()) {
       error.add(getNullErrorValue());
     }
-
     emitAsyncReturn(IGF, asyncLayout, funcResultType, fnType, result, error);
   } else {
     auto funcLang = IGF.CurSILFn->getLoweredFunctionType()->getLanguage();
@@ -4435,13 +4434,12 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
     }
 
     llvm::Value *expandedResult = llvm::UndefValue::get(combined.combinedTy);
-    auto *structTy = dyn_cast<llvm::StructType>(combined.combinedTy);
 
     if (!errorSchema.getExpandedType(IGM)->isVoidTy()) {
       auto nativeError =
           errorSchema.mapIntoNative(IGM, *this, errorResult, silErrorTy, false);
 
-      if (structTy) {
+      if (auto *structTy = dyn_cast<llvm::StructType>(combined.combinedTy)) {
         for (unsigned i : combined.errorValueMapping) {
           llvm::Value *elt = nativeError.claimNext();
           auto *nativeTy = structTy->getElementType(i);
@@ -4460,11 +4458,7 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
                                   combined.combinedTy, /*forExtraction*/ false);
       }
     } else {
-      if (forAsync && structTy) {
-        emitAllExtractValues(expandedResult, structTy, out);
-      } else {
-        out = expandedResult;
-      }
+      out = expandedResult;
     }
   };
 

test/IRGen/typed_throws.swift

@@ -205,14 +205,3 @@ func mayThrowAsyncTiny(x: Bool) async throws(TinyError) -> Bool {
 func callsMayThrowAsyncTiny(x: Bool) async {
   _ = try! await mayThrowAsyncTiny(x: x)
 }
-
-struct EmptyError: Error {}
-
-@available(SwiftStdlib 6.0, *)
-func mayThrowEmptyErrorAsync(x: Bool) async throws(EmptyError) -> String? {
-  guard x else {
-    throw EmptyError()
-  }
-
-  return ""
-}