[llvm] r189133 - DataFlowSanitizer: correctly combine labels in the case where they are equal.

[Peter Collingbourne]

Author: pcc
Date: Fri Aug 23 13:45:06 2013
New Revision: 189133

URL: http://llvm.org/viewvc/llvm-project?rev=189133&view=rev
Log:
DataFlowSanitizer: correctly combine labels in the case where they are equal.

Modified:
    llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
    llvm/trunk/test/Instrumentation/DataFlowSanitizer/arith.ll

Modified: llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp?rev=189133&r1=189132&r2=189133&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp Fri Aug 23 13:45:06 2013
@@ -775,7 +775,7 @@ Value *DataFlowSanitizer::combineShadows
     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 {

Modified: llvm/trunk/test/Instrumentation/DataFlowSanitizer/arith.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/DataFlowSanitizer/arith.ll?rev=189133&r1=189132&r2=189133&view=diff
==============================================================================
--- llvm/trunk/test/Instrumentation/DataFlowSanitizer/arith.ll (original)
+++ llvm/trunk/test/Instrumentation/DataFlowSanitizer/arith.ll Fri Aug 23 13:45:06 2013
@@ -3,11 +3,12 @@ target datalayout = "e-p:64:64:64-i1:8:8
 
 define i8 @add(i8 %a, i8 %b) {
   ; CHECK: @"dfs$add"
-  ; CHECK: load{{.*}}__dfsan_arg_tls
-  ; CHECK: load{{.*}}__dfsan_arg_tls
-  ; CHECK: call{{.*}}__dfsan_union
+  ; CHECK-DAG: %[[ALABEL:.*]] = load{{.*}}__dfsan_arg_tls, i64 0, i64 0
+  ; CHECK-DAG: %[[BLABEL:.*]] = load{{.*}}__dfsan_arg_tls, i64 0, i64 1
+  ; CHECK: %[[UNION:.*]] = call{{.*}}__dfsan_union(i16 zeroext %[[ALABEL]], i16 zeroext %[[BLABEL]])
+  ; CHECK: %[[ADDLABEL:.*]] = phi i16 [ %[[UNION]], {{.*}} ], [ %[[ALABEL]], {{.*}} ]
   ; CHECK: add i8
-  ; CHECK: store{{.*}}__dfsan_retval_tls
+  ; CHECK: store i16 %[[ADDLABEL]], i16* @__dfsan_retval_tls
   ; CHECK: ret i8
   %c = add i8 %a, %b
   ret i8 %c