Skip to content

[MIR] Change SimplifyCfg pass to use BitVec - #31447

Merged
bors merged 1 commit into
rust-lang:masterfrom
nagisa:mir-cfgsimplify-bitvec
Feb 23, 2016
Merged

[MIR] Change SimplifyCfg pass to use BitVec#31447
bors merged 1 commit into
rust-lang:masterfrom
nagisa:mir-cfgsimplify-bitvec

Conversation

@nagisa

@nagisanagisa commented Feb 6, 2016

Copy link
Copy Markdown
Member

BitVector is more space efficient.

@rust-highfive

rust-highfive commented Feb 6, 2016

Copy link
Copy Markdown
Contributor

r? @brson

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

@nagisa
nagisaforce-pushed the mir-cfgsimplify-bitvec branch 2 times, most recently from 55003d9 to 950e58aCompareFebruary 6, 2016 13:52
@bors

bors commented Feb 9, 2016

Copy link
Copy Markdown
Collaborator

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

@nagisa
nagisaforce-pushed the mir-cfgsimplify-bitvec branch from 950e58a to ebb5b7aCompareFebruary 12, 2016 22:17
@bors

bors commented Feb 18, 2016

Copy link
Copy Markdown
Collaborator

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

@bluss

bluss commented Feb 19, 2016

Copy link
Copy Markdown
Contributor

This was briefly discussed here #30238 (comment), merely some guesses on how big the dataset really is, and what's the appropriate fix. BitVec seems better than Vec either way.

@nagisa
[MIR] Change SimplifyCfg pass to use bitvec
b92e243
BitVector is much more space efficient.
@nagisa
nagisaforce-pushed the mir-cfgsimplify-bitvec branch from ebb5b7a to b92e243CompareFebruary 23, 2016 09:44
@nagisa

nagisa commented Feb 23, 2016

Copy link
Copy Markdown
MemberAuthor

Rebased. This is a pretty simple one and independent from others so could land right now.

r? @nikomatsakis

nikomatsakis
nikomatsakis reviewed Feb 23, 2016
View reviewed changes
Comment threadsrc/librustc_data_structures/bitvec.rs
type Item = usize;
fn next(&mut self) -> Option<usize> {
while self.current == 0 {
self.current = if let Some(&i) = self.iter.next() {

@nikomatsakisnikomatsakisFeb 23, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It seems like it'd be easier/clearer to just keep a slice with some indices here.

@nikomatsakisnikomatsakisFeb 23, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

(But don't feel you have to change it.)

@nikomatsakis

nikomatsakis commented Feb 23, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 23, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit b92e243 has been approved by nikomatsakis

@bors

bors commented Feb 23, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b92e243 with merge 6ffd7cd...

bors added a commit that referenced this pull request Feb 23, 2016
@bors
Auto merge of#31447- nagisa:mir-cfgsimplify-bitvec, r=nikomatsakis
6ffd7cd
BitVector is more space efficient.
@bors

bors commented Feb 23, 2016

Copy link
Copy Markdown
Collaborator

☀️ 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-x-android-t, 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-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors
bors merged commit b92e243 into rust-lang:masterFeb 23, 2016
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nagisa@rust-highfive@bors@bluss@nikomatsakis@brson