[llvm] r266442 - [SimplifyCFG] propagate branch metadata when creating select (PR27344)

[Sanjay Patel via llvm-commits]

Author: spatel
Date: Fri Apr 15 10:32:12 2016
New Revision: 266442

URL: http://llvm.org/viewvc/llvm-project?rev=266442&view=rev
Log:
[SimplifyCFG] propagate branch metadata when creating select (PR27344)

This is almost identical to:
http://reviews.llvm.org/rL264527

This doesn't solve PR27344; it just allows the profile weights to survive. 
To solve the bug, we need to use the profile weights in the backend.

Modified:
    llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
    llvm/trunk/test/Transforms/SimplifyCFG/two-entry-phi-return.ll

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=266442&r1=266441&r2=266442&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Fri Apr 15 10:32:12 2016
@@ -1678,8 +1678,8 @@ static bool SpeculativelyExecuteBB(Branc
     Value *TrueV = ThenV, *FalseV = OrigV;
     if (Invert)
       std::swap(TrueV, FalseV);
-    Value *V = Builder.CreateSelect(BrCond, TrueV, FalseV,
-                                    TrueV->getName() + "." + FalseV->getName());
+    Value *V = Builder.CreateSelect(
+        BrCond, TrueV, FalseV, TrueV->getName() + "." + FalseV->getName(), BI);
     PN->setIncomingValue(OrigI, V);
     PN->setIncomingValue(ThenI, V);
   }

Modified: llvm/trunk/test/Transforms/SimplifyCFG/two-entry-phi-return.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/two-entry-phi-return.ll?rev=266442&r1=266441&r2=266442&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/two-entry-phi-return.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/two-entry-phi-return.ll Fri Apr 15 10:32:12 2016
@@ -6,7 +6,7 @@ define i1 @qux(i8* %m, i8* %n, i8* %o, i
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TMP7:%.*]] = icmp eq i8* %m, %n
 ; CHECK-NEXT:    [[TMP15:%.*]] = icmp eq i8* %o, %p
-; CHECK-NEXT:    [[TMP15_:%.*]] = select i1 [[TMP7]], i1 [[TMP15]], i1 false
+; CHECK-NEXT:    [[TMP15_:%.*]] = select i1 [[TMP7]], i1 [[TMP15]], i1 false, !prof !0
 ; CHECK-NEXT:    ret i1 [[TMP15_]]
 ;
 entry: