Fix save-analysis generation with extern_in_paths/extern_absolute_paths #49847

sinkuu · 2018-04-10T17:19:55Z

petrochenkov · 2018-04-12T20:11:44Z

src/librustc_metadata/creader.rs

+            cmp::Reverse(match src {
+                ExternCrateSource::Extern { path_len, .. } |
+                ExternCrateSource::Use { path_len } => path_len,
+                _ => usize::max_value(),


It looks like it'd be more convenient to move path_len into ExternCrate and initialize it to usize::max_value() for ExternCrateSource::Path.
(Maybe some better heuristic than max_value could be found later).

petrochenkov · 2018-04-12T20:12:40Z

r=me after addressing the comment

petrochenkov · 2018-04-13T08:50:44Z

@bors r+

bors · 2018-04-13T08:50:47Z

📌 Commit 2c7e83f has been approved by petrochenkov

bors · 2018-04-14T19:56:38Z

⌛ Testing commit 2c7e83f with merge c7967bb133a85653e8a27f38dc0a4fa19af9b65f...

bors · 2018-04-14T20:22:17Z

💔 Test failed - status-travis

rust-highfive · 2018-04-14T20:22:19Z

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:23:50] error: internal compiler error: librustc_save_analysis/lib.rs:117: no data for crate 7
---
[00:23:51]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name std libstd/lib.rs --color always --error-format json --crate-type dylib --crate-type rlib --emit=dep-info,link -C prefer-dynamic -C opt-level=2 --cfg feature="alloc_jemalloc" --cfg feature="backtrace" --cfg feature="jemalloc" --cfg feature="panic-unwind" --cfg feature="panic_unwind" -C metadata=d9da2a2253530287 -C extra-filename=-d9da2a2253530287 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps --target arm-unknown-linux-gnueabihf -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liblibc-9f0d372404db7b62.rlib --extern panic_unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libpanic_unwind-52658ef1dfd0bf87.rlib --extern panic_abort=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libpanic_abort-caf5925d568bdc6d.rlib --extern alloc_jemalloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liballoc_jemalloc-43e4a879336eaba6.rlib --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libcore-88a4d043878d936a.rlib --extern unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libunwind-edc4e9c4f1f2620d.rlib --extern alloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liballoc-b9e1e80353ce065e.rlib --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libcompiler_builtins-fe0d984dfcb9746e.rlib --extern std_unicode=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libstd_unicode-c4b88a51a5f32951.rlib --extern alloc_system=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liballoc_system-845a9d197171fd43.rlib -L native=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/libbacktrace/.libs -l static=backtrace -l dl -l rt -l pthread -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/build/compiler_builtins-4bdac560af2d255d/out -L native=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/jemalloc/lib` (exit code: 101)
[00:23:51] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "arm-unknown-linux-gnueabihf" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[00:23:51] expected success, got: exit code: 101
[00:23:51] travis_fold:end:stage1-std
[00:23:51] travis_time:end:stage1-std:start=1523737265129026717,finish=1523737319652099327,duration=54523072610
[00:23:51] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1085:9
---
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot access /home/travis/Library/Logs/DiagnosticReports/: No such file or directory
travis_time:end:0d769038:start=1523737320225485012,finish=1523737320234810715,duration=9325703
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:0df0e020
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: `/home/travis/Library/Logs/DiagnosticReports': No such file or directory
travis_time:end:0df0e020:start=1523737320239946248,finish=1523737320245556695,duration=5610447
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:10a8135d
$ dmesg | grep -i kill
[   10.194420] init: failsafe main process (1093) killed by TERM signal

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-14T20:22:23Z

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:23:50] error: internal compiler error: librustc_save_analysis/lib.rs:117: no data for crate 7
---
[00:23:51]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name std libstd/lib.rs --color always --error-format json --crate-type dylib --crate-type rlib --emit=dep-info,link -C prefer-dynamic -C opt-level=2 --cfg feature="alloc_jemalloc" --cfg feature="backtrace" --cfg feature="jemalloc" --cfg feature="panic-unwind" --cfg feature="panic_unwind" -C metadata=d9da2a2253530287 -C extra-filename=-d9da2a2253530287 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps --target arm-unknown-linux-gnueabihf -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liblibc-9f0d372404db7b62.rlib --extern panic_unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libpanic_unwind-52658ef1dfd0bf87.rlib --extern panic_abort=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libpanic_abort-caf5925d568bdc6d.rlib --extern alloc_jemalloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liballoc_jemalloc-43e4a879336eaba6.rlib --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libcore-88a4d043878d936a.rlib --extern unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libunwind-edc4e9c4f1f2620d.rlib --extern alloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liballoc-b9e1e80353ce065e.rlib --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libcompiler_builtins-fe0d984dfcb9746e.rlib --extern std_unicode=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/libstd_unicode-c4b88a51a5f32951.rlib --extern alloc_system=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/deps/liballoc_system-845a9d197171fd43.rlib -L native=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/libbacktrace/.libs -l static=backtrace -l dl -l rt -l pthread -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/arm-unknown-linux-gnueabihf/release/build/compiler_builtins-4bdac560af2d255d/out -L native=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/jemalloc/lib` (exit code: 101)
[00:23:51] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "arm-unknown-linux-gnueabihf" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[00:23:51] expected success, got: exit code: 101
[00:23:51] travis_fold:end:stage1-std
[00:23:51] travis_time:end:stage1-std:start=1523737265129026717,finish=1523737319652099327,duration=54523072610
[00:23:51] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1085:9
---
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot access /home/travis/Library/Logs/DiagnosticReports/: No such file or directory
travis_time:end:0d769038:start=1523737320225485012,finish=1523737320234810715,duration=9325703
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:0df0e020
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: `/home/travis/Library/Logs/DiagnosticReports': No such file or directory
travis_time:end:0df0e020:start=1523737320239946248,finish=1523737320245556695,duration=5610447
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:10a8135d
$ dmesg | grep -i kill
[   10.194420] init: failsafe main process (1093) killed by TERM signal

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)

Injected crates don't have extern info. Let's skip them.

sinkuu · 2018-04-15T12:43:05Z

Fixed.

petrochenkov · 2018-04-15T21:57:32Z

@bors r+

bors · 2018-04-15T21:57:33Z

📌 Commit c3dc014 has been approved by petrochenkov

bors · 2018-04-16T02:34:39Z

⌛ Testing commit c3dc014 with merge 748c549...

…henkov Fix save-analysis generation with extern_in_paths/extern_absolute_paths Fixes #48742.

bors · 2018-04-16T05:00:09Z

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 748c549 to master...

sinkuu added 2 commits April 11, 2018 01:17

Extend ExternCrate to cover externs inferred from use or paths

bbed61d

Add test

e986510

rust-highfive assigned petrochenkov Apr 10, 2018

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

petrochenkov reviewed Apr 12, 2018

View reviewed changes

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2018

Move path_len to ExternCrate

2c7e83f

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

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

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 15, 2018

Check generated save-analysis, instead of bug!()ing

c3dc014

Injected crates don't have extern info. Let's skip them.

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

bors added a commit that referenced this pull request Apr 16, 2018

Auto merge of #49847 - sinkuu:save_analysis_implicit_extern, r=petroc…

748c549

…henkov Fix save-analysis generation with extern_in_paths/extern_absolute_paths Fixes #48742.

bors merged commit c3dc014 into rust-lang:master Apr 16, 2018

sinkuu deleted the save_analysis_implicit_extern branch April 16, 2018 07:20

pnkfelix mentioned this pull request Dec 3, 2018

NLL error on closure, but not on equivalent function #55526

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix save-analysis generation with extern_in_paths/extern_absolute_paths #49847

Fix save-analysis generation with extern_in_paths/extern_absolute_paths #49847

sinkuu commented Apr 10, 2018 •

edited by petrochenkov

Loading

petrochenkov Apr 12, 2018

sinkuu Apr 13, 2018

petrochenkov commented Apr 12, 2018

petrochenkov commented Apr 13, 2018

bors commented Apr 13, 2018

bors commented Apr 14, 2018

bors commented Apr 14, 2018

rust-highfive commented Apr 14, 2018

rust-highfive commented Apr 14, 2018

sinkuu commented Apr 15, 2018

petrochenkov commented Apr 15, 2018

bors commented Apr 15, 2018

bors commented Apr 16, 2018

bors commented Apr 16, 2018

Fix save-analysis generation with extern_in_paths/extern_absolute_paths #49847

Fix save-analysis generation with extern_in_paths/extern_absolute_paths #49847

Conversation

sinkuu commented Apr 10, 2018 • edited by petrochenkov Loading

petrochenkov Apr 12, 2018

Choose a reason for hiding this comment

sinkuu Apr 13, 2018

Choose a reason for hiding this comment

petrochenkov commented Apr 12, 2018

petrochenkov commented Apr 13, 2018

bors commented Apr 13, 2018

bors commented Apr 14, 2018

bors commented Apr 14, 2018

rust-highfive commented Apr 14, 2018

rust-highfive commented Apr 14, 2018

sinkuu commented Apr 15, 2018

petrochenkov commented Apr 15, 2018

bors commented Apr 15, 2018

bors commented Apr 16, 2018

bors commented Apr 16, 2018

sinkuu commented Apr 10, 2018 •

edited by petrochenkov

Loading