Uh oh!
There was an error while loading. Please reload this page.
rustc_codegen_ssa: don't treat inlined variables as debuginfo arguments. - #68802
Merged
Merged
Conversation
rust-highfive
commented
Feb 3, 2020
Contributor
r? @varkor (rust_highfive has picked a reviewer for you, use r? to override) |
eddyb
commented
Feb 3, 2020
ContributorAuthor
r? @nagisa cc @bjorn3@nikomatsakis |
bjorn3
approved these changes
Feb 3, 2020
nagisa
commented
Feb 7, 2020
Member
@bors r+ |
bors
commented
Feb 7, 2020
Collaborator
📌 Commit 80515f7 has been approved by |
Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 8, 2020
…ne-arg, r=nagisa rustc_codegen_ssa: don't treat inlined variables as debuginfo arguments. Fixesrust-lang#67586 by limiting `ArgumentVariable` special-casing to `VarDebugInfo` entries that are in `OUTERMOST_SOURCE_SCOPE`, i.e. the function's own argument scope. That excludes `VarDebugInfo` from inlined callees, which can also point to the caller's argument locals. This is a snippet from the optimized MIR (including inlining) of the testcase: ```rust fn foo(_1: usize) -> usize { debug bar => _1; // in scope 0 at ./example.rs:2:12: 2:15 let mut _0: usize; // return place in scope 0 at ./example.rs:2:27: 2:32 scope 1 { debug x => _1; // in scope 1 at /rustc/9ed29b6ff6aa2e048b09c27af8f62ee3040bdb37/src/libcore/convert/mod.rs:106:26: 106:27 } ``` `scope 1` is from inlining the `identity` call, and `debug x => _1;` comes from the body of `core::convert::identity`, so they are now ignored for the purposes of determining the `ArgumentVariable` debuginfo associated to `_1`.
bors
commented
Feb 8, 2020
Collaborator
bors added a commit
that referenced
this pull request
Feb 8, 2020
…agisa rustc_codegen_ssa: don't treat inlined variables as debuginfo arguments. Fixes#67586 by limiting `ArgumentVariable` special-casing to `VarDebugInfo` entries that are in `OUTERMOST_SOURCE_SCOPE`, i.e. the function's own argument scope. That excludes `VarDebugInfo` from inlined callees, which can also point to the caller's argument locals. This is a snippet from the optimized MIR (including inlining) of the testcase: ```rust fn foo(_1: usize) -> usize { debug bar => _1; // in scope 0 at ./example.rs:2:12: 2:15 let mut _0: usize; // return place in scope 0 at ./example.rs:2:27: 2:32 scope 1 { debug x => _1; // in scope 1 at /rustc/9ed29b6ff6aa2e048b09c27af8f62ee3040bdb37/src/libcore/convert/mod.rs:106:26: 106:27 } ``` `scope 1` is from inlining the `identity` call, and `debug x => _1;` comes from the body of `core::convert::identity`, so they are now ignored for the purposes of determining the `ArgumentVariable` debuginfo associated to `_1`.
bors
commented
Feb 8, 2020
Collaborator
💔 Test failed - checks-azure |
eddyb
commented
Feb 8, 2020
ContributorAuthor
@bors retry
|
bors
commented
Feb 8, 2020
Collaborator
bors added a commit
that referenced
this pull request
Feb 8, 2020
…agisa rustc_codegen_ssa: don't treat inlined variables as debuginfo arguments. Fixes#67586 by limiting `ArgumentVariable` special-casing to `VarDebugInfo` entries that are in `OUTERMOST_SOURCE_SCOPE`, i.e. the function's own argument scope. That excludes `VarDebugInfo` from inlined callees, which can also point to the caller's argument locals. This is a snippet from the optimized MIR (including inlining) of the testcase: ```rust fn foo(_1: usize) -> usize { debug bar => _1; // in scope 0 at ./example.rs:2:12: 2:15 let mut _0: usize; // return place in scope 0 at ./example.rs:2:27: 2:32 scope 1 { debug x => _1; // in scope 1 at /rustc/9ed29b6ff6aa2e048b09c27af8f62ee3040bdb37/src/libcore/convert/mod.rs:106:26: 106:27 } ``` `scope 1` is from inlining the `identity` call, and `debug x => _1;` comes from the body of `core::convert::identity`, so they are now ignored for the purposes of determining the `ArgumentVariable` debuginfo associated to `_1`.
bors
commented
Feb 9, 2020
Collaborator
☀️ Test successful - checks-azure |
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Fixes#67586 by limiting
ArgumentVariablespecial-casing toVarDebugInfoentries that are inOUTERMOST_SOURCE_SCOPE, i.e. the function's own argument scope.That excludes
VarDebugInfofrom inlined callees, which can also point to the caller's argument locals.This is a snippet from the optimized MIR (including inlining) of the testcase:
scope 1is from inlining theidentitycall, anddebug x => _1;comes from the body ofcore::convert::identity, so they are now ignored for the purposes of determining theArgumentVariabledebuginfo associated to_1.