mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #40254 - nagisa:compiler-builtin-no-panic, r=alexcrichton

Browse Source 
Fix personality_fn within the compiler_builtins

compiler_builtins may not have any unwinding within it to link correctly. This is notoriously
finicky, and this small piece of change removes yet another case where personality function
happens to get introduced.

Side note: I do remember solving the exact same thing before. I wonder why it has reappered...

@cuviper, could you please try building beta with this patch applied? It should apply cleanly. If it works, I’ll nominate to land this into beta.

Fixes(?) https://github.com/rust-lang/rust/issues/40251
This commit is contained in:
Ariel Ben-Yehuda 2017-03-08 20:53:53 +02:00 committed by GitHub
commit 1e536245e8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcompiler_builtins/lib.rs
View File

@ -402,15 +402,16 @@ pub extern "C" fn u128_mul(a: i128, b: i128) -> i128 {
}
trait AbsExt: Sized {
fn uabs(self) -> u128 {
self.iabs() as u128
}
fn uabs(self) -> u128;
fn iabs(self) -> i128;
}
impl AbsExt for i128 {
fn uabs(self) -> u128 {
self.iabs() as u128
}
fn iabs(self) -> i128 {
let s = self >> 127;
let s = self.wrapping_shr(127);
((self ^ s).wrapping_sub(s))
}
}