Skip to content

Merge IdxSet and IdxSetBuf #53520

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Aug 23, 2018
Merged

Conversation

nnethercote
Copy link
Contributor

Because it simplifies things.

@r? nikomatsakis

This makes it more like `AllSets::{gen,kill}_set`, removes the need for
a bunch of bitset range computations, and removes the need for `Bits`.

It's marginally less efficient, because we have to allocate one bitset
per basic block instead of one large shared bitset, but the difference
is negligible in practice.
The `Buf` vs. non-`Buf` distinction is no longer necessary, and the
nastiest code in this file can be removed.

To minimize this patch, `IdxSet` is made a typedef of `IdxSetBuf`. The
next patch will remove this typedef.
Now that the `Buf` vs. non-`Buf` distinction has been removed, it makes
sense to drop the `Buf` suffix and use the shorter names everywhere.
@rust-highfive
Copy link
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2018
@nnethercote
Copy link
Contributor Author

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Aug 20, 2018
@nnethercote
Copy link
Contributor Author

@bors try

@bors
Copy link
Collaborator

bors commented Aug 20, 2018

⌛ Trying commit e7e9f2e with merge 3d5c7019ca98038841575ca04bca95093b3abe4f...

@bors
Copy link
Collaborator

bors commented Aug 20, 2018

☀️ Test successful - status-travis
State: approved= try=True

@nnethercote
Copy link
Contributor Author

@rust-timer build 3d5c7019ca98038841575ca04bca95093b3abe4f

@rust-timer
Copy link
Collaborator

Success: Queued 3d5c7019ca98038841575ca04bca95093b3abe4f with parent d2048b6, comparison URL.

@nnethercote
Copy link
Contributor Author

The comparison URL shows that there is no regression of note. (syn-opt has been variable lately, and the ctfe ones are very noisy.)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 22, 2018

📌 Commit e7e9f2e has been approved by nikomatsakis

@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 Aug 22, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 22, 2018
… r=nikomatsakis

Merge `IdxSet` and `IdxSetBuf`

Because it simplifies things.

@r? nikomatsakis
@bors
Copy link
Collaborator

bors commented Aug 23, 2018

⌛ Testing commit e7e9f2e with merge e73077e...

bors added a commit that referenced this pull request Aug 23, 2018
…akis

Merge `IdxSet` and `IdxSetBuf`

Because it simplifies things.

@r? nikomatsakis
@bors
Copy link
Collaborator

bors commented Aug 23, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing e73077e to master...

@bors bors merged commit e7e9f2e into rust-lang:master Aug 23, 2018
@nnethercote nnethercote deleted the merge-IdxSet-IdxSetBuf branch August 23, 2018 06:15
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants