Skip to content

[4.2] [Serialization] Handle llvm::Error in member deserialization recovery #17325

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.

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

Conversation

jrose-apple
Copy link
Contributor

Cherry-pick of #16957 to the 4.2 branch to fix an asserts-only issue. Reviewed by @graydon.

rdar://problem/40738521

…swiftlang#16957)

llvm::Expected/llvm::Error require that the error is not just checked
but explicitly handled. Since we're currently recovering as if nothing
happened, we need to use llvm::consumeError to throw the error info
away.

rdar://problem/40738521
(cherry picked from commit e840330)
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@jrose-apple jrose-apple changed the title [Serialization] Handle llvm::Error in member deserialization recovery [4.2] [Serialization] Handle llvm::Error in member deserialization recovery Jun 19, 2018
@jrose-apple jrose-apple merged commit 017c069 into swiftlang:swift-4.2-branch Jun 19, 2018
@jrose-apple jrose-apple deleted the 4.2-fulfilling-expectations branch June 19, 2018 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant