Add polonius compare mode by spastorino · Pull Request #51138 · rust-lang/rust

spastorino · 2018-05-28T18:28:44Z

This is now ready to review/merge

rust-highfive · 2018-05-28T18:28:54Z

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

nikomatsakis · 2018-05-29T00:08:05Z

Hmm, this is a bit more hard-coded than I expected, but I imagine it does the right thing.

Maybe it's not worth making a super general mechanism here, given that we'll hopefully be removing polonius and nll "soon".

What I expected was some kind of table where, for each compare-mode, we specify a "parent" mode (which may be None for nll) — and we iterate through modes, walking to their parents (and ultimately to a None mode) — looking for a path that exists.

nikomatsakis · 2018-05-29T00:14:38Z

There appears to be some very similar logic a few lines below:
https://github.com/spastorino/rust/blob/fb2a51225f26f8acf39e482d916f112265c81d35/src/bootstrap/test.rs#L1136-L1143
It seems like there is a compare_mode that comes from the test directory configuration as well as one (now) that you have added to builder.config.cmd. Perhaps we want to just change this line to something like this:
let compare_mode = builder.config.cmd.compare_mode().or(self.compare_mode);
(This is giving precedence to the --compare-mode option from the command line, which seems appropriate.)
(Alternatively, we could error if compare-mode is given both in the command line and the test suite definition; I think that the latter (test suite) can only occur when running ./x.py test, in which case the command line probably ought not to be in use.)

michaelwoerister · 2018-05-29T07:33:39Z

r? @nikomatsakis

spastorino · 2018-05-29T17:02:54Z

Have just force pushed this again. Still needs #51133 merged.

pnkfelix · 2018-05-29T20:58:56Z

@bors r+

bors · 2018-05-29T20:58:57Z

📌 Commit 74d48ed has been approved by pnkfelix

bors · 2018-05-30T16:33:50Z

🔒 Merge conflict

nikomatsakis · 2018-05-30T17:07:56Z

@bors r=pnkfelix

bors · 2018-05-30T17:07:57Z

📌 Commit a73b4d7 has been approved by pnkfelix

rust-highfive · 2018-05-30T17:11:07Z

The job x86_64-gnu-llvm-3.9 of 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.

[00:02:03] Compiling bootstrap v0.0.0 (file:///checkout/src/bootstrap)
[00:02:06] error[E0308]: mismatched types
[00:02:06] --> bootstrap/test.rs:1004:65
[00:02:06] |
[00:02:06] 1004 | let compare_mode = builder.config.cmd.compare_mode().or(self.compare_mode);
[00:02:06] |
[00:02:06] |
[00:02:06] = note: expected type `std::option::Option<&std::string::String>`
[00:02:06] found type `std::option::Option<&'static str>`
[00:02:08] error: aborting due to previous error
[00:02:08] [00:02:08] For more information about this error, try `rustc --explain E0308`.
[00:02:08] For more information about this error, try `rustc --explain E0308`.
[00:02:08] error: Could not compile `bootstrap`.
[00:02:08] To learn more, run the command again with --verbose.
[00:02:08] To learn more, run the command again with --verbose.
[00:02:08] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:08] Build completed unsuccessfully in 0:01:09
[00:02:08] make: *** [prepare] Error 1
[00:02:08] Makefile:81: recipe for target 'prepare' failed
[00:02:09] Compiling bootstrap v0.0.0 (file:///checkout/src/bootstrap)
[00:02:12] error[E0308]: mismatched types
[00:02:12] --> bootstrap/test.rs:1004:65
[00:02:12] |
[00:02:12] |
[00:02:12] 1004 | let compare_mode = builder.config.cmd.compare_mode().or(self.compare_mode);
[00:02:12] |
[00:02:12] |
[00:02:12] = note: expected type `std::option::Option<&std::string::String>`
[00:02:12] found type `std::option::Option<&'static str>`
[00:02:14] error: aborting due to previous error
[00:02:14] [00:02:14] For more information about this error, try `rustc --explain E0308`.
[00:02:14] For more information about this error, try `rustc --explain E0308`.
[00:02:14] error: Could not compile `bootstrap`.
[00:02:14] To learn more, run the command again with --verbose.
[00:02:14] To learn more, run the command again with --verbose.
[00:02:14] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:14] Build completed unsuccessfully in 0:00:04
[00:02:14] Makefile:81: recipe for target 'prepare' failed
[00:02:14] make: *** [prepare] Error 1
[00:02:16] Compiling bootstrap v0.0.0 (file:///checkout/src/bootstrap)
[00:02:19] error[E0308]: mismatched types
[00:02:19] --> bootstrap/test.rs:1004:65
[00:02:19] |
[00:02:19] |
[00:02:19] 1004 | let compare_mode = builder.config.cmd.compare_mode().or(self.compare_mode);
[00:02:19] |
[00:02:19] |
[00:02:19] = note: expected type `std::option::Option<&std::string::String>`
[00:02:19] found type `std::option::Option<&'static str>`
[00:02:21] error: aborting due to previous error
[00:02:21] [00:02:21] For more information about this error, try `rustc --explain E0308`.
[00:02:21] For more information about this error, try `rustc --explain E0308`.
[00:02:21] error: Could not compile `bootstrap`.
[00:02:21] To learn more, run the command again with --verbose.
[00:02:21] To learn more, run the command again with --verbose.
[00:02:21] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:21] Build completed unsuccessfully in 0:00:05
[00:02:21] make: *** [prepare] Error 1
[00:02:21] Makefile:81: recipe for target 'prepare' failed
[00:02:24] Compiling bootstrap v0.0.0 (file:///checkout/src/bootstrap)
[00:02:27] error[E0308]: mismatched types
[00:02:27] --> bootstrap/test.rs:1004:65
[00:02:27] |
[00:02:27] |
[00:02:27] 1004 | let compare_mode = builder.config.cmd.compare_mode().or(self.compare_mode);
[00:02:27] |
[00:02:27] |
[00:02:27] = note: expected type `std::option::Option<&std::string::String>`
[00:02:27] found type `std::option::Option<&'static str>`
[00:02:29] error: aborting due to previous error
[00:02:29] [00:02:29] For more information about this error, try `rustc --explain E0308`.
[00:02:29] For more information about this error, try `rustc --explain E0308`.
[00:02:29] error: Could not compile `bootstrap`.
[00:02:29] To learn more, run the command again with --verbose.
[00:02:29] To learn more, run the command again with --verbose.
[00:02:29] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:29] Build completed unsuccessfully in 0:00:05
[00:02:29] make: *** [prepare] Error 1
[00:02:29] Makefile:81: recipe for target 'prepare' failed
[00:02:33] Compiling bootstrap v0.0.0 (file:///checkout/src/bootstrap)
[00:02:36] error[E0308]: mismatched types
[00:02:36] --> bootstrap/test.rs:1004:65
[00:02:36] |
[00:02:36] |
[00:02:36] 1004 | let compare_mode = builder.config.cmd.compare_mode().or(self.compare_mode);
[00:02:36] |
[00:02:36] |
[00:02:36] = note: expected type `std::option::Option<&std::string::String>`
[00:02:36] found type `std::option::Option<&'static str>`
[00:02:38] error: aborting due to previous error
[00:02:38] [00:02:38] For more information about this error, try `rustc --explain E0308`.
[00:02:38] For more information about this error, try `rustc --explain E0308`.
[00:02:39] error: Could not compile `bootstrap`.
[00:02:39] To learn more, run the command again with --verbose.
[00:02:39] To learn more, run the command again with --verbose.
[00:02:39] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:39] Build completed unsuccessfully in 0:00:05
[00:02:39] Makefile:81: recipe for target 'prepare' failed
[00:02:39] make: *** [prepare] Error 1
[00:02:39] The command has failed after 5 attempts.
odules/src/jemalloc/objects
7796 ./.git/modules/src/jemalloc/objects/pack
7304 ./src/llvm/test/CodeGen/ARM
7096 ./src/llvm-emscripten/lib/Transforms
6916 ./src/llvm/test/tools/sancov
6912 ./src/llvm-emscripten/test/tools/sancov

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)

nikomatsakis · 2018-05-30T17:18:45Z

@bors r-

nikomatsakis · 2018-05-30T17:18:53Z

(Travis failure)

nikomatsakis · 2018-05-30T17:38:45Z

~~@bosr r=pnkfelix~~

sorry @bosr =)

nikomatsakis · 2018-05-30T17:39:01Z

@bors r=pnkfelix

bors · 2018-05-30T17:39:02Z

📌 Commit b39a1d6 has been approved by pnkfelix

bors · 2018-05-30T22:59:28Z

⌛ Testing commit b39a1d6 with merge e1eed38...

Add polonius compare mode **This is now ready to review/merge**

bors · 2018-05-31T01:06:25Z

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

rust-highfive assigned michaelwoerister May 28, 2018

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

nikomatsakis changed the title ~~Add polonius compare mode~~[WIP] Add polonius compare modeMay 28, 2018

spastorino force-pushed the add-polonius-compare-mode branch 2 times, most recently from 1207f82 to 539a6f0Compare May 28, 2018 22:58

nikomatsakis reviewed May 29, 2018
View reviewed changes

rust-highfive assigned nikomatsakis and unassigned michaelwoerister May 29, 2018

spastorino force-pushed the add-polonius-compare-mode branch from 539a6f0 to ecb7f52Compare May 29, 2018 17:02

spastorino force-pushed the add-polonius-compare-mode branch from ecb7f52 to c0f897dCompare May 29, 2018 18:02

spastorino changed the title ~~[WIP] Add polonius compare mode~~Add polonius compare modeMay 29, 2018

spastorino force-pushed the add-polonius-compare-mode branch from c0f897d to 74d48edCompare May 29, 2018 18:59

rust-lang deleted a comment from rust-highfive May 29, 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 May 29, 2018

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 May 30, 2018

Add polonius compare mode
9df0a41

spastorino force-pushed the add-polonius-compare-mode branch from 74d48ed to a73b4d7Compare May 30, 2018 17:06

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 May 30, 2018

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 May 30, 2018

spastorino force-pushed the add-polonius-compare-mode branch from a73b4d7 to 214c25dCompare May 30, 2018 17:34

spastorino added 2 commits May 30, 2018 14:35

Add compare-mode to x.py
b970fee

Run rustfmt
b39a1d6

spastorino force-pushed the add-polonius-compare-mode branch from 214c25d to b39a1d6Compare May 30, 2018 17:37

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 May 30, 2018

bors added a commit that referenced this pull request May 30, 2018
Auto merge of#51138- spastorino:add-polonius-compare-mode, r=pnkfelix
e1eed38
Add polonius compare mode **This is now ready to review/merge**

bors merged commit b39a1d6 into rust-lang:masterMay 31, 2018

This was referenced May 31, 2018
ship LLVM tools with the toolchain #50336
Merged
Clean up dependency tracking in Rustbuild [1/2] #50904
Merged
Skip stage 0 libstd #49119
Closed
Fix building rustc on and for musl hosts. #51063
Merged

Uh oh!

Uh oh!

Conversation

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

Uh oh!

Uh oh!

rust-highfive commented May 28, 2018

Uh oh!

nikomatsakisMay 29, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakisMay 29, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakisMay 29, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakisMay 29, 2018

Choose a reason for hiding this comment

Uh oh!

michaelwoerister commented May 29, 2018

Uh oh!

spastorino commented May 29, 2018

Uh oh!

pnkfelix commented May 29, 2018

Uh oh!

bors commented May 29, 2018

Uh oh!

bors commented May 30, 2018

Uh oh!

nikomatsakis commented May 30, 2018

Uh oh!

bors commented May 30, 2018

Uh oh!

rust-highfive commented May 30, 2018

Uh oh!

nikomatsakis commented May 30, 2018

Uh oh!

nikomatsakis commented May 30, 2018

Uh oh!

nikomatsakis commented May 30, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nikomatsakis commented May 30, 2018

Uh oh!

bors commented May 30, 2018

Uh oh!

bors commented May 30, 2018

Uh oh!

bors commented May 31, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

spastorino commented May 28, 2018•
edited
Loading

nikomatsakis commented May 30, 2018•
edited
Loading