maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

PR 16899: Do not modify the basic block using the iterator, but keep the 

next value. This avoids crashes due to invalidation.

Patch by Joey Gouly.

llvm-svn: 188605
This commit is contained in:
Joerg Sonnenberger 2013-08-17 11:04:47 +00:00
parent 5894a73862
commit 8e3050db51
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -1895,12 +1895,14 @@ bool SLPVectorizer::vectorizeChainsInBlock(BasicBlock *BB, BoUpSLP &R) {
if (Incoming.size() > 1)
Changed |= tryToVectorizeList(Incoming, R);
for (BasicBlock::iterator it = BB->begin(), e = BB->end(); it != e; ++it) {
if (isa<DbgInfoIntrinsic>(it))
llvm::Instruction *I;
for (BasicBlock::iterator it = BB->begin(), e = BB->end(); it != e;) {
I = it++;
if (isa<DbgInfoIntrinsic>(I))
continue;
// Try to vectorize reductions that use PHINodes.
if (PHINode *P = dyn_cast<PHINode>(it)) {
if (PHINode *P = dyn_cast<PHINode>(I)) {
// Check that the PHI is a reduction PHI.
if (P->getNumIncomingValues() != 2)
return Changed;
@ -1922,7 +1924,7 @@ bool SLPVectorizer::vectorizeChainsInBlock(BasicBlock *BB, BoUpSLP &R) {
}
// Try to vectorize trees that start at compare instructions.
if (CmpInst *CI = dyn_cast<CmpInst>(it)) {
if (CmpInst *CI = dyn_cast<CmpInst>(I)) {
if (tryToVectorizePair(CI->getOperand(0), CI->getOperand(1), R)) {
Changed |= true;
continue;