AddValidation: handle Call terminators into blocks that have multiple incoming edges #43748
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
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
|
The |
arielb1
reviewed
Aug 9, 2017
src/librustc_driver/driver.rs
Outdated
| @@ -945,11 +945,11 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, | |||
| passes.push_pass(MIR_OPTIMIZED, mir::transform::add_call_guards::AddCallGuards); | |||
| passes.push_pass(MIR_OPTIMIZED, mir::transform::elaborate_drops::ElaborateDrops); | |||
| passes.push_pass(MIR_OPTIMIZED, mir::transform::no_landing_pads::NoLandingPads); | |||
| passes.push_pass(MIR_OPTIMIZED, mir::transform::simplify::SimplifyCfg::new("elaborate-drops")); | |||
| // No lifetime analysis based on borrowing can be done from here on out. | |||
|
|
|||
| // AddValidation needs to run after ElaborateDrops and before EraseRegions. | |||
There was a problem hiding this comment.
I think you can replace this patch with a
passes.push_pass(MIR_OPTIMIZED, mir::transform::add_call_guards::AddCallGuards);Here
|
Thanks for this hint! I re-did the PR based on that. |
|
@bors r+ |
|
📌 Commit 718a8d1 has been approved by |
aidanhs
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 11, 2017
AddValidation: handle Call terminators into blocks that have multiple incoming edges The old code was just wrong: It would add validation on paths that don't even come from the call, and it would add multiple validations if multiple calls end return to the same block.
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Aug 11, 2017
Merged
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.
The old code was just wrong: It would add validation on paths that don't even come from the call, and it would add multiple validations if multiple calls end return to the same block.