Revert "Merge pull request swiftlang#75677 from drexin/wip-133006541"

This reverts commit 739c719, reversing
changes made to 7d1c505.

Author: aschwaighofer

lib/IRGen/GenCall.cpp

@@ -4511,12 +4511,12 @@ void CallEmission::emitToUnmappedExplosionWithDirectTypedError(
       for (unsigned i = 0, e = structTy->getNumElements(); i < e; ++i) {
         llvm::Value *elt = values[combined.errorValueMapping[i]];
         auto *nativeTy = structTy->getElementType(i);
-        elt = convertForDirectError(IGF, elt, nativeTy, /*forExtraction*/ true);
+        elt = convertForAsyncDirect(IGF, elt, nativeTy, /*forExtraction*/ true);
         errorExplosion.add(elt);
       }
     } else {
       auto *converted =
-          convertForDirectError(IGF, values[combined.errorValueMapping[0]],
+          convertForAsyncDirect(IGF, values[combined.errorValueMapping[0]],
                                 combined.combinedTy, /*forExtraction*/ true);
       errorExplosion.add(converted);
     }
@@ -4534,12 +4534,12 @@ void CallEmission::emitToUnmappedExplosionWithDirectTypedError(
             dyn_cast<llvm::StructType>(nativeSchema.getExpandedType(IGF.IGM))) {
       for (unsigned i = 0, e = structTy->getNumElements(); i < e; ++i) {
         auto *nativeTy = structTy->getElementType(i);
-        auto *converted = convertForDirectError(IGF, values[i], nativeTy,
+        auto *converted = convertForAsyncDirect(IGF, values[i], nativeTy,
                                                 /*forExtraction*/ true);
         resultExplosion.add(converted);
       }
     } else {
-      auto *converted = convertForDirectError(
+      auto *converted = convertForAsyncDirect(
           IGF, values[0], combined.combinedTy, /*forExtraction*/ true);
       resultExplosion.add(converted);
     }
@@ -5407,7 +5407,7 @@ llvm::Value* IRGenFunction::coerceValue(llvm::Value *value, llvm::Type *toTy,
   return loaded;
 }
 
-llvm::Value *irgen::convertForDirectError(IRGenFunction &IGF,
+llvm::Value *irgen::convertForAsyncDirect(IRGenFunction &IGF,
                                           llvm::Value *value, llvm::Type *toTy,
                                           bool forExtraction) {
   auto &Builder = IGF.Builder;
@@ -5417,9 +5417,12 @@ llvm::Value *irgen::convertForDirectError(IRGenFunction &IGF,
     if (toTy->isPointerTy()) {
       if (fromTy->isPointerTy())
         return Builder.CreateBitCast(value, toTy);
-      return Builder.CreateIntToPtr(value, toTy);
+      if (fromTy == IGF.IGM.IntPtrTy)
+        return Builder.CreateIntToPtr(value, toTy);
     } else if (fromTy->isPointerTy()) {
-      return Builder.CreatePtrToInt(value, toTy);
+      if (toTy == IGF.IGM.IntPtrTy) {
+        return Builder.CreatePtrToInt(value, toTy);
+      }
     }
 
     if (forExtraction) {
@@ -5877,12 +5880,12 @@ void IRGenFunction::emitScalarReturn(SILType returnResultType,
         for (unsigned i = 0, e = native.size(); i != e; ++i) {
           llvm::Value *elt = native.claimNext();
           auto *nativeTy = structTy->getElementType(i);
-          elt = convertForDirectError(*this, elt, nativeTy,
+          elt = convertForAsyncDirect(*this, elt, nativeTy,
                                       /*forExtraction*/ false);
           nativeAgg = Builder.CreateInsertValue(nativeAgg, elt, i);
         }
       } else {
-        nativeAgg = convertForDirectError(*this, native.claimNext(), combinedTy,
+        nativeAgg = convertForAsyncDirect(*this, native.claimNext(), combinedTy,
                                           /*forExtraction*/ false);
       }
     }
@@ -6214,7 +6217,7 @@ void irgen::emitAsyncReturn(IRGenFunction &IGF, AsyncContextLayout &asyncLayout,
           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,
+            elt = convertForAsyncDirect(IGF, elt, nativeTy,
                                         /*forExtraction*/ false);
             nativeAgg = IGF.Builder.CreateInsertValue(nativeAgg, elt, i);
           }
@@ -6224,7 +6227,7 @@ void irgen::emitAsyncReturn(IRGenFunction &IGF, AsyncContextLayout &asyncLayout,
             nativeResultsStorage.push_back(out.claimNext());
           }
         } else {
-          auto *converted = convertForDirectError(
+          auto *converted = convertForAsyncDirect(
               IGF, result.claimNext(), combinedTy, /*forExtraction*/ false);
           nativeResultsStorage.push_back(converted);
         }

lib/IRGen/GenCall.h

@@ -274,8 +274,8 @@ namespace irgen {
   void forwardAsyncCallResult(IRGenFunction &IGF, CanSILFunctionType fnType,
                               AsyncContextLayout &layout, llvm::CallInst *call);
 
-  /// Converts a value for direct error return.
-  llvm::Value *convertForDirectError(IRGenFunction &IGF, llvm::Value *value,
+  /// Converts a value for async direct errors.
+  llvm::Value *convertForAsyncDirect(IRGenFunction &IGF, llvm::Value *value,
                                      llvm::Type *toTy, bool forExtraction);
 
 } // end namespace irgen

lib/IRGen/GenThunk.cpp

@@ -384,14 +384,14 @@ void IRGenThunk::emit() {
             for (unsigned i : combined.errorValueMapping) {
               llvm::Value *elt = nativeError.claimNext();
               auto *nativeTy = structTy->getElementType(i);
-              elt = convertForDirectError(IGF, elt, nativeTy,
+              elt = convertForAsyncDirect(IGF, elt, nativeTy,
                                           /*forExtraction*/ false);
               expandedResult =
                   IGF.Builder.CreateInsertValue(expandedResult, elt, i);
             }
             IGF.emitAllExtractValues(expandedResult, structTy, errorArgValues);
           } else if (!errorSchema.getExpandedType(IGM)->isVoidTy()) {
-            errorArgValues = convertForDirectError(IGF, nativeError.claimNext(),
+            errorArgValues = convertForAsyncDirect(IGF, nativeError.claimNext(),
                                                    combined.combinedTy,
                                                    /*forExtraction*/ false);
           }

lib/IRGen/IRGenSIL.cpp

@@ -4445,7 +4445,7 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
         for (unsigned i : combined.errorValueMapping) {
           llvm::Value *elt = nativeError.claimNext();
           auto *nativeTy = structTy->getElementType(i);
-          elt = convertForDirectError(*this, elt, nativeTy,
+          elt = convertForAsyncDirect(*this, elt, nativeTy,
                                       /*forExtraction*/ false);
           expandedResult = Builder.CreateInsertValue(expandedResult, elt, i);
         }
@@ -4456,7 +4456,7 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
         }
       } else if (!errorSchema.getExpandedType(IGM)->isVoidTy()) {
         out =
-            convertForDirectError(*this, nativeError.claimNext(),
+            convertForAsyncDirect(*this, nativeError.claimNext(),
                                   combined.combinedTy, /*forExtraction*/ false);
       }
     } else {