resolve: Account for new importable entities by petrochenkov · Pull Request #59047 · rust-lang/rust

petrochenkov · 2019-03-09T13:17:24Z

Fixes the ICE encountered in #58837
r? @Centril

Centril · 2019-03-09T13:44:31Z

src/librustc_resolve/build_reduced_graph.rs

            }
-            Def::Variant(..) | Def::TyAlias(..) | Def::ForeignTy(..) => {
+            Def::Variant(..) | Def::TyAlias(..) | Def::ForeignTy(..) | Def::Existential(..) |
+            Def::TraitAlias(..) | Def::PrimTy(..) | Def::ToolMod => {


I think I understand but to make sure, could you educate me as to why ToolMod uses the TypeNS as opposed to MacroNS (the documentation on hir::def::Def barely exists...)?

Otherwise the PR looks good; r=me with green travis :)

ToolMod is very similar to Mod living in type namespace, it's a container for other items.
The difference is that contained items are limited to tool attributes and nested tool modules + the number of contained items is infinite (i.e. no name checks are performed).

Ah; that makes sense, thanks!

Centril · 2019-03-09T15:10:51Z

Btw.. @oli-obk suggested we beta-backport fixing the problem?

oli-obk · 2019-03-09T17:23:21Z

Nominating for backport since it makes developing stage 0 less annoying (if you get the ICE you don't get the error that is the actual problem, thus not being able to figure out how to work around the ICE).

estebank · 2019-03-09T21:57:21Z

@bors r=Centril

bors · 2019-03-09T21:57:22Z

📌 Commit 967e7f4 has been approved by Centril

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

nikomatsakis · 2019-03-14T14:17:54Z

src/librustc_resolve/build_reduced_graph.rs

        // but metadata cannot encode gensyms currently, so we create it here.
        // This is only a guess, two equivalent idents may incorrectly get different gensyms here.
        let ident = ident.gensym_if_underscore();
-        let def_id = def.def_id();


this part of the diff, I presume isn't meaningful -- that is, we're now getting the def_id as part of the match, but in each case, it's the same def_id it was before?

Yes, the def-ids are the same.

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

bors · 2019-03-17T02:08:18Z

⌛ Testing commit 47ee538 with merge 7ea8bbe61b4e5c57f9643d296326a9b4cbb34605...

Centril · 2019-03-17T02:11:39Z

@bors retry

bors · 2019-03-17T04:20:21Z

⌛ Testing commit 47ee538 with merge 3375b8236553a7aa2d6a9f94486ac5cdea03975a...

bors · 2019-03-17T06:18:07Z

💔 Test failed - checks-travis

rust-highfive · 2019-03-17T06:18:08Z

The job arm-android 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.

[01:56:12] test string::test_str_clear ... ok
[01:56:12] test string::test_str_truncate ... ok
[01:56:12] test string::test_str_truncate_split_codepoint ... ok
[01:56:12] test string::test_str_truncate_invalid_len ... ok
[01:56:12] died due to signal 11
[01:56:12] 
[01:56:12] 
[01:56:12] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:56:12] expected success, got: exit code: 3
---
travis_time:end:04a69204:start=1552803476840448757,finish=1552803476864190150,duration=23741393
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:049946d0
$ 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:150ab7b0
travis_time:start:150ab7b0
$ 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:0258b4d8
$ 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)

Centril · 2019-03-17T06:20:46Z

@bors retry Seems unrelated to this PR...

bors · 2019-03-17T17:25:17Z

⌛ Testing commit 47ee538 with merge f649c76...

@Centril

resolve: Account for new importable entities Fixes the ICE encountered in #58837 r? @Centril

bors · 2019-03-17T20:49:51Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing f649c76 to master...

@ghost

[beta] Rollup backports Rolled up: * [beta] Move to static.r-l.o stable release #58896 Cherry-picked: * Add release notes for PR #56243 #58959 * resolve: Account for new importable entities #59047 * bootstrap: Default to a sensible llvm-suffix. #59173 r? @ghost

@bors

…crum Bump bootstrap compiler to 2019-03-20 Includes #59295 and by extension #59047, which unblocks #58253, #58837, and possibly #59336, and so therefore: @bors p=50 r? @Mark-Simulacrum cc @pietroalbini

rust-highfive assigned Centril Mar 9, 2019

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

petrochenkov mentioned this pull request Mar 9, 2019

librustc_interface => 2018 #58837

Merged

Centril reviewed Mar 9, 2019

View reviewed changes

oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 9, 2019

Centril added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 9, 2019

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 Mar 9, 2019

Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

56aeb70

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

Centril mentioned this pull request Mar 10, 2019

Rollup of 17 pull requests #59067

Closed

Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

1ce55a6

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

Centril mentioned this pull request Mar 10, 2019

Rollup of 16 pull requests #59069

Closed

Centril added a commit to Centril/rust that referenced this pull request Mar 10, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

958d273

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

Centril mentioned this pull request Mar 10, 2019

Rollup of 17 pull requests #59075

Closed

Centril added a commit to Centril/rust that referenced this pull request Mar 11, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

2c136f6

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

Centril mentioned this pull request Mar 11, 2019

Rollup of 15 pull requests #59081

Closed

taiki-e mentioned this pull request Mar 11, 2019

librustc_driver => 2018 #58253

Merged

emilyalbini added a commit to emilyalbini/rust that referenced this pull request Mar 13, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

3da9ee8

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

emilyalbini mentioned this pull request Mar 13, 2019

Rollup of 18 pull requests #59161

Closed

Centril added a commit to Centril/rust that referenced this pull request Mar 13, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

f5138a9

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

Centril mentioned this pull request Mar 13, 2019

Rollup of 9 pull requests #59165

Closed

nikomatsakis reviewed Mar 14, 2019

View reviewed changes

Centril added a commit to Centril/rust that referenced this pull request Mar 16, 2019

Rollup merge of rust-lang#59047 - petrochenkov:modnodefid, r=Centril

657cb3f

resolve: Account for new importable entities Fixes the ICE encountered in rust-lang#58837 r? @Centril

Centril mentioned this pull request Mar 16, 2019

Rollup of 9 pull requests #59244

Closed

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 Mar 17, 2019

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 Mar 17, 2019

bors added a commit that referenced this pull request Mar 17, 2019

Auto merge of #59047 - petrochenkov:modnodefid, r=Centril

f649c76

resolve: Account for new importable entities Fixes the ICE encountered in #58837 r? @Centril

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 17, 2019

bors merged commit 47ee538 into rust-lang:master Mar 17, 2019

emilyalbini mentioned this pull request Mar 19, 2019

[beta] Rollup backports #59295

Merged

emilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 19, 2019

Centril mentioned this pull request Mar 26, 2019

Bump bootstrap compiler to 2019-03-20 #59434

Merged

ehuss mentioned this pull request Apr 21, 2019

Document name resolution. rust-lang/reference#568

Open

29 tasks

petrochenkov deleted the modnodefid branch June 5, 2019 16:33

Uh oh!

Conversation

petrochenkov commented Mar 9, 2019

Uh oh!

Centril Mar 9, 2019

Choose a reason for hiding this comment

Uh oh!

petrochenkov Mar 10, 2019

Choose a reason for hiding this comment

Uh oh!

Centril Mar 10, 2019

Choose a reason for hiding this comment

Uh oh!

Centril commented Mar 9, 2019

Uh oh!

oli-obk commented Mar 9, 2019

Uh oh!

estebank commented Mar 9, 2019

Uh oh!

bors commented Mar 9, 2019

Uh oh!

nikomatsakis Mar 14, 2019

Choose a reason for hiding this comment

Uh oh!

petrochenkov Mar 14, 2019

Choose a reason for hiding this comment

Uh oh!

bors commented Mar 17, 2019

Uh oh!

Centril commented Mar 17, 2019

Uh oh!

bors commented Mar 17, 2019

Uh oh!

bors commented Mar 17, 2019

Uh oh!

rust-highfive commented Mar 17, 2019

Uh oh!

Centril commented Mar 17, 2019

Uh oh!

bors commented Mar 17, 2019

Uh oh!

bors commented Mar 17, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants