Skip to content

std: Optimize panic::catch_unwind slightly - #35444

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:optimize-catch-unwind
Aug 15, 2016
Merged

std: Optimize panic::catch_unwind slightly#35444
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:optimize-catch-unwind

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

The previous implementation of this function was overly conservative with
liberal usage of Option and .unwrap() which in theory never triggers. This
commit essentially removes the Options in favor of unsafe implementations,
improving the code generation of the fast path for LLVM to see through what's
happening more clearly.

cc #34727

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @aturon

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

Comment threadsrc/libstd/panicking.rs Outdated

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.

ptr::read.

@bors

bors commented Aug 11, 2016

Copy link
Copy Markdown
Collaborator

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

The previous implementation of this function was overly conservative with
liberal usage of `Option` and `.unwrap()` which in theory never triggers. This
commit essentially removes the `Option`s in favor of unsafe implementations,
improving the code generation of the fast path for LLVM to see through what's
happening more clearly.
cc rust-lang#34727
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

r? @brson

@rust-highfiverust-highfive assigned brson and unassigned aturonAug 11, 2016
@brson

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 12, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 045c8c8 has been approved by brson

@brsonbrson added the relnotes Marks issues that should be documented in the release notes of the next release. label Aug 12, 2016
Manishearth added a commit to Manishearth/rust that referenced this pull request Aug 13, 2016
… r=brson
std: Optimize panic::catch_unwind slightly
The previous implementation of this function was overly conservative with
liberal usage of `Option` and `.unwrap()` which in theory never triggers. This
commit essentially removes the `Option`s in favor of unsafe implementations,
improving the code generation of the fast path for LLVM to see through what's
happening more clearly.
cc rust-lang#34727
Manishearth added a commit to Manishearth/rust that referenced this pull request Aug 13, 2016
… r=brson
std: Optimize panic::catch_unwind slightly
The previous implementation of this function was overly conservative with
liberal usage of `Option` and `.unwrap()` which in theory never triggers. This
commit essentially removes the `Option`s in favor of unsafe implementations,
improving the code generation of the fast path for LLVM to see through what's
happening more clearly.
cc rust-lang#34727
@bors

bors commented Aug 13, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 045c8c8 with merge 367b59e...

@bors

bors commented Aug 13, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-debug-opt

@alexcrichton

Copy link
Copy Markdown
MemberAuthor

@bors: retry

On Sat, Aug 13, 2016 at 3:29 PM, bors notifications@github.com wrote:

💔 Test failed - auto-linux-64-debug-opt
https://buildbot.rust-lang.org/builders/auto-linux-64-debug-opt/builds/3465


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#35444 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95EAN5CjSOBTADshr7R4toQOGkr-jks5qfkVYgaJpZM4JeZ-g
.

@eddyb

Copy link
Copy Markdown
Contributor

@bors rollup

eddyb added a commit to eddyb/rust that referenced this pull request Aug 14, 2016
… r=brson
std: Optimize panic::catch_unwind slightly
The previous implementation of this function was overly conservative with
liberal usage of `Option` and `.unwrap()` which in theory never triggers. This
commit essentially removes the `Option`s in favor of unsafe implementations,
improving the code generation of the fast path for LLVM to see through what's
happening more clearly.
cc rust-lang#34727
@eddybeddyb mentioned this pull request Aug 14, 2016
eddyb added a commit to eddyb/rust that referenced this pull request Aug 14, 2016
… r=brson
std: Optimize panic::catch_unwind slightly
The previous implementation of this function was overly conservative with
liberal usage of `Option` and `.unwrap()` which in theory never triggers. This
commit essentially removes the `Option`s in favor of unsafe implementations,
improving the code generation of the fast path for LLVM to see through what's
happening more clearly.
cc rust-lang#34727
@eddybeddyb mentioned this pull request Aug 14, 2016
bors added a commit that referenced this pull request Aug 14, 2016
@bors
bors merged commit 045c8c8 into rust-lang:masterAug 15, 2016
@alexcrichton
alexcrichton deleted the optimize-catch-unwind branch August 26, 2016 18:30
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotesMarks issues that should be documented in the release notes of the next release.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@alexcrichton@rust-highfive@bors@brson@eddyb@nagisa@aturon