summaryrefslogtreecommitdiff
path: root/lib/Transforms/Scalar/GVN.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-02-24 08:48:04 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-02-24 08:48:04 +0000
commit6d8f2ca646bc283c31f48b6816d5194c836dfec6 (patch)
tree7e3f394baaa453a5a785b0d31975c1fc1d3fd6cb /lib/Transforms/Scalar/GVN.cpp
parenta86509d4362edf7061bfd38dc08143c07980c838 (diff)
downloadllvm-6d8f2ca646bc283c31f48b6816d5194c836dfec6.tar.gz
llvm-6d8f2ca646bc283c31f48b6816d5194c836dfec6.tar.bz2
llvm-6d8f2ca646bc283c31f48b6816d5194c836dfec6.tar.xz
Reapply r97010, the speculative revert failed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97036 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/GVN.cpp')
-rw-r--r--lib/Transforms/Scalar/GVN.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index 164730c3ca..eb6b901e92 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -1633,13 +1633,8 @@ bool GVN::processNonLocalLoad(LoadInst *LI,
LoadPtr = Address.PHITranslateWithInsertion(LoadBB, UnavailablePred,
*DT, NewInsts);
} else {
- Address.PHITranslateValue(LoadBB, UnavailablePred);
+ Address.PHITranslateValue(LoadBB, UnavailablePred, DT);
LoadPtr = Address.getAddr();
-
- // Make sure the value is live in the predecessor.
- if (Instruction *Inst = dyn_cast_or_null<Instruction>(LoadPtr))
- if (!DT->dominates(Inst->getParent(), UnavailablePred))
- LoadPtr = 0;
}
// If we couldn't find or insert a computation of this phi translated value,