More NodeId pruning #61984

ljedrz · 2019-06-20T09:36:00Z

Just another round of the HirIdification initiative.

rust-highfive · 2019-06-20T10:44:22Z

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

travis_time:end:0305bf38:start=1561023431806014071,finish=1561023432781729081,duration=975715010
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:05:17] 
[01:05:17] running 9 tests
[01:05:17] iiiiiiiii
[01:05:17] 
[01:05:17]  finished in 0.149
[01:05:17] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:05:33] 
[01:05:33] running 122 tests
[01:05:58] .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
[01:06:03] .i.i......iii.i.....ii
[01:06:03] 
[01:06:03]  finished in 30.047
[01:06:03] travis_fold:end:test_debuginfo

---
travis_time:start:test_run-pass-fulldeps
Check compiletest suite=run-pass-fulldeps mode=run-pass (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:06:11] 
[01:06:11] running 44 tests
[01:06:51] .......................F....................
[01:06:51] failures:
[01:06:51] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:06:51] 
[01:06:51] ---- [run-pass] run-pass-fulldeps/issue-40001.rs stdout ----
[01:06:51] ---- [run-pass] run-pass-fulldeps/issue-40001.rs stdout ----
[01:06:51] 
[01:06:51] error: auxiliary build of "/checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs" failed to compile: 
[01:06:51] status: exit code: 1
[01:06:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps/issue-40001/auxiliary" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--crate-type" "dylib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps/issue-40001/auxiliary"
[01:06:51] ------------------------------------------
[01:06:51] 
[01:06:51] ------------------------------------------
[01:06:51] stderr:
[01:06:51] stderr:
[01:06:51] ------------------------------------------
[01:06:51] warning: unused import: `syntax::ext::base::*`
[01:06:51]   --> /checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs:11:5
[01:06:51] LL | use syntax::ext::base::*;
[01:06:51]    |     ^^^^^^^^^^^^^^^^^^^^
[01:06:51]    |
[01:06:51]    = note: #[warn(unused_imports)] on by default
[01:06:51]    = note: #[warn(unused_imports)] on by default
[01:06:51] 
[01:06:51] warning: unused import: `rustc::hir::map as hir_map`
[01:06:51]   --> /checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs:17:5
[01:06:51]    |
[01:06:51] LL | use rustc::hir::map as hir_map;
[01:06:51] 
[01:06:51] warning: unused import: `rustc::ty`
[01:06:51] warning: unused import: `rustc::ty`
[01:06:51]   --> /checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs:20:5
[01:06:51] LL | use rustc::ty;
[01:06:51]    |     ^^^^^^^^^
[01:06:51] 
[01:06:51] warning: unused import: `ast`
[01:06:51] warning: unused import: `ast`
[01:06:51]   --> /checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs:21:14
[01:06:51] LL | use syntax::{ast, source_map};
[01:06:51]    |              ^^^
[01:06:51] 
[01:06:51] error[E0599]: no method named `get_by_hir_id` found for type `&rustc::hir::map::Map<'_>` in the current scope
[01:06:51] error[E0599]: no method named `get_by_hir_id` found for type `&rustc::hir::map::Map<'_>` in the current scope
[01:06:51]   --> /checkout/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs:46:39
[01:06:51] LL |         let item = match cx.tcx.hir().get_by_hir_id(id) {
[01:06:51]    |                                       ^^^^^^^^^^^^^ help: there is a method with a similar name: `find_by_hir_id`
[01:06:51] 
[01:06:51] error: aborting due to previous error
---
[01:06:51] test result: FAILED. 43 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:06:51] 
[01:06:51] 
[01:06:51] 
[01:06:51] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-pass" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:06:51] 
[01:06:51] 
[01:06:51] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:06:51] Build completed unsuccessfully in 1:02:13
---
travis_time:end:07b02928:start=1561027457146565924,finish=1561027457151151765,duration=4585841
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0b36c8fa
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:047381ac
travis_time:start:047381ac
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:031e6198
$ 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)

ljedrz · 2019-06-20T10:47:56Z

Oof, seems like I missed a test. And need to rebase already ^^.

ljedrz · 2019-06-20T10:53:43Z

Rebased; I wouldn't mind a small priority bump if that's ok, due to the number of files that this PR changes.

src/librustc_save_analysis/lib.rs

ljedrz · 2019-06-21T06:59:50Z

@Zoxc Thanks for the review! Comment addressed.

Zoxc · 2019-06-21T07:11:12Z

@bors delegate+

bors · 2019-06-21T07:11:13Z

✌️ @ljedrz can now approve this pull request

ljedrz · 2019-06-21T09:35:28Z

@bors r=Zoxc

bors · 2019-06-21T09:35:29Z

📌 Commit 0a511cc has been approved by Zoxc

bors · 2019-06-21T09:35:31Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Get rid of special const intrinsic query in favour of const_eval #61626

bors · 2019-06-21T09:35:32Z

📌 Commit 0a511cc has been approved by ljedrz

bors · 2019-06-21T09:35:47Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Get rid of special const intrinsic query in favour of const_eval #61626

bors · 2019-06-21T09:35:48Z

📌 Commit 0a511cc has been approved by Zoxc

@Zoxc

More NodeId pruning Just another round of the `HirId`ification initiative. r? @Zoxc

@Zoxc

More NodeId pruning Just another round of the `HirId`ification initiative. r? @Zoxc

@Zoxc

More NodeId pruning Just another round of the `HirId`ification initiative. r? @Zoxc

@ghost

Rollup of 9 pull requests Successful merges: - #60971 (Add DocFS layer to rustdoc) - #61146 (SliceConcatExt::connect defaults to calling join) - #61181 (Fix theme-checker failure) - #61267 (rustc-book: Update the rustc/clang compatibility table for xLTO.) - #61270 (Remove warnings about incr. comp. generating less debugging output.) - #61681 (Changed the error message to more clearly explain what is allowed) - #61984 (More NodeId pruning) - #62016 (Add test for issue-27697) - #62019 (Remove needless lifetimes) Failed merges: r? @ghost

Fix fallout cause NodeId pruning Rustup rust-lang/rust#61984 changelog: none

rust-highfive assigned Zoxc Jun 20, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 20, 2019

ljedrz added 11 commits June 20, 2019 12:47

replace NodeId with HirId in traits::ObligationCauseCode

4410916

remove TyCtx::expr_span (unused)

b710e08

replace NodeId with HirId in infer::SubregionOrigin

f6eb392

remove hir::map::name

468647c

rename hir::map::name_by_hir_id to ::name

98cc18a

make hir::def_kind work with HirId

3ed7585

remove definitions::def_index_to_node_id (unused)

21e63dd

remove uses of the NodeId hir::map::expr

2d1e223

rename hir::map::expect_expr_by_hir_id to expect_expr

fe044a8

make blocks::Code work with HirId

ae72c91

remove hir::map::get

a64456e

ljedrz force-pushed the more_node_id_pruning branch from 21ff86d to f3a4e4b Compare June 20, 2019 10:47

rename hir::map::get_by_hir_id to get

73cb9ab

ljedrz force-pushed the more_node_id_pruning branch from f3a4e4b to 73cb9ab Compare June 20, 2019 10:52

Zoxc reviewed Jun 20, 2019

View reviewed changes

src/librustc_save_analysis/lib.rs Outdated Show resolved Hide resolved

revert the NodeId to HirId parameter change to get_path_res

0a511cc

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 Jun 21, 2019

Centril added a commit to Centril/rust that referenced this pull request Jun 21, 2019

Rollup merge of rust-lang#61984 - ljedrz:more_node_id_pruning, r=Zoxc

912ab3a

More NodeId pruning Just another round of the `HirId`ification initiative. r? @Zoxc

Centril mentioned this pull request Jun 21, 2019

Rollup of 8 pull requests #62032

Closed

Centril added a commit to Centril/rust that referenced this pull request Jun 21, 2019

Rollup merge of rust-lang#61984 - ljedrz:more_node_id_pruning, r=Zoxc

3945174

More NodeId pruning Just another round of the `HirId`ification initiative. r? @Zoxc

Centril mentioned this pull request Jun 21, 2019

Rollup of 10 pull requests #62035

Closed

Centril added a commit to Centril/rust that referenced this pull request Jun 21, 2019

Rollup merge of rust-lang#61984 - ljedrz:more_node_id_pruning, r=Zoxc

dc0ef82

More NodeId pruning Just another round of the `HirId`ification initiative. r? @Zoxc

Centril mentioned this pull request Jun 21, 2019

Rollup of 9 pull requests #62041

Merged

bors merged commit 0a511cc into rust-lang:master Jun 22, 2019

tesuji mentioned this pull request Jun 22, 2019

Fix fallout cause NodeId pruning rust-lang/rust-clippy#4227

Merged

ljedrz deleted the more_node_id_pruning branch June 22, 2019 07:00

bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 22, 2019

Auto merge of #4227 - lzutao:node-pruning, r=flip1995

141c864

Fix fallout cause NodeId pruning Rustup rust-lang/rust#61984 changelog: none

bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 22, 2019

Auto merge of #4227 - lzutao:node-pruning, r=flip1995

6f82ea5

Fix fallout cause NodeId pruning Rustup rust-lang/rust#61984 changelog: none

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More NodeId pruning #61984

More NodeId pruning #61984

ljedrz commented Jun 20, 2019

rust-highfive commented Jun 20, 2019

ljedrz commented Jun 20, 2019 •

edited

Loading

ljedrz commented Jun 20, 2019 •

edited

Loading

ljedrz commented Jun 21, 2019

Zoxc commented Jun 21, 2019

bors commented Jun 21, 2019

ljedrz commented Jun 21, 2019 •

edited

Loading

bors commented Jun 21, 2019

bors commented Jun 21, 2019

bors commented Jun 21, 2019

bors commented Jun 21, 2019

bors commented Jun 21, 2019

More NodeId pruning #61984

More NodeId pruning #61984

Conversation

ljedrz commented Jun 20, 2019

rust-highfive commented Jun 20, 2019

ljedrz commented Jun 20, 2019 • edited Loading

ljedrz commented Jun 20, 2019 • edited Loading

ljedrz commented Jun 21, 2019

Zoxc commented Jun 21, 2019

bors commented Jun 21, 2019

ljedrz commented Jun 21, 2019 • edited Loading

bors commented Jun 21, 2019

bors commented Jun 21, 2019

bors commented Jun 21, 2019

bors commented Jun 21, 2019

bors commented Jun 21, 2019

ljedrz commented Jun 20, 2019 •

edited

Loading

ljedrz commented Jun 20, 2019 •

edited

Loading

ljedrz commented Jun 21, 2019 •

edited

Loading