From 7af8e0d2a183bb8c56fe6ffa886fae5d3820db35 Mon Sep 17 00:00:00 2001 From: Louis Gerbarg Date: Sat, 17 May 2014 06:51:36 +0000 Subject: [PATCH] Fix for sanitizer crash introduced in r209049 This patch fixes 3 issues introduced by r209049 that only showed up in on the sanitizer buildbots. One was a typo in a compare. The other is a check to confirm that the single differing value in the two incoming GEPs is the same type. The final issue was the the IRBuilder under some circumstances would build PHIs in the middle of the block. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209065 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/InstCombine/InstructionCombining.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp index 35b4889a836..b65c4ee8e59 100644 --- a/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -1230,10 +1230,13 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) { for (auto I = PN->op_begin()+1, E = PN->op_end(); I !=E; ++I) { GetElementPtrInst *Op2 = dyn_cast(*I); - if (!Op2 || Op1->getNumOperands() != Op1->getNumOperands()) + if (!Op2 || Op1->getNumOperands() != Op2->getNumOperands()) return nullptr; for (unsigned J = 0, F = Op1->getNumOperands(); J != F; ++J) { + if (Op1->getOperand(J)->getType() != Op2->getOperand(J)->getType()) + return nullptr; + if (Op1->getOperand(J) != Op2->getOperand(J)) { if (DI == -1) { // We have not seen any differences yet in the GEPs feeding the @@ -1263,8 +1266,12 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) { // All the GEPs feeding the PHI differ at a single offset. Clone a GEP // into the current block so it can be merged, and create a new PHI to // set that index. + Instruction *InsertPt = Builder->GetInsertPoint(); + Builder->SetInsertPoint(PN); PHINode *NewPN = Builder->CreatePHI(Op1->getOperand(DI)->getType(), PN->getNumOperands()); + Builder->SetInsertPoint(InsertPt); + for (auto &I : PN->operands()) NewPN->addIncoming(dyn_cast(I)->getOperand(DI), PN->getIncomingBlock(I)); -- 2.34.1