Skip to content

IRGen: Make sure loadable error types are mapped into the generic environment too #77371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2024
Merged

IRGen: Make sure loadable error types are mapped into the generic environment too #77371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/IRGen/IRGenSIL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,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(),
Expand Down
5 changes: 5 additions & 0 deletions test/IRGen/typed_throws.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>) {}