Skip to content

Eliminate more excessive null-checks from slice iterators#22669

Merged
bors merged 1 commit into
rust-lang:masterfrom
dotdash:fast_slice_iter
Feb 28, 2015
Merged

Eliminate more excessive null-checks from slice iterators#22669
bors merged 1 commit into
rust-lang:masterfrom
dotdash:fast_slice_iter

Conversation

@dotdash

@dotdash dotdash commented Feb 22, 2015

Copy link
Copy Markdown
Contributor

This adds the assume() calls back that got lost when rebasing #21886.

This adds the assume() calls back that got lost when rebasing rust-lang#21886.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pcwalton

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

@dotdash

dotdash commented Feb 22, 2015

Copy link
Copy Markdown
Contributor Author

r? @huonw -- you had r-ed #21886 before

@rust-highfive rust-highfive assigned huonw and unassigned pcwalton Feb 22, 2015
@huonw

huonw commented Feb 22, 2015

Copy link
Copy Markdown
Contributor

@bors r+ e457

@alexcrichton

Copy link
Copy Markdown
Member

I think that unfortunately this doesn't work on windows: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3435/steps/compile/logs/stdio

@dotdash

dotdash commented Feb 23, 2015

Copy link
Copy Markdown
Contributor Author

Oh, #22395 accidently reverted LLVM to an older version that doesn't contain my fix to make assume() work correctly :-(

@dotdash

dotdash commented Feb 23, 2015

Copy link
Copy Markdown
Contributor Author

@bors r-

r- for now until the llvm fix has landed (again)

@alexcrichton

Copy link
Copy Markdown
Member

Ach sorry about that :( Feel free to re-include the update in this PR and send it back to bors.

@dotdash

dotdash commented Feb 23, 2015

Copy link
Copy Markdown
Contributor Author

I'll just wait for the new llvmup PR. It will merge eventually, I suppose ;-)

@dotdash

dotdash commented Feb 24, 2015

Copy link
Copy Markdown
Contributor Author

@bors r=huonw e457

@bors

bors commented Feb 24, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e457328 with merge 779490e...

@bors

bors commented Feb 24, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-32-nopt-t

@dotdash

dotdash commented Feb 24, 2015

Copy link
Copy Markdown
Contributor Author

Ah, due to the previous revert to the old llvm version, the snapshot uses the old llvm again and so it crashes in stage0 sigh

@Manishearth

Copy link
Copy Markdown
Member

Now that new llvm landed, should this be working now?

@dotdash

dotdash commented Feb 26, 2015

Copy link
Copy Markdown
Contributor Author

It would, if guarded by if cfg!(not(stage0)). As is, it would need a new snapshot that has the updated LLVM.

@dotdash

dotdash commented Feb 27, 2015

Copy link
Copy Markdown
Contributor Author

@bors retry

Snapshot landed

@bors

bors commented Feb 27, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e457328 with merge ef5b15c...

@bors

bors commented Feb 27, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

@bors

bors commented Feb 27, 2015

Copy link
Copy Markdown
Collaborator

@bors

bors commented Feb 27, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-32-opt

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry clean

@bors

bors commented Feb 28, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e457328 with merge 1c93934...

bors added a commit that referenced this pull request Feb 28, 2015
This adds the assume() calls back that got lost when rebasing #21886.
@bors

bors commented Feb 28, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit e457328 into rust-lang:master Feb 28, 2015
@dotdash dotdash deleted the fast_slice_iter branch March 1, 2015 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants