squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Partially revert #47333.

Browse source 
Removed the `assume()` which we assumed is the cause of misoptimization in
issue #48116.
This commit is contained in:
kennytm 2018-02-14 23:18:18 +08:00
parent 7984c895b6
commit ec36e7e972
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libcore/slice/mod.rs
View file

@ -1246,15 +1246,18 @@ macro_rules! iterator {
{
// The addition might panic on overflow
// Use the len of the slice to hint optimizer to remove result index bounds check.
let n = make_slice!(self.ptr, self.end).len();
let _n = make_slice!(self.ptr, self.end).len();
self.try_fold(0, move |i, x| {
if predicate(x) { Err(i) }
else { Ok(i + 1) }
}).err()
.map(|i| {
unsafe { assume(i < n) };
i
})
// // FIXME(#48116/#45964):
// // This assume() causes misoptimization on LLVM 6.
// // Commented out until it is fixed again.
// .map(|i| {
// unsafe { assume(i < n) };
// i
// })
}
#[inline]
@ -1271,10 +1274,13 @@ macro_rules! iterator {
if predicate(x) { Err(i) }
else { Ok(i) }
}).err()
.map(|i| {
unsafe { assume(i < n) };
i
})
// // FIXME(#48116/#45964):
// // This assume() causes misoptimization on LLVM 6.
// // Commented out until it is fixed again.
// .map(|i| {
// unsafe { assume(i < n) };
// i
// })
}
}