Skip to content

Fix IRGen/condfail.sil on s390x #8720

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

Merged

Conversation

vivkong
Copy link
Contributor

@vivkong vivkong commented Apr 12, 2017

On s390x, traps are supported as legal DAG opcodes and "j .+2" are generated for them.
https://reviews.llvm.org/D21155

Fix is the same as #8719 and this PR is for swift-3.1-branch.

@jrose-apple
Copy link
Contributor

jrose-apple commented Apr 12, 2017

Test change only, looks reasonable to me.

@swift-ci Please test

@jrose-apple jrose-apple requested a review from tkremenek April 12, 2017 17:25
@slavapestov slavapestov merged commit 8d233b1 into swiftlang:swift-3.1-branch Apr 16, 2017
@slavapestov
Copy link
Contributor

Oops, I didn't realize this was for 3.1-branch...

@vivkong vivkong deleted the swift31-condfail-fix branch July 11, 2017 18:58
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.

3 participants