rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. #65718

eddyb · 2019-10-23T10:18:45Z

These are all the codegen changes necessary for #56231.

The refactors were performed locally to codegen, and in several steps, to ease reviewing and avoid introducing changes in behavior (as I'm not sure our debuginfo tests cover enough).

r? @michaelwoerister cc @nagisa @rkruppe @oli-obk

src/librustc_codegen_ssa/mir/debuginfo.rs

eddyb · 2019-10-24T17:49:07Z

As per #56231 (comment):

@bjorn3 Please leave comments on the commit in the PR's commit list, not on the commit itself, because I can't reply to the latter from the PR view, and they might even disappear.

eddyb · 2019-10-29T14:17:50Z

r? @nikomatsakis

src/librustc_codegen_ssa/mir/debuginfo.rs

nikomatsakis · 2019-10-29T20:48:30Z

src/librustc_codegen_ssa/mir/debuginfo.rs

@@ -149,54 +174,107 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
        }
    }

-    pub fn debug_declare_locals(&self, bx: &mut Bx) {
-        let tcx = self.cx.tcx();
+    /// Apply debuginfo and/or name, after creating the `alloca` for a local,


🎉 for doc-comments

nikomatsakis · 2019-10-29T21:02:44Z

@bors r+

bors · 2019-10-29T21:02:45Z

📌 Commit 2994186 has been approved by nikomatsakis

nikomatsakis · 2019-10-29T21:36:39Z

@bors r-

Until @eddyb addresses comments by @bjorn3

eddyb · 2019-10-30T17:11:30Z

Oops, I forgot that @bjorn3's comments were all about pre-existing problems, in the code I moved from mod.rs to debuginfo.rs (in src/librustc_codegen_ssa/mir).

@bors r=nikomatsakis rollup=never

bors · 2019-10-30T17:11:31Z

📌 Commit 2994186 has been approved by nikomatsakis

bors · 2019-10-31T06:08:58Z

⌛ Testing commit 2994186 with merge 404d42f...

@michaelwoerister

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. These are all the codegen changes necessary for #56231. The refactors were performed locally to codegen, and in several steps, to ease reviewing and avoid introducing changes in behavior (as I'm not sure our debuginfo tests cover enough). r? @michaelwoerister cc @nagisa @rkruppe @oli-obk

eddyb · 2019-10-31T08:51:24Z

Weird, why does wasm get no temporaries here? Are we more aggressive somehow?
Do we not put vectors behind pointers in wasm, and do on other targets, by any chance?

EDIT: more exactly, what's happening here is that on all targets %x is an LLVM parameter of the function, but then when the intrinsic is called:

most targets use %_2, which was created from %x (presumably via load?)
wasm uses %x directly (so the function signature surely takes it by value)

I can trivially adjust the test so both forms are allowed, but I'm suspicious of the behavior.

cc @alexcrichton @tlively

alexcrichton · 2019-10-31T14:28:47Z

@eddyb this looks simd related and wasm-specific so it's likely related to this configuration option where simd values are passed by-value in wasm and not by-reference, because wasm has entirely different validation/register rules than traditional elf executables.

Perhaps it's safe to just ignore the test on wasm?

tlively · 2019-10-31T16:29:24Z

In one of my recent PRs I generalized one of the SIMD tests by replacing the [0-9]+ with [0-9a-z]+ so it would match x as well. Perhaps it would make sense to do the same here?

eddyb · 2019-10-31T16:57:41Z

@alexcrichton Thanks, that definitely explains it!

@tlively I'll use %{{x|_2}} (and similar), I think, and leave a comment explaining why that is, to avoid any surprises in the future.

…nfo module.

eddyb · 2019-10-31T18:44:32Z

@bors r=nikomatsakis

bors · 2019-10-31T18:44:34Z

📌 Commit 60a2266 has been approved by nikomatsakis

bors · 2019-11-01T11:34:56Z

⌛ Testing commit 60a2266 with merge 01e5d91...

@michaelwoerister

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. These are all the codegen changes necessary for #56231. The refactors were performed locally to codegen, and in several steps, to ease reviewing and avoid introducing changes in behavior (as I'm not sure our debuginfo tests cover enough). r? @michaelwoerister cc @nagisa @rkruppe @oli-obk

bors · 2019-11-01T15:10:56Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 01e5d91 to master...

rust-highfive assigned michaelwoerister Oct 23, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 23, 2019

eddyb mentioned this pull request Oct 23, 2019

rustc: move debug info from LocalDecl and UpvarDecl into a dedicated VarDebugInfo. #56231

Merged

oli-obk reviewed Oct 23, 2019

View reviewed changes

src/librustc_codegen_ssa/mir/debuginfo.rs Outdated Show resolved Hide resolved

src/librustc_codegen_ssa/mir/debuginfo.rs Outdated Show resolved Hide resolved

src/librustc_codegen_ssa/mir/debuginfo.rs Outdated Show resolved Hide resolved

eddyb force-pushed the codegen-var-debuginfo branch from b2e82f6 to 82e659b Compare October 23, 2019 11:55

This comment has been minimized.

Sign in to view

eddyb force-pushed the codegen-var-debuginfo branch from 82e659b to 317e35a Compare October 24, 2019 17:02

This comment has been minimized.

Sign in to view

eddyb force-pushed the codegen-var-debuginfo branch from 317e35a to 2994186 Compare October 26, 2019 01:56

rust-highfive assigned nikomatsakis and unassigned michaelwoerister Oct 29, 2019

nikomatsakis approved these changes Oct 29, 2019

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 29, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 30, 2019

This comment has been minimized.

Sign in to view

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 31, 2019

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 31, 2019

eddyb added 7 commits October 31, 2019 20:00

rustc_codegen_ssa: move debuginfo-related things to a new mir::debugi…

5059a3c

…nfo module.

rustc_codegen_ssa: move local variable debuginfo to mir::debuginfo.

c58e6b5

rustc_codegen_ssa: move all set_var_name calls to mir::debuginfo.

5f4ee36

rustc_codegen_ssa: change set_var_name back to taking a &str.

06869b8

rustc_codegen_ssa: move debuginfo scopes into FunctionDebugContext.

c2e7743

rustc_codegen_ssa: hide address ops from the declare_local interface.

1e42072

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen.

60a2266

eddyb force-pushed the codegen-var-debuginfo branch from 2994186 to 60a2266 Compare October 31, 2019 18:44

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 31, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 1, 2019

bors merged commit 60a2266 into rust-lang:master Nov 1, 2019

eddyb deleted the codegen-var-debuginfo branch November 1, 2019 15:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. #65718

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. #65718

eddyb commented Oct 23, 2019

This comment has been minimized.

eddyb commented Oct 24, 2019

This comment has been minimized.

eddyb commented Oct 29, 2019

nikomatsakis Oct 29, 2019

nikomatsakis commented Oct 29, 2019

bors commented Oct 29, 2019

nikomatsakis commented Oct 29, 2019

eddyb commented Oct 30, 2019

bors commented Oct 30, 2019

bors commented Oct 31, 2019

This comment has been minimized.

This comment has been minimized.

eddyb commented Oct 31, 2019 •

edited

Loading

alexcrichton commented Oct 31, 2019

tlively commented Oct 31, 2019

eddyb commented Oct 31, 2019

eddyb commented Oct 31, 2019

bors commented Oct 31, 2019

bors commented Nov 1, 2019

bors commented Nov 1, 2019

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. #65718

rustc_codegen_ssa: introduce MIR VarDebugInfo, but only for codegen. #65718

Conversation

eddyb commented Oct 23, 2019

This comment has been minimized.

eddyb commented Oct 24, 2019

This comment has been minimized.

eddyb commented Oct 29, 2019

nikomatsakis Oct 29, 2019

Choose a reason for hiding this comment

nikomatsakis commented Oct 29, 2019

bors commented Oct 29, 2019

nikomatsakis commented Oct 29, 2019

eddyb commented Oct 30, 2019

bors commented Oct 30, 2019

bors commented Oct 31, 2019

This comment has been minimized.

This comment has been minimized.

eddyb commented Oct 31, 2019 • edited Loading

alexcrichton commented Oct 31, 2019

tlively commented Oct 31, 2019

eddyb commented Oct 31, 2019

eddyb commented Oct 31, 2019

bors commented Oct 31, 2019

bors commented Nov 1, 2019

bors commented Nov 1, 2019

eddyb commented Oct 31, 2019 •

edited

Loading