Make --emit=metadata output metadata regardless of link by varkor · Pull Request #49289 · rust-lang/rust

varkor · 2018-03-23T00:00:14Z

Fixes#40109. I'm not sure whether this condition was important here or not, but I can't see why it is required (removing it doesn't cause the error the comment warns about, so I'm assuming it's safe). If this is too heavy-handed, I can special-case on OutputType::Metadata.

r? @nrc

emilyalbini · 2018-03-26T14:22:16Z

Ping from triage @nrc! This PR needs your review.

quxiaolong1504 · 2018-03-26T14:24:51Z

LGTM

nrc · 2018-03-28T16:25:51Z

- if (sess.opts.debugging_opts.no_trans ||
- !sess.opts.output_types.should_trans()) &&
- crate_type == config::CrateTypeExecutable {
+ if sess.opts.debugging_opts.no_trans && crate_type == config::CrateTypeExecutable {


I'm not sure that this is correct. This loop goes on to link the code units which have been generated, but if we are in !sess.opts.output_types.should_trans() mode, then there should be no code units to link. Also I think it is odd that emit=metadata and -Ztrans would have different behaviour, which is what is happening now.
However, it has been a long time since I wrote this, so I'm not really sure what should be done, sorry

Would you find it acceptable just to special-case !sess.opts.output_types.should_trans() && !sess.opts.output_types.contains_key(&OutputType::Metadata) as a quick fix for now?

I'm really not sure, sorry. ping @rust-lang/compiler anybody know about this code?

emilyalbini · 2018-04-09T09:57:26Z

Ping from triage @nrc! The author pushed new commits addressing your concerns, can you review this PR again?

varkor · 2018-04-09T13:39:35Z

@pietroalbini: there was a follow-up comment, but it was hidden here. Someone else from the compiler team should probably review instead.

r? @michaelwoerister

michaelwoerister · 2018-04-10T08:23:37Z

+ let output_metadata = sess.opts.output_types.contains_key(&OutputType::Metadata);
+ let ignore_executable = sess.opts.debugging_opts.no_trans ||
+ !(sess.opts.output_types.should_trans() || output_metadata);
+ if crate_type == config::CrateTypeExecutable && ignore_executable {


For some reason I find this condition really hard to read.

Could you do the following?
let output_metadata = sess.opts.output_types.contains_key(&OutputType::Metadata);if(sess.opts.debugging_opts.no_trans || !sess.opts.output_types.should_trans()) && !output_metadata && crate_type == config::CrateTypeExecutable{continue;}

michaelwoerister · 2018-04-13T09:44:17Z

@bors r+

Thanks, @varkor!

bors · 2018-04-13T09:44:18Z

📌 Commit 7575d96 has been approved by michaelwoerister

…r=michaelwoerister Make --emit=metadata output metadata regardless of link Fixesrust-lang#40109. I'm not sure whether this condition was important here or not, but I can't see why it is required (removing it doesn't cause the error the comment warns about, so I'm assuming it's safe). If this is too heavy-handed, I can special-case on `OutputType::Metadata`.

bors · 2018-04-14T01:24:29Z

⌛ Testing commit 7575d96 with merge 441363cbacfdb6ddf6e905f1e6b356ba004f326e...

bors · 2018-04-14T01:28:09Z

💔 Test failed - status-travis

rust-highfive · 2018-04-14T01:28:11Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

An error occurred while generating the build script.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2018-04-14T01:28:14Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

An error occurred while generating the build script.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

kennytm · 2018-04-14T07:10:12Z

@bors retry p=6

Travis bug.

bors · 2018-04-14T10:27:11Z

⌛ Testing commit 7575d96 with merge cfc3465...

@nrc

…erister Make --emit=metadata output metadata regardless of link Fixes#40109. I'm not sure whether this condition was important here or not, but I can't see why it is required (removing it doesn't cause the error the comment warns about, so I'm assuming it's safe). If this is too heavy-handed, I can special-case on `OutputType::Metadata`. r? @nrc

bors · 2018-04-14T13:11:19Z

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing cfc3465 to master...

In rust-lang#49289, rustc was changed to emit metadata for binaries, which made it so that the librustc.rmeta file created when compiling librustc was overwritten by the rustc-main compilation. This commit renames the rustc-main binary to avoid this problem. rust-lang/cargo#5524 has also been filed to see if Cargo can learn to warn on this situation instead of leaving it for the user to debug.

Make --emit=metadata output metadata regardless of link
2a5f3ee

rust-highfive assigned nrc Mar 23, 2018

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

nrc reviewed Mar 28, 2018
View reviewed changes

Special-case OutputType::Metadata
8056506

rust-highfive assigned michaelwoerister and unassigned nrc Apr 9, 2018

michaelwoerister reviewed Apr 10, 2018
View reviewed changes

Reformat trans skip condition
7575d96

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 Apr 13, 2018

kennytm mentioned this pull request Apr 13, 2018
Rollup of 11 pull requests #49924
Closed

kennytm mentioned this pull request Apr 13, 2018
Rollup of 14 pull requests #49939
Merged

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

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 Apr 14, 2018

bors merged commit 7575d96 into rust-lang:masterApr 14, 2018

varkor deleted the emit-metadata-without-link branch April 14, 2018 16:32

This was referenced Apr 22, 2018
Profile Overrides (RFC #2282 Part 1) rust-lang/cargo#5384
Merged
Spurious libtest.rmeta file generated #50289
Closed

alexcrichton mentioned this pull request May 2, 2018
cargo check no longer shows warnings unconditionally rust-lang/cargo#5455
Closed

Mark-Simulacrum mentioned this pull request May 12, 2018
Warn on duplicate artifact creation rust-lang/cargo#5524
Closed

Mark-Simulacrum mentioned this pull request May 12, 2018
Switch to bootstrapping from 1.27 #50629
Merged

ehuss mentioned this pull request Mar 11, 2020
dep-info rmeta path is wrong #68839
Closed

Uh oh!

Uh oh!

Conversation

varkor commented Mar 23, 2018

Uh oh!

emilyalbini commented Mar 26, 2018

Uh oh!

quxiaolong1504 commented Mar 26, 2018

Uh oh!

nrcMar 28, 2018

Choose a reason for hiding this comment

Uh oh!

varkorMar 28, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nrcApr 5, 2018

Choose a reason for hiding this comment

Uh oh!

emilyalbini commented Apr 9, 2018

Uh oh!

varkor commented Apr 9, 2018

Uh oh!

michaelwoeristerApr 10, 2018

Choose a reason for hiding this comment

Uh oh!

michaelwoeristerApr 10, 2018

Choose a reason for hiding this comment

Uh oh!

michaelwoerister commented Apr 13, 2018

Uh oh!

bors commented Apr 13, 2018

Uh oh!

bors commented Apr 14, 2018

Uh oh!

bors commented Apr 14, 2018

Uh oh!

rust-highfive commented Apr 14, 2018

Uh oh!

rust-highfive commented Apr 14, 2018

Uh oh!

kennytm commented Apr 14, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Apr 14, 2018

Uh oh!

bors commented Apr 14, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

varkorMar 28, 2018•
edited
Loading

kennytm commented Apr 14, 2018•
edited
Loading