commit f3c0314310f4c82de6467c4fe4ec4114b9281f04
author Peter Collingbourne <peter@pcc.me.uk> Fri Aug 23 18:45:06 2013 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Fri Aug 23 18:45:06 2013 +0000
tree f3b21712401068d7f4af99efb26ace915cdaf8f6
parent 003f5519129e5413768b3d6a309f36389f425ced

DataFlowSanitizer: correctly combine labels in the case where they are equal.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189133 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/Instrumentation/DataFlowSanitizer.cpp

diff --git a/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp b/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
index 232893d..2fa3383 100644
--- a/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
@@ -775,7 +775,7 @@
     BasicBlock *Tail = BI->getSuccessor(0);
     PHINode *Phi = PHINode::Create(ShadowTy, 2, "", Tail->begin());
     Phi->addIncoming(Call, Call->getParent());
-    Phi->addIncoming(ZeroShadow, Head);
+    Phi->addIncoming(V1, Head);
     Pos = Phi;
     return Phi;
   } else {