Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make causal tracking lazy #51889

Merged
merged 4 commits into from
Jul 3, 2018
Merged

Make causal tracking lazy #51889

merged 4 commits into from
Jul 3, 2018

Conversation

spastorino
Copy link
Member

Closes #51710

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 28, 2018
@nikomatsakis
Copy link
Contributor

@bors try

@nikomatsakis nikomatsakis added S-waiting-on-perf Status: Waiting on a perf run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 29, 2018
@bors
Copy link
Contributor

bors commented Jun 29, 2018

⌛ Trying commit 5233a12 with merge f3375ed...

bors added a commit that referenced this pull request Jun 29, 2018
@bors
Auto merge of #51889 - spastorino:make-causal-tracking-lazy, r=<try>
f3375ed 
Make causal tracking lazy

Closes #51710

r? @nikomatsakis
@nikomatsakis
Copy link
Contributor

cc @Mark-Simulacrum — once this try build is done, would be great to get perf results

@bors
Copy link
Contributor

bors commented Jun 29, 2018

☀️ Test successful - status-travis
State: approved= try=True

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Jun 29, 2018 •
edited
Loading

cc @Mark-Simulacrum ok, bors try is done, perf run please 😁

@stokhos stokhos added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 29, 2018
@nikomatsakis nikomatsakis removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2018
@nikomatsakis
Copy link
Contributor

r=me but I'd like to see a perf run first

@Mark-Simulacrum
Copy link
Member

I think I forgot to leave a comment -- https://perf.rust-lang.org/compare.html?start=57dd722606028cafde656a66edc3206b82cd3bab&end=f3375ed0f41c0e04b61e51e54df12456d7a57bbf&stat=instructions%3Au is done.

Since perf is positive across the board, @bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 30, 2018

📌 Commit 5233a12 has been approved by nikomatsakis

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 30, 2018
@kennytm kennytm removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 1, 2018
@bors
Copy link
Contributor

bors commented Jul 1, 2018

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

@bors 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 Jul 1, 2018
@rust-highfive
Copy link
Collaborator

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:06:58]    Compiling proc_macro v0.0.0 (file:///checkout/src/libproc_macro)
[00:07:13]    Compiling syntax_ext v0.0.0 (file:///checkout/src/libsyntax_ext)
[00:12:39]    Compiling rustc_mir v0.0.0 (file:///checkout/src/librustc_mir)
[00:12:39]    Compiling rustc_typeck v0.0.0 (file:///checkout/src/librustc_typeck)
[00:12:40] error[E0252]: the name `ToRegionVid` is defined multiple times
[00:12:40]   --> librustc_mir/borrow_check/nll/constraint_generation.rs:16:5
[00:12:40]    |
[00:12:40] 13 | use borrow_check::nll::ToRegionVid;
[00:12:40]    |     ------------------------------ previous import of the trait `ToRegionVid` here
[00:12:40] ...
[00:12:40] 16 | use borrow_check::nll::ToRegionVid;
[00:12:40]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ToRegionVid` reimported here
[00:12:40]    |
[00:12:40]    = note: `ToRegionVid` must be defined only once in the type namespace of this module
[00:12:40] help: You can use `as` to change the binding name of the import
[00:12:40]    |
[00:12:40] 16 | use borrow_check::nll::ToRegionVid as OtherToRegionVid;
[00:12:40] 
[00:12:40] 
[00:12:41] error[E0603]: struct `OutlivesConstraint` is private
[00:12:41]   --> librustc_mir/borrow_check/nll/type_check/mod.rs:17:69
[00:12:41]    |
[00:12:41] 17 | use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, OutlivesConstraint, TypeTest};
[00:12:41] 
[00:12:41] 
[00:12:41] error: unused import: `borrow_check::nll::ToRegionVid`
[00:12:41]   --> librustc_mir/borrow_check/nll/constraint_generation.rs:16:5
[00:12:41]    |
[00:12:41] 16 | use borrow_check::nll::ToRegionVid;
[00:12:41]    |
[00:12:41]    = note: `-D unused-imports` implied by `-D warnings`
[00:12:41] 
[00:12:41] 
[00:12:41] error: unused import: `OutlivesConstraint`
[00:12:41]   --> librustc_mir/borrow_check/nll/type_check/mod.rs:17:69
[00:12:41]    |
[00:12:41] 17 | use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, OutlivesConstraint, TypeTest};
[00:12:41] 
[00:12:41] 
[00:12:43] error[E0599]: no method named `find_constraint` found for type `&std::rc::Rc<borrow_check::nll::region_infer::RegionInferenceContext<'_>>` in the current scope
[00:12:43]   --> librustc_mir/borrow_check/nll/explain_borrow/mod.rs:57:35
[00:12:43]    |
[00:12:43] 57 |         let region_sub = regioncx.find_constraint(borrow_region_vid, context.loc);
[00:12:43] 
[00:12:43] 
[00:12:43] error[E0599]: no method named `cause` found for type `borrow_check::nll::region_infer::values::RegionValues` in the current scope
[00:12:43]    --> librustc_mir/borrow_check/nll/region_infer/error_reporting.rs:270:35
[00:12:43]     |
[00:12:43] 270 |         self.liveness_constraints.cause(region_sub, elem)
[00:12:43]     | 
[00:12:43]     | 
[00:12:43]    ::: librustc_mir/borrow_check/nll/region_infer/values.rs:182:1
[00:12:43]     |
[00:12:43] 182 | pub(super) struct RegionValues {
[00:12:43]     | ------------------------------ method `cause` not found for this
[00:12:43]     = help: items from traits can only be used if the trait is implemented and in scope
[00:12:43]     = help: items from traits can only be used if the trait is implemented and in scope
[00:12:43]     = note: the following traits define an item `cause`, perhaps you need to implement one of them:
[00:12:43]             candidate #1: `std::error::Error`
[00:12:43]             candidate #2: `rustc::infer::lattice::LatticeDir`
[00:12:50] error: aborting due to 6 previous errors
[00:12:50] 
[00:12:50] Some errors occurred: E0252, E0599, E0603.
[00:12:50] For more information about an error, try `rustc --explain E0252`.
[00:12:50] For more information about an error, try `rustc --explain E0252`.
[00:12:50] error: Could not compile `rustc_mir`.
[00:12:50] 
[00:12:50] Caused by:
[00:12:50]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name rustc_mir librustc_mir/lib.rs --color always --error-format json --crate-type dylib --emit=dep-info,link -C prefer-dynamic -C opt-level=2 -C metadata=8fc603afb8ea9b13 -C extra-filename=-8fc603afb8ea9b13 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/release/deps --extern arena=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libarena-d45628fe21047b42.so --extern bitflags=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libbitflags-d8b3f1986e621085.rlib --extern byteorder=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libbyteorder-09e9dbd1ef48ffa5.rlib --extern either=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libeither-b51deb005c05dd3b.rlib --extern graphviz=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libgraphviz-6020508f01da724d.so --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-023d781fbd65d983.rlib --extern log_settings=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblog_settings-9c861d36e123bec8.rlib --extern polonius_engine=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libpolonius_engine-2e546cbdf217aece.rlib --extern rustc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc-1dddb0fa9d8a512f.so --extern rustc_apfloat=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_apfloat-be9737b074a8dae0.rlib --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-25582ce13d3618ea.so --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-e036f8f5b9204e52.so --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-066098b54e835a1f.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-05774896829b5d87.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-05774896829b5d87.rlib --extern syntax=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax-a1b02e0d020520ac.so --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-f36f6cb494d373be.so -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/backtrace-sys-a59a4023b81a89b2/out -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/miniz-sys-ea5907e223517cf2/out` (exit code: 101)
[00:14:18] error: build failed
[00:14:18] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:14:18] expected success, got: exit code: 101
[00:14:18] expected success, got: exit code: 101
[00:14:18] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1091:9
[00:14:18] travis_fold:end:stage0-rustc

[00:14:18] travis_time:end:stage0-rustc:start=1530485445002179018,finish=1530486008756174496,duration=563753995478


[00:14:18] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:14:18] Build completed unsuccessfully in 0:09:34
[00:14:18] make: *** [all] Error 1
[00:14:18] Makefile:28: recipe for target 'all' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1fb83dbd
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0ca3a9ea:start=1530486009363045686,finish=1530486009370277946,duration=7232260
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:00037948
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:3a5bec98
$ dmesg | grep -i kill

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
Copy link
Contributor

@bors r=

@bors
Copy link
Contributor

bors commented Jul 2, 2018

📌 Commit 71f25b4 has been approved by ``

@bors 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 Jul 2, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 2, 2018

📌 Commit 71f25b4 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Jul 3, 2018

⌛ Testing commit 71f25b4 with merge 64f8ae0...

bors added a commit that referenced this pull request Jul 3, 2018
@bors
Auto merge of #51889 - spastorino:make-causal-tracking-lazy, r=nikoma…
64f8ae0 
…tsakis

Make causal tracking lazy

Closes #51710

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Jul 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 64f8ae0 to master...

@bors bors merged commit 71f25b4 into rust-lang:master Jul 3, 2018
@pnkfelix
Copy link
Member

pnkfelix commented Sep 21, 2018 •
edited
Loading

Didn't this PR partially regress the diagnostic quality of the test for #47646 ? I'm referring in particular to this:

0957ede#diff-46590a131be6d28cb3935ef7907f3ec4L7

(and likewise here 0957ede#diff-46590a131be6d28cb3935ef7907f3ec4L14 )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@spastorino @nikomatsakis @bors @Mark-Simulacrum @rust-highfive @pnkfelix @kennytm @stokhos