Revamp symbol names for impls (and make them deterministic, etc) by nikomatsakis · Pull Request #32293 · rust-lang/rust

nikomatsakis · 2016-03-16T19:10:03Z

This builds on @michaelwoerister's epic PR #31539 (note that his PR never landed, so I just incorporated it into this one). The main change here is that we remove the "name" from DefPathData for impls, since that name is synthetic and not sufficiently predictable for incr comp. However, just doing that would cause bad symbol names since those are based on the DefPath. Therefore, I introduce a new mechanism for getting symbol names (and also paths for user display) called item_path. This is kind of simplistic for now (based on strings) but I expect to expand it later to support richer types, hopefully generating C++-mangled names that gdb etc can understand. Along the way I cleaned up how we track the path that leads to an extern crate.

There is still some cleanup left undone here. Notably, I didn't remove the impl names altogether -- that would probably make sense. I also didn't try to remove the item_symbols vector. Mostly I want to unblock my other incr. comp. work. =)

r? @eddyb
cc @eddyb @alexcrichton @michaelwoerister

nikomatsakis · 2016-03-16T19:10:28Z

Note that the review is technically only for my comments, not mw's, but of course feel free to comment on those too and I'll patch up any nits or whatever.

eddyb · 2016-03-16T22:55:43Z

MIR can't come soon enough 😞.

We could pass the original id in the trans::inline path just like MIR.

eddyb · 2016-03-17T00:29:22Z

LGTM, except for the nits, some of which GitHub is marking as being on an outdated diff.

alexcrichton · 2016-03-17T06:47:53Z

ok, this is pretty slick

bors · 2016-03-18T16:07:45Z

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

michaelwoerister · 2016-03-19T23:00:51Z

This name and others should end with an 'E' to close the nested name that was started with the 'N'.

On Sat, Mar 19, 2016 at 04:01:27PM -0700, Michael Woerister wrote:
+#[rustc_symbol_name] //~ ERROR _ZN5basic4main
This name and others should end with an 'E' to close the nested name that was started with the 'N'.
The names do end with E. I just left that out of the test because I didn't want to put the hash in there.

michaelwoerister · 2016-03-19T23:04:59Z

Looks good to me too. Consolidating path rendering into its own module is a good idea and it's great that we'll be testing symbol names from now on. Looking forward to tinkering with the name mangling scheme.

nikomatsakis · 2016-03-21T17:31:47Z

Rebased. Some of the poor @michaelwoerister's beautifully clean commit history got a bit messed up (I suspect the individual commits no longer build), but seems to build locally. Not yet finished withmake check though.

nikomatsakis · 2016-03-21T19:12:09Z

@bors r=eddyb

bors · 2016-03-21T19:12:11Z

📌 Commit 8786477 has been approved by eddyb

nikomatsakis · 2016-03-21T19:12:43Z

@bors r-

nikomatsakis · 2016-03-21T19:14:57Z

@eddyb

If this fixes run-pass/command-before-exec, I think a revert of the static linking hack @alexcrichton suggested and I merged, is in order.

Does this just mean removing the comment on the test? If so, I did that in the most recent commit.

nikomatsakis · 2016-03-21T19:15:03Z

@bors r=eddyb

bors · 2016-03-21T19:15:04Z

📌 Commit ea70d16 has been approved by eddyb

bors · 2016-03-22T07:29:46Z

⌛ Testing commit ea70d16 with merge dec92c1...

bors · 2016-03-22T08:47:11Z

💔 Test failed - auto-mac-64-nopt-t

nikomatsakis · 2016-03-22T15:57:50Z

@bors r=eddyb

bors · 2016-03-22T15:57:52Z

📌 Commit 4eadadf has been approved by eddyb

nikomatsakis · 2016-03-22T15:58:11Z

question to @alexcrichton -- do you know if the windows builders have nm and cmp available? If not, feel to r- this PR.

nikomatsakis · 2016-03-25T18:37:55Z

@bors r=alexcrichton

bors · 2016-03-25T18:37:56Z

📌 Commit 726ba66 has been approved by alexcrichton

nikomatsakis · 2016-03-25T18:41:03Z

@bors p=1

nikomatsakis · 2016-03-25T18:41:11Z

(This PR has been hanging around way too long.)

bors · 2016-03-25T20:14:30Z

⌛ Testing commit 726ba66 with merge 07ee0ed...

bors · 2016-03-25T21:28:50Z

💔 Test failed - auto-win-gnu-64-nopt-t

nikomatsakis · 2016-03-25T21:35:49Z

@bors r=alexcrichton

bors · 2016-03-25T21:35:50Z

📌 Commit 874574d has been approved by alexcrichton

nikomatsakis · 2016-03-25T21:35:55Z

@bors force

bors · 2016-03-25T21:35:59Z

⌛ Testing commit 874574d with merge 0f50c0d...

bors · 2016-03-25T22:53:15Z

💔 Test failed - auto-win-gnu-64-nopt-t

nikomatsakis · 2016-03-25T23:34:24Z

@bors r=alexcrichton

bors · 2016-03-25T23:34:24Z

📌 Commit 1ea93c2 has been approved by alexcrichton

bors · 2016-03-26T01:09:28Z

⌛ Testing commit 1ea93c2 with merge 8d2d2be...

@michaelwoerister

…xcrichton Revamp symbol names for impls (and make them deterministic, etc) This builds on @michaelwoerister's epic PR #31539 (note that his PR never landed, so I just incorporated it into this one). The main change here is that we remove the "name" from `DefPathData` for impls, since that name is synthetic and not sufficiently predictable for incr comp. However, just doing that would cause bad symbol names since those are based on the `DefPath`. Therefore, I introduce a new mechanism for getting symbol names (and also paths for user display) called `item_path`. This is kind of simplistic for now (based on strings) but I expect to expand it later to support richer types, hopefully generating C++-mangled names that gdb etc can understand. Along the way I cleaned up how we track the path that leads to an extern crate. There is still some cleanup left undone here. Notably, I didn't remove the impl names altogether -- that would probably make sense. I also didn't try to remove the `item_symbols` vector. Mostly I want to unblock my other incr. comp. work. =) r? @eddyb cc @eddyb @alexcrichton @michaelwoerister

bors · 2016-03-26T03:32:26Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-64-x-armhf, auto-linux-64-x-armsf, auto-linux-64-x-freebsd, auto-linux-64-x-netbsd, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

rust-highfive assigned eddyb Mar 16, 2016

eddyb reviewed Mar 16, 2016
View reviewed changes

alexcrichton reviewed Mar 17, 2016
View reviewed changes

Comment threadsrc/test/compile-fail/symbol-names/impl1.rs Outdated
alexcrichtonMar 17, 2016
Copy link
Copy Markdown
Member
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, this is pretty slick

michaelwoerister reviewed Mar 19, 2016
View reviewed changes

nikomatsakis force-pushed the incr-comp-def-path-munging branch 2 times, most recently from 3214c33 to bdfc0b4Compare March 21, 2016 17:31

nikomatsakis force-pushed the incr-comp-def-path-munging branch from 8786477 to 09574bdCompare March 21, 2016 19:12

nikomatsakis added 2 commits March 25, 2016 14:07

Update backtrace test for FIXME on windows
8a7b1bc

Rebase over my PR
726ba66

nikomatsakis force-pushed the incr-comp-def-path-munging branch from 8cfc003 to 726ba66Compare March 25, 2016 18:37

change test to be specific for msvc
874574d

remove link-guard test
1ea93c2

bors merged commit 1ea93c2 into rust-lang:masterMar 26, 2016

This was referenced Mar 26, 2016
Rollup of 18 pull requests #32495
Closed
Flatten rustc and rustc_trans module hierarchy slightly. #32432
Merged

alexcrichton mentioned this pull request Mar 27, 2016
unexpected panic when compiling the lalrpop crate #32530
Closed

nikomatsakis deleted the incr-comp-def-path-munging branch March 30, 2016 16:13

tbu- mentioned this pull request Apr 17, 2016
Rust compilations are not reproducible #30330
Closed

sanxiyn mentioned this pull request Apr 25, 2016
DWARF regression with impl on nightly #33192
Closed

Uh oh!

Uh oh!

Conversation

nikomatsakis commented Mar 16, 2016

Uh oh!

nikomatsakis commented Mar 16, 2016

Uh oh!

eddybMar 16, 2016

Choose a reason for hiding this comment

Uh oh!

arielb1Mar 22, 2016

Choose a reason for hiding this comment

Uh oh!

eddyb commented Mar 17, 2016

Uh oh!

alexcrichtonMar 17, 2016

Choose a reason for hiding this comment

Uh oh!

bors commented Mar 18, 2016

Uh oh!

michaelwoeristerMar 19, 2016

Choose a reason for hiding this comment

Uh oh!

nikomatsakisMar 21, 2016

Choose a reason for hiding this comment

Uh oh!

michaelwoerister commented Mar 19, 2016

Uh oh!

nikomatsakis commented Mar 21, 2016

Uh oh!

nikomatsakis commented Mar 21, 2016

Uh oh!

bors commented Mar 21, 2016

Uh oh!

nikomatsakis commented Mar 21, 2016

Uh oh!

nikomatsakis commented Mar 21, 2016

Uh oh!

nikomatsakis commented Mar 21, 2016

Uh oh!

bors commented Mar 21, 2016

Uh oh!

bors commented Mar 22, 2016

Uh oh!

bors commented Mar 22, 2016

Uh oh!

nikomatsakis commented Mar 22, 2016

Uh oh!

bors commented Mar 22, 2016

Uh oh!

nikomatsakis commented Mar 22, 2016

Uh oh!

nikomatsakis commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

nikomatsakis commented Mar 25, 2016

Uh oh!

nikomatsakis commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

nikomatsakis commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

nikomatsakis commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

nikomatsakis commented Mar 25, 2016

Uh oh!

bors commented Mar 25, 2016

Uh oh!

bors commented Mar 26, 2016

Uh oh!