[MIR] MSVC SEH unwind handling #31600
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The pass removes the unwind branch of each terminator, thus moving the responsibility of handling the -Z no-landing-pads flag to a small self-contained pass… instead of polluting the translator.
| fn make_landing_pad(&mut self, | ||
| cleanup: BlockAndBuilder<'bcx, 'tcx>) | ||
| -> BlockAndBuilder<'bcx, 'tcx> | ||
| { | ||
| if base::wants_msvc_seh(cleanup.sess()) { | ||
| return cleanup; | ||
| } | ||
| // FIXME(#30941) this doesn't handle msvc-style exceptions |
There was a problem hiding this comment.
I think this comment can be removed now?
|
The SEH translation feels a little ad-hoc here with some sprinklings here and there, but otherwise doesn't seem obviously wrong to met at least! LLVM's verifier pass is pretty strict with the cleanuppad/cleanupret instructions now so if this passes there then it's likely correct |
nagisa
force-pushed
the
mir-msvc-seh-2
branch
from
73e972f to
c7d6f58
Compare
| @@ -148,6 +148,10 @@ impl<'a, 'm, 'tcx> Visitor<'tcx> for InnerDump<'a,'m,'tcx> { | |||
|
|
|||
| match build_mir(Cx::new(&infcx), implicit_arg_tys, id, span, decl, body) { | |||
| Ok(mut mir) => { | |||
| // FIXME: This should run later rather than earlier (since this is supposed to be a | |||
There was a problem hiding this comment.
This doesn't seem like a FIXME necessarily. Once we are done with type-checking and other things, the MIR is basically ripe for optimization in any order, and taking into account codegen options seems legit.
|
nits addressed. |
nagisa
force-pushed
the
mir-msvc-seh-2
branch
from
c7d6f58 to
1752615
Compare
| // except according to those terms. | ||
|
|
||
| //! This pass removes the unwind branch of all the terminators when the no-landing-pads option is | ||
| //! specified. |
There was a problem hiding this comment.
This is fairly nifty btw. =)
|
@bors r+ |
|
📌 Commit 1752615 has been approved by |
bors
added a commit
that referenced
this pull request
Feb 18, 2016
r? @alexcrichton for the translator changes and @nikomatsakis for the no-landing-pads pass.
This was referenced Feb 18, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @alexcrichton for the translator changes and @nikomatsakis for the no-landing-pads pass.