rustc: Add the ability to not run dsymutil #47784

alexcrichton · 2018-01-26T18:35:29Z

This commit adds the ability for rustc to not run dsymutil by default
on OSX. A new codegen option, -Z run-dsymutil=no, was added to specify
that dsymutil should not run and instead the compiler should
unconditionally keep the object files around in a compilation if
necessary for debug information.

cc #47240

rust-highfive · 2018-01-26T18:35:32Z

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton · 2018-01-26T18:35:53Z

src/librustc_trans/back/link.rs

+/// Returns a boolean indicating whether we should preserve the object files on
+/// the filesystem for their debug information. This is often useful with
+/// split-dwarf like schemes.
+fn preserve_objects_for_their_debuginfo(sess: &Session) -> bool {


I'm sort of hoping that we can use a function like this to enable split dwarf on Linux over time as well!

alexcrichton · 2018-01-26T18:36:01Z

r? @michaelwoerister

kennytm · 2018-01-26T18:53:50Z

Would -C run-dsymutil=no cause RUST_BACKTRACE=1 to not have any line numbers?

alexcrichton · 2018-01-26T18:59:56Z

A good question and one I forgot to verify! Looks like the answer is "no" though which is a bummer!

@JohnColanduoni, out of curiosity, do you know if there's a way to get libbacktrace to relatively easily do the same logic that lldb is doing? (looking for object files in addition to the dSYM)

JohnColanduoni · 2018-01-27T00:15:43Z

@alexchrichton Not easily, it would probably make more sense to add this feature as part of a pure-Rust rewrite of libbacktrace. I didn’t know lldb had this functionality on Mac, I’ve had issues where lldb refuses to give me line numbers if Spotlight hasn’t yet indexed tbe dSYM.

alexcrichton · 2018-01-29T15:06:04Z

Ah ok, thanks for the info @JohnColanduoni! In light of that I've now switched this to a -Z flag instead of a -C flag so we can continue to tweak it. I think that we'll want this option though to play around with over time still with incremental compilation.

kennytm · 2018-02-02T08:25:43Z

src/librustc_trans/back/link.rs

@@ -77,7 +77,7 @@ pub fn get_linker(sess: &Session) -> (PathBuf, Command, Vec<(OsString, OsString)
        Command::new(linker)
    };

-    if let Some(ref linker) = sess.opts.cg.linker {
+    if let Some(ref linker) = sess.opts.debugging_opts.linker {


I think you've changed the wrong variable...

[00:18:57] error[E0609]: no field `linker` on type `rustc::session::config::DebuggingOptions` [00:18:57] --> librustc_trans/back/link.rs:80:56 [00:18:57] | [00:18:57] 80 | if let Some(ref linker) = sess.opts.debugging_opts.linker { [00:18:57] | ^^^^^^ unknown field [00:18:57] | [00:18:57] = note: available fields are: `codegen_backend`, `verbose`, `span_free_formats`, `identify_regions`, `emit_end_regions` ... and 89 others

kennytm · 2018-02-02T08:26:37Z

src/librustc_trans/back/link.rs

+    // *not* running dsymutil then the object files are the only source of truth
+    // for debug information, so we must preserve them.
+    if sess.target.target.options.is_like_osx {
+        match sess.opts.cg.run_dsymutil {


... the cg ↦ debugging_opts should be applied here 😄

[00:18:57] error[E0609]: no field `run_dsymutil` on type `rustc::session::config::CodegenOptions` [00:18:57] --> librustc_trans/back/link.rs:224:28 [00:18:57] | [00:18:57] 224 | match sess.opts.cg.run_dsymutil { [00:18:57] | ^^^^^^^^^^^^ unknown field [00:18:57] | [00:18:57] = note: available fields are: `ar`, `linker`, `link_arg`, `link_args`, `link_dead_code` ... and 28 others

BatmanAoD · 2018-02-07T17:44:49Z

@kennytm @alexcrichton Something seems odd here; GitHub isn't displaying the commits in which kennytm's review comments were resolved, if indeed they were resolved. What is the status on this? (Also, does @michaelwoerister still need to review, since kennytm already did?)

alexcrichton · 2018-02-07T19:03:40Z

Ah I think we're just waiting on review! @michaelwoerister I believe is on leave right now, but this isn't a particularly pressing PR so I'd be fine waiting.

bors · 2018-02-07T20:51:47Z

☔ The latest upstream changes (presumably #48053) made this pull request unmergeable. Please resolve the merge conflicts.

michaelwoerister

Looks good to me! Thanks, @alexcrichton!

michaelwoerister · 2018-02-12T12:14:47Z

src/librustc_trans/back/link.rs

@@ -168,7 +168,9 @@ pub(crate) fn link_binary(sess: &Session,
    if !sess.opts.cg.save_temps {
        if sess.opts.output_types.should_trans() {
            for obj in trans.modules.iter().filter_map(|m| m.object.as_ref()) {
-                remove(sess, obj);
+                if !preserve_objects_for_their_debuginfo(sess) {


Not that it makes much of a difference but this if could be pulled out of the loop, I think.

This commit adds the ability for rustc to not run `dsymutil` by default on OSX. A new codegen option, `-Z run-dsymutil=no`, was added to specify that `dsymutil` should *not* run and instead the compiler should unconditionally keep the object files around in a compilation if necessary for debug information. cc rust-lang#47240

alexcrichton · 2018-02-12T15:45:58Z

@bors: r=michaelwoerister

bors · 2018-02-12T15:45:59Z

📌 Commit 0f16eee has been approved by michaelwoerister

alexcrichton · 2018-02-12T22:51:03Z

@bors: rollup

…elwoerister rustc: Add the ability to not run dsymutil This commit adds the ability for rustc to not run `dsymutil` by default on OSX. A new codegen option, `-Z run-dsymutil=no`, was added to specify that `dsymutil` should *not* run and instead the compiler should unconditionally keep the object files around in a compilation if necessary for debug information. cc rust-lang#47240

Rollup of 14 pull requests - Successful merges: #47784, #47846, #48033, #48083, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48163, #48165, #48167 - Failed merges:

…elwoerister rustc: Add the ability to not run dsymutil This commit adds the ability for rustc to not run `dsymutil` by default on OSX. A new codegen option, `-Z run-dsymutil=no`, was added to specify that `dsymutil` should *not* run and instead the compiler should unconditionally keep the object files around in a compilation if necessary for debug information. cc rust-lang#47240

Rollup of 22 pull requests - Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035 - Failed merges:

Rollup of 23 pull requests - Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035, #48210 - Failed merges:

rust-highfive assigned estebank Jan 26, 2018

alexcrichton commented Jan 26, 2018

View reviewed changes

rust-highfive assigned michaelwoerister and unassigned estebank Jan 26, 2018

alexcrichton mentioned this pull request Jan 26, 2018

A minimal rebuild of pdb-downloader takes too long #47240

Closed

kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2018

alexcrichton force-pushed the less-dsymutil branch from 4bbc9c6 to 83c4363 Compare January 29, 2018 15:05

kennytm reviewed Feb 2, 2018

View reviewed changes

alexcrichton force-pushed the less-dsymutil branch from 83c4363 to 526feb6 Compare February 2, 2018 16:27

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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2018

alexcrichton force-pushed the less-dsymutil branch from 526feb6 to 0d89143 Compare February 7, 2018 21:26

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 9, 2018

michaelwoerister approved these changes Feb 12, 2018

View reviewed changes

alexcrichton force-pushed the less-dsymutil branch from 0d89143 to d83ddb9 Compare February 12, 2018 15:44

alexcrichton force-pushed the less-dsymutil branch from d83ddb9 to 0f16eee Compare February 12, 2018 15:45

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 12, 2018

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 12, 2018

kennytm mentioned this pull request Feb 13, 2018

Rollup of 14 pull requests #48177

Closed

kennytm mentioned this pull request Feb 14, 2018

Rollup of 23 pull requests #48203

Merged

kennytm merged commit 0f16eee into rust-lang:master Feb 15, 2018

alexcrichton deleted the less-dsymutil branch February 26, 2018 23:54

luser mentioned this pull request Mar 20, 2018

debuginfo: Add support for split-debuginfo on platforms that allow it #34651

Closed

jrmuizel mentioned this pull request May 9, 2018

Rebuilding webrender/wrench takes a long time #50584

Closed

alexcrichton mentioned this pull request Nov 23, 2020

Tracking issue for -Zrun-dsymutil #79361

Closed

rustc: Add the ability to not run dsymutil #47784

rustc: Add the ability to not run dsymutil #47784

Uh oh!

Conversation

alexcrichton commented Jan 26, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jan 26, 2018

Uh oh!

alexcrichton Jan 26, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jan 26, 2018

Uh oh!

kennytm commented Jan 26, 2018

Uh oh!

alexcrichton commented Jan 26, 2018

Uh oh!

JohnColanduoni commented Jan 27, 2018

Uh oh!

alexcrichton commented Jan 29, 2018

Uh oh!

kennytm Feb 2, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton Feb 2, 2018

Choose a reason for hiding this comment

Uh oh!

kennytm Feb 2, 2018

Choose a reason for hiding this comment

Uh oh!

BatmanAoD commented Feb 7, 2018

Uh oh!

alexcrichton commented Feb 7, 2018

Uh oh!

bors commented Feb 7, 2018

Uh oh!

michaelwoerister left a comment

Choose a reason for hiding this comment

Uh oh!

michaelwoerister Feb 12, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

alexcrichton commented Feb 12, 2018

Uh oh!

Uh oh!

alexcrichton commented Jan 26, 2018 •

edited

Loading