std: Optimize panic::catch_unwind slightly #35444
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
| fn do_call<F: FnOnce() -> R, R>(data: *mut u8) { | ||
| unsafe { | ||
| let data = data as *mut Data<F, R>; | ||
| let f = mem::replace(&mut (*data).f, mem::uninitialized()); |
alexcrichton
force-pushed
the
optimize-catch-unwind
branch
from
8a75cb0 to
2420e81
Compare
|
☔ 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
force-pushed
the
optimize-catch-unwind
branch
from
2420e81 to
045c8c8
Compare
|
r? @brson |
|
@bors r+ |
|
📌 Commit 045c8c8 has been approved by |
brson
added
the
relnotes
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
|
⌛ Testing commit 045c8c8 with merge 367b59e... |
|
💔 Test failed - auto-linux-64-debug-opt |
|
@bors: retry On Sat, Aug 13, 2016 at 3:29 PM, bors [email protected] wrote:
|
|
@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
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
bors
added a commit
that referenced
this pull request
Aug 14, 2016
Rollup of 30 pull requests - Successful merges: #34941, #35392, #35444, #35447, #35491, #35533, #35539, #35558, #35573, #35574, #35577, #35586, #35588, #35594, #35596, #35597, #35598, #35606, #35611, #35615, #35616, #35620, #35622, #35640, #35643, #35644, #35646, #35647, #35648, #35661 - Failed merges: #35395, #35415
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous implementation of this function was overly conservative with
liberal usage of
Optionand.unwrap()which in theory never triggers. Thiscommit 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