From f05d9679d708ccd1a6a643838bbf3a64ccf271bf Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Tue, 27 Feb 2018 14:20:13 +0100 Subject: Backport LLVM fixes for a JumpThreading / assume intrinsic bug --- src/libcore/slice/mod.rs | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'src/libcore/slice') diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs index ac390313a67..aacbbd5058e 100644 --- a/src/libcore/slice/mod.rs +++ b/src/libcore/slice/mod.rs @@ -1246,18 +1246,15 @@ 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() - // // FIXME(#48116/#45964): - // // This assume() causes misoptimization on LLVM 6. - // // Commented out until it is fixed again. - // .map(|i| { - // unsafe { assume(i < n) }; - // i - // }) + .map(|i| { + unsafe { assume(i < n) }; + i + }) } #[inline] @@ -1274,13 +1271,10 @@ macro_rules! iterator { if predicate(x) { Err(i) } else { Ok(i) } }).err() - // // FIXME(#48116/#45964): - // // This assume() causes misoptimization on LLVM 6. - // // Commented out until it is fixed again. - // .map(|i| { - // unsafe { assume(i < n) }; - // i - // }) + .map(|i| { + unsafe { assume(i < n) }; + i + }) } } -- cgit 1.4.1-3-g733a5