From: Chris Lattner Date: Mon, 3 Jan 2011 18:28:15 +0000 (+0000) Subject: fix PR8895: metadata operands don't have a strong use of their X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a12ba39a1d4d22c8c2d348f1397d52be58391177;p=oota-llvm.git fix PR8895: metadata operands don't have a strong use of their nested values, so they can change and drop to null, which can change the hash and cause havok. It turns out that it isn't a good idea to value number stuff with metadata operands anyway, so... don't. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122758 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Scalar/EarlyCSE.cpp b/lib/Transforms/Scalar/EarlyCSE.cpp index 9e7092bacda..61830e02d6c 100644 --- a/lib/Transforms/Scalar/EarlyCSE.cpp +++ b/lib/Transforms/Scalar/EarlyCSE.cpp @@ -145,9 +145,15 @@ namespace { } static bool canHandle(Instruction *Inst) { - if (CallInst *CI = dyn_cast(Inst)) - return CI->onlyReadsMemory(); - return false; + CallInst *CI = dyn_cast(Inst); + if (CI == 0 || !CI->onlyReadsMemory()) + return false; + + // Check that there are no metadata operands. + for (unsigned i = 0, e = CI->getNumOperands(); i != e; ++i) + if (CI->getOperand(i)->getType()->isMetadataTy()) + return false; + return true; } }; } @@ -407,7 +413,7 @@ bool EarlyCSE::processNode(DomTreeNode *Node) { if (LastStore && LastStore->getPointerOperand() == SI->getPointerOperand()) { DEBUG(dbgs() << "EarlyCSE DEAD STORE: " << *LastStore << " due to: " - << *Inst << '\n'); + << *Inst << '\n'); LastStore->eraseFromParent(); Changed = true; ++NumDSE;