Revert "Merge pull request #74839 from drexin/wip-130783369"

This reverts commit 4edda08, reversing
changes made to ac5763b.

Author: aschwaighofer

lib/IRGen/GenCall.cpp

@@ -2849,8 +2849,7 @@ class SyncCallEmission final : public CallEmission {
             errorExplosion.add(elt);
           }
         } else {
-          errorExplosion.add(convertIfNecessary(
-              combined.combinedTy, values[combined.errorValueMapping[0]]));
+          errorExplosion.add(convertIfNecessary(combined.combinedTy, values[0]));
         }
 
         typedErrorExplosion =

test/IRGen/typed_throws.swift

@@ -92,26 +92,3 @@ func testit() throws (S) {
 public struct TypeH {
   public var method: (Int) throws(MyBigError) -> String
 }
-
-struct SmallError: Error {
-  let x: Int
-}
-
-@inline(never)
-func throwsSmallError() throws(SmallError) -> (Float, Int) {
-  throw SmallError(x: 1)
-}
-
-// CHECK: define hidden swiftcc i64 @"$s12typed_throws17catchesSmallErrorSiyF"()
-// CHECK:   [[RES:%.*]] = call swiftcc { float, i64 } @"$s12typed_throws0B10SmallErrorSf_SityAA0cD0VYKF"(ptr swiftself undef, ptr noalias nocapture swifterror dereferenceable(8) %swifterror)
-// CHECK:   [[R0:%.*]] = extractvalue { float, i64 } [[RES]], 0
-// CHECK:   [[R1:%.*]] = extractvalue { float, i64 } [[RES]], 1
-// CHECK:   phi i64 [ [[R1]], %typed.error.load ]
-// CHECK: }
-func catchesSmallError() -> Int {
-  do {
-    return try throwsSmallError().1
-  } catch {
-    return error.x
-  }
-}