Revert "Merge pull request swiftlang#76129 from aschwaighofer/irgen_typed_throws_irgenthunk"

This reverts commit dd0de58, reversing
changes made to 74b3221.

Author: aschwaighofer

lib/IRGen/GenCall.cpp

@@ -6507,46 +6507,3 @@ llvm::FunctionType *FunctionPointer::getFunctionType() const {
 
   return Sig.getType();
 }
-
-void irgen::buildDirectError(IRGenFunction &IGF,
-                             const CombinedResultAndErrorType &combined,
-                             const NativeConventionSchema &errorSchema,
-                             SILType silErrorTy, Explosion &errorResult,
-                             bool forAsync, Explosion &out) {
-  if (combined.combinedTy->isVoidTy()) {
-    return;
-  }
-
-  llvm::Value *expandedResult = llvm::UndefValue::get(combined.combinedTy);
-  auto *structTy = dyn_cast<llvm::StructType>(combined.combinedTy);
-
-  if (!errorSchema.getExpandedType(IGF.IGM)->isVoidTy()) {
-    auto nativeError =
-        errorSchema.mapIntoNative(IGF.IGM, IGF, errorResult, silErrorTy, false);
-
-    if (structTy) {
-      for (unsigned i : combined.errorValueMapping) {
-        llvm::Value *elt = nativeError.claimNext();
-        auto *nativeTy = structTy->getElementType(i);
-        elt = convertForDirectError(IGF, elt, nativeTy,
-                                    /*forExtraction*/ false);
-        expandedResult = IGF.Builder.CreateInsertValue(expandedResult, elt, i);
-      }
-      if (forAsync) {
-        IGF.emitAllExtractValues(expandedResult, structTy, out);
-      } else {
-        out = expandedResult;
-      }
-    } else if (!errorSchema.getExpandedType(IGF.IGM)->isVoidTy()) {
-      out = convertForDirectError(IGF, nativeError.claimNext(),
-                                  combined.combinedTy,
-                                  /*forExtraction*/ false);
-    }
-  } else {
-    if (forAsync && structTy) {
-      IGF.emitAllExtractValues(expandedResult, structTy, out);
-    } else {
-      out = expandedResult;
-    }
-  }
-}

lib/IRGen/GenCall.h

@@ -278,11 +278,6 @@ namespace irgen {
   llvm::Value *convertForDirectError(IRGenFunction &IGF, llvm::Value *value,
                                      llvm::Type *toTy, bool forExtraction);
 
-  void buildDirectError(IRGenFunction &IGF,
-                        const CombinedResultAndErrorType &combined,
-                        const NativeConventionSchema &errorSchema,
-                        SILType silErrorTy, Explosion &errorResult,
-                        bool forAsync, Explosion &out);
 } // end namespace irgen
 } // end namespace swift
 

lib/IRGen/GenThunk.cpp

@@ -153,8 +153,7 @@ void IRGenThunk::prepareArguments() {
       auto &resultSchema = resultTI.nativeReturnValueSchema(IGF.IGM);
 
       if (resultSchema.requiresIndirect() ||
-          errorSchema.shouldReturnTypedErrorIndirectly() ||
-          conv.hasIndirectSILResults()) {
+          errorSchema.shouldReturnTypedErrorIndirectly()) {
         auto directTypedErrorAddr = original.takeLast();
         IGF.setCalleeTypedErrorResultSlot(Address(directTypedErrorAddr,
                                                   errorTI.getStorageType(),
@@ -406,21 +405,7 @@ void IRGenThunk::emit() {
       errorArgValues.add(errorValue);
       emitAsyncReturn(IGF, *asyncLayout, origTy, errorArgValues.claimAll());
     } else {
-      if (!error->empty()) {
-        // Map the direct error explosion from the call back to the native
-        // explosion for the return.
-        SILType silErrorTy = conv.getSILErrorType(expansionContext);
-        auto &errorTI = IGF.IGM.getTypeInfo(silErrorTy);
-        auto &errorSchema = errorTI.nativeReturnValueSchema(IGF.IGM);
-        auto combined =
-            combineResultAndTypedErrorType(IGF.IGM, schema, errorSchema);
-        Explosion nativeAgg;
-        buildDirectError(IGF, combined, errorSchema, silErrorTy, *error,
-                         /*forAsync*/ false, nativeAgg);
-        IGF.emitScalarReturn(IGF.CurFn->getReturnType(), nativeAgg);
-      } else {
-        IGF.emitScalarReturn(IGF.CurFn->getReturnType(), *error);
-      }
+      IGF.emitScalarReturn(IGF.CurFn->getReturnType(), *error);
     }
     IGF.Builder.emitBlock(successBB);
   } else {

lib/IRGen/IRGenSIL.cpp

@@ -4426,6 +4426,48 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
                               getSILModule());
   assert(!conv.hasIndirectSILErrorResults());
 
+  auto buildDirectError = [=](const CombinedResultAndErrorType &combined,
+                              const NativeConventionSchema &errorSchema,
+                              SILType silErrorTy, Explosion &errorResult,
+                              bool forAsync, Explosion &out) {
+    if (combined.combinedTy->isVoidTy()) {
+      return;
+    }
+
+    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) {
+        for (unsigned i : combined.errorValueMapping) {
+          llvm::Value *elt = nativeError.claimNext();
+          auto *nativeTy = structTy->getElementType(i);
+          elt = convertForDirectError(*this, elt, nativeTy,
+                                      /*forExtraction*/ false);
+          expandedResult = Builder.CreateInsertValue(expandedResult, elt, i);
+        }
+        if (forAsync) {
+          emitAllExtractValues(expandedResult, structTy, out);
+        } else {
+          out = expandedResult;
+        }
+      } else if (!errorSchema.getExpandedType(IGM)->isVoidTy()) {
+        out =
+            convertForDirectError(*this, nativeError.claimNext(),
+                                  combined.combinedTy, /*forExtraction*/ false);
+      }
+    } else {
+      if (forAsync && structTy) {
+        emitAllExtractValues(expandedResult, structTy, out);
+      } else {
+        out = expandedResult;
+      }
+    }
+  };
+
   if (!isAsync()) {
     auto fnTy = CurFn->getFunctionType();
     auto retTy = fnTy->getReturnType();
@@ -4458,8 +4500,7 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
           auto combined =
               combineResultAndTypedErrorType(IGM, resultSchema, errorSchema);
           Explosion nativeAgg;
-          buildDirectError(*this, combined, errorSchema, silErrorTy,
-                           errorResult,
+          buildDirectError(combined, errorSchema, silErrorTy, errorResult,
                            /*forAsync*/ false, nativeAgg);
 
           emitScalarReturn(combined.combinedTy, nativeAgg);
@@ -4509,7 +4550,7 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
         Explosion nativeAgg;
         auto combined =
             combineResultAndTypedErrorType(IGM, resultSchema, errorSchema);
-        buildDirectError(*this, combined, errorSchema, silErrorTy, exn,
+        buildDirectError(combined, errorSchema, silErrorTy, exn,
                          /*forAsync*/ true, nativeAgg);
         assert(exn.empty() && "Unclaimed typed error results");
 

test/IRGen/typed_throws.swift

@@ -4,8 +4,6 @@
 
 // RUN: %target-swift-frontend -primary-file %s -emit-ir  | %FileCheck %s --check-prefix=CHECK
 
-// RUN: %target-swift-frontend -primary-file %s -emit-ir -enable-library-evolution
-
 // XFAIL: CPU=arm64e
 // REQUIRES: PTRSIZE=64
 
@@ -218,17 +216,3 @@ func mayThrowEmptyErrorAsync(x: Bool) async throws(EmptyError) -> String? {
 
   return ""
 }
-
-
-enum SP: Error {
-    case a
-    case b(Int32)
-}
-
-protocol Proto {
-  // This used to crash.
-  static func f() throws(SP) -> Self
-
-  // This used to crash.
-  static func f2() throws(SP) -> Int64
-}