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

cleanup: Remove DefIndexAddressSpace #60647

Merged
merged 1 commit into from
May 9, 2019
Merged

cleanup: Remove DefIndexAddressSpace #60647

merged 1 commit into from
May 9, 2019

Conversation

petrochenkov
Copy link
Contributor

The scheme with two address spaces for DefIndex was needed in the past, but apparently not needed anymore (after removing DefIds from locals and HirId-ification).

@petrochenkov petrochenkov added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 8, 2019
@Mark-Simulacrum
Copy link
Member

@bors try for perf

@bors
Copy link
Contributor

bors commented May 8, 2019

⌛ Trying commit a49aa9b with merge fe050c9...

bors added a commit that referenced this pull request May 8, 2019
@bors
Auto merge of #60647 - petrochenkov:nospace, r=<try>
fe050c9 
cleanup: Remove `DefIndexAddressSpace`

The scheme with two address spaces for `DefIndex` was needed in the past, but apparently not needed anymore (after removing `DefId`s from locals and `HirId`-ification).
@petrochenkov
Copy link
Contributor Author

@Mark-Simulacrum
I was waiting until local testing completes, the try is probably going to fail - some tests are not updated yet.

@Mark-Simulacrum
Copy link
Member

Try doesn't require tests to pass (it's purely a dist build), so we should be fine if things build.

@michaelwoerister
Copy link
Member

@rust-timer build fe050c9

@rust-timer
Copy link
Collaborator

Success: Queued fe050c9 with parent e630580, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit fe050c9

@michaelwoerister
Copy link
Member

Thank you, @petrochenkov! Good riddance :)

@michaelwoerister
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 9, 2019

📌 Commit ee6d315 has been approved by michaelwoerister

@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 May 9, 2019
@bors
Copy link
Contributor

bors commented May 9, 2019

⌛ Testing commit ee6d315 with merge 498d53ec9940685a18669a4ea6adddf0a34274fa...

@michaelwoerister
Copy link
Member

michaelwoerister commented May 9, 2019 •
edited
Loading

Note, this could probably be further simplified by using newtype_index! for DefIndex and switching things to IndexVec<DefIndex, _> where appropriate. But let's land this first :)

@petrochenkov petrochenkov mentioned this pull request May 9, 2019
Closed
@bors
Copy link
Contributor

bors commented May 9, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

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:47:20] test string::test_str_clear ... ok
[01:47:20] test string::test_str_truncate ... ok
[01:47:20] test string::test_str_truncate_invalid_len ... ok
[01:47:20] test string::test_str_truncate_split_codepoint ... ok
[01:47:20] died due to signal 11
[01:47:20] 
[01:47:20] 
[01:47:20] 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:47:20] expected success, got: exit code: 3
---
travis_time:end:02951dea:start=1557405720635638569,finish=1557405720647107668,duration=11469099
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:170899cb
$ 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:15577f37
$ 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)

@bors 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 May 9, 2019
@Mark-Simulacrum
Copy link
Member

@bors retry Android segfault

@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-review Status: Awaiting review from the assignee but also interested parties. labels May 9, 2019
Centril added a commit to Centril/rust that referenced this pull request May 9, 2019
@Centril
Rollup merge of rust-lang#60647 - petrochenkov:nospace, r=michaelwoer…
26a7544 
…ister

cleanup: Remove `DefIndexAddressSpace`

The scheme with two address spaces for `DefIndex` was needed in the past, but apparently not needed anymore (after removing `DefId`s from locals and `HirId`-ification).
@Centril Centril mentioned this pull request May 9, 2019
Merged
@petrochenkov petrochenkov removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 9, 2019
bors added a commit that referenced this pull request May 9, 2019
@bors
Auto merge of #60672 - Centril:rollup-fhcx463, r=Centril
a784a80 
Rollup of 5 pull requests

Successful merges:

 - #60601 (Add a `cast` method to raw pointers.)
 - #60638 (pin: make the to-module link more visible)
 - #60647 (cleanup: Remove `DefIndexAddressSpace`)
 - #60656 (Inline some Cursor calls for slices)
 - #60657 (Stabilize and re-export core::array in std)

Failed merges:

r? @ghost
@bors bors merged commit ee6d315 into rust-lang:master May 9, 2019
eddyb
eddyb reviewed May 13, 2019
View reviewed changes
src/librustc/hir/map/definitions.rs
index_to_key,
def_path_hashes,
index_to_key: Decodable::decode(d)?,
def_path_hashes : Decodable::decode(d)?,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this mean this impl can now be auto-derived? Same for encoding.

eddyb
eddyb reviewed May 13, 2019
View reviewed changes
src/librustc_metadata/index.rs
buf.emit_raw_bytes(&self.positions[1]);
LazySeq::with_position_and_length(pos as usize,
(self.positions[0].len() + self.positions[1].len()) / 4 + 1)
buf.emit_raw_bytes(&(self.positions.len() as u32 / 4).to_le_bytes());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unnecessary, since it indicated the split between lo/hi, which doesn't exist anymore.

@michaelwoerister
Copy link
Member

@eddyb Yes, there's definitely further clean up possible now.

@eddyb
Copy link
Member

eddyb commented May 13, 2019

@michaelwoerister I'll likely do it during the rebase of #59953.

@eddyb eddyb mentioned this pull request May 14, 2019
Merged
@fabric-and-ink fabric-and-ink mentioned this pull request May 25, 2019
Merged
Centril added a commit to Centril/rust that referenced this pull request May 25, 2019
@Centril
Rollup merge of rust-lang#61173 - fabric-and-ink:minor-cleanup, r=varkor
d19f11d 
Auto-derive Encode and Decode implementations of DefPathTable

See rust-lang#60647 (comment)
Centril added a commit to Centril/rust that referenced this pull request May 25, 2019
@Centril
Rollup merge of rust-lang#61173 - fabric-and-ink:minor-cleanup, r=varkor
fdd6d0d 
Auto-derive Encode and Decode implementations of DefPathTable

See rust-lang#60647 (comment)
Centril added a commit to Centril/rust that referenced this pull request May 26, 2019
@Centril
Rollup merge of rust-lang#61173 - fabric-and-ink:minor-cleanup, r=varkor
f530f90 
Auto-derive Encode and Decode implementations of DefPathTable

See rust-lang#60647 (comment)
@petrochenkov petrochenkov deleted the nospace branch June 5, 2019 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb left review comments

Assignees

@michaelwoerister michaelwoerister

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.
7 participants
@petrochenkov @Mark-Simulacrum @bors @michaelwoerister @rust-timer @rust-highfive @eddyb