Revert "Merge pull request #74840 from drexin/wip-130781414"

This reverts commit 7feb592, reversing
changes made to 4edda08.

Author: aschwaighofer

lib/IRGen/GenCall.cpp

@@ -416,13 +416,10 @@ CombinedResultAndErrorType irgen::combineResultAndTypedErrorType(
     assert(error->isIntOrPtrTy() &&
            "Direct errors must only consist of int or ptr values");
     result.errorValueMapping.push_back(combined.size());
-
-    if (res == error) {
+    if (res->getPrimitiveSizeInBits() >= error->getPrimitiveSizeInBits()) {
       combined.push_back(res);
     } else {
-      auto maxSize = std::max(IGM.DataLayout.getTypeSizeInBits(res),
-                              IGM.DataLayout.getTypeSizeInBits(error));
-      combined.push_back(llvm::IntegerType::get(IGM.getLLVMContext(), maxSize));
+      combined.push_back(error);
     }
 
     ++resIt;
@@ -2868,12 +2865,10 @@ class SyncCallEmission final : public CallEmission {
         if (auto *structTy = dyn_cast<llvm::StructType>(
                 nativeSchema.getExpandedType(IGF.IGM))) {
           for (unsigned i = 0, e = structTy->getNumElements(); i < e; ++i) {
-            auto *nativeTy = structTy->getElementType(i);
-            resultExplosion.add(convertIfNecessary(nativeTy, values[i]));
+            resultExplosion.add(values[i]);
           }
         } else {
-          resultExplosion.add(
-              convertIfNecessary(combined.combinedTy, values[0]));
+          resultExplosion.add(values[0]);
         }
         out = nativeSchema.mapFromNative(IGF.IGM, IGF, resultExplosion,
                                          resultType);
@@ -5744,9 +5739,6 @@ void IRGenFunction::emitScalarReturn(SILType returnResultType,
                 eltTy->getPrimitiveSizeInBits()) {
           assert(nativeTy->getPrimitiveSizeInBits() >
                  eltTy->getPrimitiveSizeInBits());
-          if (eltTy->isPointerTy()) {
-            return Builder.CreatePtrToInt(elt, nativeTy);
-          }
           return Builder.CreateZExt(elt, nativeTy);
         }
         return elt;

lib/IRGen/IRGenSIL.cpp

@@ -4474,11 +4474,6 @@ void IRGenSILFunction::visitThrowInst(swift::ThrowInst *i) {
                       eltTy->getPrimitiveSizeInBits()) {
                 assert(nativeTy->getPrimitiveSizeInBits() >
                        eltTy->getPrimitiveSizeInBits());
-
-                if (eltTy->isPointerTy()) {
-                  return elt = Builder.CreatePtrToInt(elt, nativeTy);
-                }
-
                 return Builder.CreateZExt(elt, nativeTy);
               }
               return elt;

test/IRGen/typed_throws.swift

@@ -115,19 +115,3 @@ func catchesSmallError() -> Int {
     return error.x
   }
 }
-
-struct MyError: Error {
-  let x: AnyObject
-}
-
-// CHECK: define hidden swiftcc { float, i64, float } @"$s12typed_throws8mayThrow1x1ySf_s5Int32VSftSb_yXltAA7MyErrorVYKF"
-// CHECK:   [[CONVERTED:%.*]] = ptrtoint ptr {{%.*}} to i64
-// CHECK:   insertvalue { float, i64, float } undef, i64 [[CONVERTED]], 1
-// CHECK: }
-@inline(never)
-func mayThrow(x: Bool, y: AnyObject) throws(MyError) -> (Float, Int32, Float) {
-  guard x else {
-    throw MyError(x: y)
-  }
-  return (3.0, 4, 5.0)
-}