Correctly get source for metatdata-only crate type #40542

abonander · 2017-03-15T08:33:55Z

However, I'm not sure how to approach writing a regression test since I'm still working on a reduced test case from the code that caused the ICE in the first place. It's not enough to have an unknown extern crate in a metadata crate, it depends on a few extra arguments but I'm not sure which yet.

Also replaced the unwrap() with a more informative expect().

r? @jseyfried

arielb1 · 2017-03-16T20:43:37Z

Test please.

nikomatsakis · 2017-03-16T20:43:39Z

Marking as beta-nominated since this affects the current beta.

nikomatsakis · 2017-03-16T20:50:41Z

Marking as beta-accepted, once it is r+'d of course (and yes, with test plz).

abonander · 2017-03-16T21:06:45Z

Okay, so I've got a minimal case here, involving three crates, foo, bar, baz:

Crate foo depends on bar but declares both extern crate bar and extern crate baz
Crate bar depends on baz and declares extern crate baz.
cargo check on foo produces the ICE; cargo build or any missing extern crate just produces the "unknown crate baz" error.

I know about auxiliary builds but how do I force the --emit=metadata flag and have one auxiliary crate depend on another?

abonander · 2017-03-16T21:09:13Z

I've posted the reproduction at https://github.com/abonander/rust-issue-40535

arielb1 · 2017-03-16T21:12:16Z

You can create a run-make test (see src/test/run-make).

abonander · 2017-03-16T21:13:04Z

@arielb1 Can that include Cargo invocations or do I have to write out the commands manually?

abonander · 2017-03-16T21:15:14Z

Eh I can just copy the output of cargo check -v.

abonander · 2017-03-16T21:49:20Z

Regression test pushed, it detects the error and confirms the fix correctly (fails on ICE, succeeds otherwise)

jseyfried

Thanks! r=me modulo comment

jseyfried · 2017-03-16T21:51:28Z

src/test/run-make/issue-40535/Makefile

+ $(RUSTC) bar.rs --emit=metadata --extern baz=libbaz.rmeta
+ $(RUSTC) foo.rs --emit=metadata -L dependency=. --extern bar=libbar.rmeta 2>&1 | \
+ grep -vq "unexpectedly panicked"
+ # ^ Succeeds if it doesn't find the ICE message


nit: add trailing newline (all new files)

I really gotta figure out how to get IDEA to add those automatically, it's so easy to forget.

abonander · 2017-03-16T21:55:04Z

@jseyfried 👍

jseyfried · 2017-03-16T21:55:37Z

@bors r+

bors · 2017-03-16T21:55:38Z

📌 Commit e670335 has been approved by jseyfried

abonander · 2017-03-17T08:35:30Z

error: could not write output to baz.crate.metadata.o: Read-only file system

Not sure how to fix this.

jseyfried · 2017-03-17T08:40:34Z

@abonander The run-make tests can only write in $(TMPDIR).
Note that $(RUSTC) outputs to $(TMPDIR) by default.

abonander · 2017-03-17T08:48:10Z

Why is it not writing there now then? Weird.

jseyfried · 2017-03-17T08:51:29Z

Not sure -- looks like --emit=metadata isn't respecting --out-dir.
cc @nrc

arielb1 · 2017-03-17T11:07:04Z

@bors r-

abonander · 2017-03-18T00:01:01Z

I'm testing explicitly adding --out-dir=$(TMPDIR) to see if it fixes it, I'll squash it down if it works.

jseyfried · 2017-03-18T00:11:07Z

src/test/run-make/issue-40535/Makefile

- $(RUSTC) baz.rs --emit=metadata
- $(RUSTC) bar.rs --emit=metadata --extern baz=libbaz.rmeta
- $(RUSTC) foo.rs --emit=metadata -L dependency=. --extern bar=libbar.rmeta 2>&1 | \
+ $(RUSTC) baz.rs --emit=metadata --out-dir=$(TMPDIR)


--out-dir=$(TMPDIR) is already included in $(RUSTC), would be very strange if adding it again here made a difference...

It may need to be after --emit=metadata, because that's how Cargo writes the command.

abonander · 2017-03-18T01:44:52Z

@jseyfried Tests passed this time. I guess --emit=metadata overrides any --out-dir that appears before it, for some reason.

alexcrichton · 2017-03-18T16:39:02Z

@bors: r=jseyfried

What weird bug!

bors · 2017-03-18T16:39:03Z

📌 Commit 3cbdb8f has been approved by jseyfried

abonander · 2017-03-18T16:44:47Z

@bors r-

Let me take care of that "(squash me!) ..." commit first, unless you don't care about that showing up in the commit history (which would be pretty funny to come across later, I guess).

abonander · 2017-03-18T16:48:10Z

Should I leave a FIXME in the Makefile pointing to the issue I opened about --emit and --out-dir?

jseyfried · 2017-03-18T22:19:55Z

src/test/run-make/issue-40535/Makefile

+all:
+ $(RUSTC) baz.rs --emit=metadata --out-dir=$(TMPDIR)
+ $(RUSTC) bar.rs --emit=metadata --extern baz=$(TMPDIR)/libbaz.rmeta --out-dir=$(TMPDIR)
+ $(RUSTC) foo.rs --emit=metadata -L dependency=. --extern bar=$(TMPDIR)/libbar.rmeta --out-dir=$(TMPDIR) 2>&1 | \


I don't think -L dependency=. has any effect here.

Ah, it seemed to before, but now it's fine.

jseyfried · 2017-03-18T22:24:32Z

@abonander

Should I leave a FIXME in the Makefile pointing to the issue I opened about --emit and --out-dir?

Sure, I'd at least cc the issue -- if I came across this code I'd probably be curious about the --out-dir=$(TMPDIR).

@bors delegate=abonander

bors · 2017-03-18T22:24:32Z

✌️ @abonander can now approve this pull request

abonander · 2017-03-19T02:23:04Z

@bors: r=jseyfried

Tested it locally, forgot to push before I went out for dinner.

bors · 2017-03-19T02:23:05Z

📌 Commit 74d6cce has been approved by jseyfried

[beta] Backports and version bump This PR backports these PRs to beta: * #40583 * #40398 * #40542 and it also includes a version bump to push out a beta with all recent backports.

bors · 2017-03-21T19:35:35Z

🔒 Merge conflict

replace `unwrap()` with `expect()`

bstrie · 2017-03-21T21:02:33Z

@bors r=jseyfried

bors · 2017-03-21T21:02:33Z

📌 Commit 8a6ef50 has been approved by jseyfried

@jseyfried

Correctly get source for metatdata-only crate type Closes rust-lang#40535 However, I'm not sure how to approach writing a regression test since I'm still working on a reduced test case from the code that caused the ICE in the first place. It's not enough to have an unknown `extern crate` in a metadata crate, it depends on a few extra arguments but I'm not sure which yet. Also replaced the `unwrap()` with a more informative `expect()`. r? @jseyfried

Rollup of 6 pull requests - Successful merges: #39891, #40518, #40542, #40617, #40678, #40696 - Failed merges:

infinity0 · 2017-10-17T11:53:06Z

This test is failing on 1.21.0 on Debian on amd64 and ppc64el:

/<<BUILDDIR>>/rustc-1.21.0+dfsg1/build/x86_64-unknown-linux-gnu/stage2/bin/rustc: error while loading shared libraries: librustc_driver-ec7cf42bd86068a6.so: cannot open shared object file: No such file or directory
make[2]: *** [all] Error 127

Any clue what's causing it?

rust-highfive assigned jseyfried Mar 15, 2017

abonander changed the title ~~Correctly get source for metadata crate type~~ Correctly get source for metatdata-only crate type Mar 15, 2017

arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 16, 2017

jseyfried added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 16, 2017

nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 16, 2017

jseyfried approved these changes Mar 16, 2017

View reviewed changes

abonander force-pushed the issue_40535 branch from ea9b530 to e670335 Compare March 16, 2017 21:54

jseyfried reviewed Mar 18, 2017

View reviewed changes

abonander mentioned this pull request Mar 18, 2017

--emit=metadata appears to override --out-dir if the latter is supplied first #40623

Closed

abonander force-pushed the issue_40535 branch from 3cbdb8f to 215ebfa Compare March 18, 2017 16:54

jseyfried reviewed Mar 18, 2017

View reviewed changes

abonander force-pushed the issue_40535 branch from 215ebfa to 74d6cce Compare March 19, 2017 02:19

alexcrichton mentioned this pull request Mar 20, 2017

[beta] Backports and version bump #40675

Merged

brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 20, 2017

abonander added 2 commits March 21, 2017 16:34

Correctly get source for metadata crate type;

a906d99

replace `unwrap()` with `expect()`

Regression test for rust-lang#40535

8a6ef50

retep998 force-pushed the issue_40535 branch from 74d6cce to 8a6ef50 Compare March 21, 2017 20:35

frewsxcv mentioned this pull request Mar 23, 2017

Rollup of 6 pull requests #40752

Merged

bors added a commit that referenced this pull request Mar 23, 2017

Auto merge of #40752 - frewsxcv:rollup, r=frewsxcv

7c7753d

Rollup of 6 pull requests - Successful merges: #39891, #40518, #40542, #40617, #40678, #40696 - Failed merges:

bors merged commit 8a6ef50 into rust-lang:master Mar 23, 2017

This was referenced Mar 25, 2017

Compiler panic when running 'cargo check' with missing crate #40757

Closed

cargo build && cargo check cause "the compiler unexpectedly panicked" #40755

Closed

Correctly get source for metatdata-only crate type #40542

Correctly get source for metatdata-only crate type #40542

Conversation

abonander commented Mar 15, 2017 • edited Loading

arielb1 commented Mar 16, 2017

nikomatsakis commented Mar 16, 2017

nikomatsakis commented Mar 16, 2017

abonander commented Mar 16, 2017 • edited Loading

abonander commented Mar 16, 2017

arielb1 commented Mar 16, 2017

abonander commented Mar 16, 2017

abonander commented Mar 16, 2017

abonander commented Mar 16, 2017

jseyfried left a comment

Choose a reason for hiding this comment

jseyfried Mar 16, 2017

Choose a reason for hiding this comment

abonander Mar 16, 2017

Choose a reason for hiding this comment

abonander commented Mar 16, 2017

jseyfried commented Mar 16, 2017

bors commented Mar 16, 2017

abonander commented Mar 17, 2017

jseyfried commented Mar 17, 2017

abonander commented Mar 17, 2017

jseyfried commented Mar 17, 2017 • edited Loading

arielb1 commented Mar 17, 2017

abonander commented Mar 18, 2017

jseyfried Mar 18, 2017

Choose a reason for hiding this comment

abonander Mar 18, 2017

Choose a reason for hiding this comment

abonander Mar 18, 2017

Choose a reason for hiding this comment

abonander commented Mar 18, 2017

alexcrichton commented Mar 18, 2017

bors commented Mar 18, 2017

abonander commented Mar 18, 2017

abonander commented Mar 18, 2017

jseyfried Mar 18, 2017

Choose a reason for hiding this comment

abonander Mar 18, 2017

Choose a reason for hiding this comment

jseyfried commented Mar 18, 2017

bors commented Mar 18, 2017

abonander commented Mar 19, 2017

bors commented Mar 19, 2017

bors commented Mar 21, 2017

bstrie commented Mar 21, 2017

bors commented Mar 21, 2017

infinity0 commented Oct 17, 2017

abonander commented Mar 15, 2017 •

edited

Loading

abonander commented Mar 16, 2017 •

edited

Loading

jseyfried commented Mar 17, 2017 •

edited

Loading