Merge pull request #77371 from slavapestov/fix-issue-77297

slavapestov · web-flow · commit 3efa770c8642 · 2024-11-05T03:31:45.000-05:00
IRGen: Make sure loadable error types are mapped into the generic environment too
diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
@@ -2201,7 +2201,7 @@ static void emitEntryPointArgumentsNativeCC(IRGenSILFunction &IGF,
     bool isIndirectError = fnConv.hasIndirectSILErrorResults();
 
     if (isTypedError && !isIndirectError) {
-      auto &errorTI = cast<FixedTypeInfo>(IGF.getTypeInfo(errorType));
+      auto &errorTI = cast<FixedTypeInfo>(IGF.getTypeInfo(inContextErrorType));
       IGF.setCallerTypedErrorResultSlot(Address(
           emission->getCallerTypedErrorResultArgument(),
           errorTI.getStorageType(),
diff --git a/test/IRGen/typed_throws.swift b/test/IRGen/typed_throws.swift
@@ -91,3 +91,8 @@ func testit() throws (S) {
 public struct TypeH {
   public var method: (Int) throws(MyBigError) -> String
 }
+
+// Used to crash with null GenericSignature -- https://github.com/swiftlang/swift/issues/77297
+struct LoadableGeneric<E>: Error {}
+
+func throwsLoadableGeneric<E>(_: E) throws(LoadableGeneric<E>) {}

Original file line number	Diff line number	Diff line change
`@@ -91,3 +91,8 @@ func testit() throws (S) {`
`91`	`91`	`public struct TypeH {`
`92`	`92`	`public var method: (Int) throws(MyBigError) -> String`
`93`	`93`	`}`
	`94`	`+`
	`95`	`+// Used to crash with null GenericSignature -- https://github.com/swiftlang/swift/issues/77297`
	`96`	`+struct LoadableGeneric<E>: Error {}`
	`97`	`+`
	`98`	`+func throwsLoadableGeneric<E>(_: E) throws(LoadableGeneric<E>) {}`