[llvm-branch-commits] [llvm-branch] r98419 - in /llvm/branches/Apple/Hermes: ./ lib/Analysis/ValueTracking.cpp test/Transforms/InstCombine/shift-sra.ll

[Evan Cheng]

Author: evancheng
Date: Fri Mar 12 20:29:57 2010
New Revision: 98419

URL: http://llvm.org/viewvc/llvm-project?rev=98419&view=rev
Log:
Merge 98416.

Modified:
    llvm/branches/Apple/Hermes/   (props changed)
    llvm/branches/Apple/Hermes/lib/Analysis/ValueTracking.cpp
    llvm/branches/Apple/Hermes/test/Transforms/InstCombine/shift-sra.ll

Propchange: llvm/branches/Apple/Hermes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 12 20:29:57 2010
@@ -1 +1 @@
-/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210,98270
+/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210,98270,98416

Modified: llvm/branches/Apple/Hermes/lib/Analysis/ValueTracking.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/lib/Analysis/ValueTracking.cpp?rev=98419&r1=98418&r2=98419&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/lib/Analysis/ValueTracking.cpp (original)
+++ llvm/branches/Apple/Hermes/lib/Analysis/ValueTracking.cpp Fri Mar 12 20:29:57 2010
@@ -778,7 +778,7 @@
     for (unsigned i = 1, e = PN->getNumIncomingValues(); i != e; ++i) {
       if (Tmp == 1) return Tmp;
       Tmp = std::min(Tmp,
-                     ComputeNumSignBits(PN->getIncomingValue(1), TD, Depth+1));
+                     ComputeNumSignBits(PN->getIncomingValue(i), TD, Depth+1));
     }
     return Tmp;
   }

Modified: llvm/branches/Apple/Hermes/test/Transforms/InstCombine/shift-sra.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/test/Transforms/InstCombine/shift-sra.ll?rev=98419&r1=98418&r2=98419&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/test/Transforms/InstCombine/shift-sra.ll (original)
+++ llvm/branches/Apple/Hermes/test/Transforms/InstCombine/shift-sra.ll Fri Mar 12 20:29:57 2010
@@ -56,3 +56,23 @@
 ; CHECK: %P = phi i64
 ; CHECK-NEXT: ret i64 %P
 }
+
+; rdar://7732987
+define i32 @test5(i32 %Y) {
+  br i1 undef, label %A, label %C
+A:
+  br i1 undef, label %B, label %D
+B:
+  br label %D
+C:
+  br i1 undef, label %D, label %E
+D:
+  %P = phi i32 [0, %A], [0, %B], [%Y, %C] 
+  %S = ashr i32 %P, 16
+  ret i32 %S
+; CHECK: @test5
+; CHECK: %P = phi i32
+; CHECK-NEXT: ashr i32 %P, 16
+E:
+  ret i32 0
+}