Skip to content

Backport LLVM fixes for a JumpThreading / assume intrinsic bug #48583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2018
Merged

Backport LLVM fixes for a JumpThreading / assume intrinsic bug #48583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f05d967
Backport LLVM fixes for a JumpThreading / assume intrinsic bug
dotdash Feb 27, 2018
93cfb2a
Update LLVM submodule a bit further
alexcrichton Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions src/libcore/slice/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
})
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/llvm
Open in desktop
Submodule llvm updated 23 files
+7 −0 include/llvm/Analysis/LazyValueInfo.h
+87 −0 include/llvm/IR/Dominators.h
+4 −2 include/llvm/Transforms/Scalar/JumpThreading.h
+2 −1 include/llvm/Transforms/Utils/BasicBlockUtils.h
+13 −7 include/llvm/Transforms/Utils/Local.h
+29 −1 lib/Analysis/LazyValueInfo.cpp
+191 −0 lib/IR/Dominators.cpp
+7 −2 lib/Support/CMakeLists.txt
+18 −2 lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
+2 −0 lib/Transforms/Scalar/CorrelatedValuePropagation.cpp
+172 −39 lib/Transforms/Scalar/JumpThreading.cpp
+8 −41 lib/Transforms/Scalar/MergedLoadStoreMotion.cpp
+14 −4 lib/Transforms/Utils/BasicBlockUtils.cpp
+163 −46 lib/Transforms/Utils/Local.cpp
+3 −0 test/Analysis/LazyValueAnalysis/lvi-after-jumpthreading.ll
+15 −4 test/CodeGen/SPARC/tls.ll
+22 −0 test/Transforms/GVN/pr36063.ll
+265 −0 test/Transforms/JumpThreading/ddt-crash.ll
+40 −0 test/Transforms/JumpThreading/ddt-crash2.ll
+50 −0 test/Transforms/JumpThreading/lvi-tristate.ll
+44 −0 test/Transforms/JumpThreading/pr36133.ll
+1 −0 unittests/IR/CMakeLists.txt
+344 −0 unittests/IR/DeferredDominanceTest.cpp