summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/StackColoring.cpp
diff options
context:
space:
mode:
authorThan McIntosh <thanm@google.com>2018-05-18 17:47:10 +0000
committerThan McIntosh <thanm@google.com>2018-05-18 17:47:10 +0000
commit3c639dbd0d1c8b291e0138b0c93f19195afb6044 (patch)
treed84dccd78e5c0178db90e075d26b472344e6802a /llvm/lib/CodeGen/StackColoring.cpp
parent588fad4d3be4391df52505fd5e1fa36a44a8632e (diff)
downloadbcm5719-llvm-3c639dbd0d1c8b291e0138b0c93f19195afb6044.tar.gz
bcm5719-llvm-3c639dbd0d1c8b291e0138b0c93f19195afb6044.zip
Revert changes from D46265.
This is a revert of the changes from https://reviews.llvm.org/D46265; the new test introduced (test/CodeGen/X86/PR37310.mir) causes buildbot failures. Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D47061 llvm-svn: 332742
Diffstat (limited to 'llvm/lib/CodeGen/StackColoring.cpp')
-rw-r--r--llvm/lib/CodeGen/StackColoring.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/StackColoring.cpp b/llvm/lib/CodeGen/StackColoring.cpp
index 0bd941e64aa..4f3d1f704aa 100644
--- a/llvm/lib/CodeGen/StackColoring.cpp
+++ b/llvm/lib/CodeGen/StackColoring.cpp
@@ -782,11 +782,8 @@ void StackColoring::calculateLocalLiveness() {
for (MachineBasicBlock::const_pred_iterator PI = BB->pred_begin(),
PE = BB->pred_end(); PI != PE; ++PI) {
LivenessMap::const_iterator I = BlockLiveness.find(*PI);
- // PR37130: transformations prior to stack coloring can
- // sometimes leave behind statically unreachable blocks; these
- // can be safely skipped here.
- if (I != BlockLiveness.end())
- LocalLiveIn |= I->second.LiveOut;
+ assert(I != BlockLiveness.end() && "Predecessor not found");
+ LocalLiveIn |= I->second.LiveOut;
}
// Compute LiveOut by subtracting out lifetimes that end in this
OpenPOWER on IntegriCloud