[llvm-branch-commits] [llvm-branch] r86194 - in /llvm/branches/Apple/Leela: lib/Transforms/Scalar/LoopStrengthReduce.cpp test/CodeGen/ARM/indirectbr.ll test/CodeGen/PowerPC/indirectbr.ll

Dan Gohman gohman at apple.com
Thu Nov 5 15:37:54 PST 2009


Author: djg
Date: Thu Nov  5 17:37:53 2009
New Revision: 86194

URL: http://llvm.org/viewvc/llvm-project?rev=86194&view=rev
Log:
$ svn merge -c 86192 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r86192 into '.':
U    test/CodeGen/PowerPC/indirectbr.ll
U    test/CodeGen/ARM/indirectbr.ll
$ svn merge -c 86193 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r86193 into '.':
U    lib/Transforms/Scalar/LoopStrengthReduce.cpp

Modified:
    llvm/branches/Apple/Leela/lib/Transforms/Scalar/LoopStrengthReduce.cpp
    llvm/branches/Apple/Leela/test/CodeGen/ARM/indirectbr.ll
    llvm/branches/Apple/Leela/test/CodeGen/PowerPC/indirectbr.ll

Modified: llvm/branches/Apple/Leela/lib/Transforms/Scalar/LoopStrengthReduce.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=86194&r1=86193&r2=86194&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Transforms/Scalar/LoopStrengthReduce.cpp Thu Nov  5 17:37:53 2009
@@ -490,6 +490,7 @@
         // is the canonical backedge for this loop, as this can make some
         // inserted code be in an illegal position.
         if (e != 1 && PHIPred->getTerminator()->getNumSuccessors() > 1 &&
+            !isa<IndirectBrInst>(PHIPred->getTerminator()) &&
             (PN->getParent() != L->getHeader() || !L->contains(PHIPred))) {
 
           // First step, split the critical edge.

Modified: llvm/branches/Apple/Leela/test/CodeGen/ARM/indirectbr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/ARM/indirectbr.ll?rev=86194&r1=86193&r2=86194&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/ARM/indirectbr.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/ARM/indirectbr.ll Thu Nov  5 17:37:53 2009
@@ -55,6 +55,6 @@
   store i8* blockaddress(@foo, %L5), i8** @nextaddr, align 4
   ret i32 %res.3
 }
-; ARM: .long L_foo_L5-(LPC{{.*}}+8)
-; THUMB: .long L_foo_L5-(LPC{{.*}}+4)
-; THUMB2: .long L_foo_L5
+; ARM: .long LBA4__foo__L5-(LPC{{.*}}+8)
+; THUMB: .long LBA4__foo__L5-(LPC{{.*}}+4)
+; THUMB2: .long LBA4__foo__L5

Modified: llvm/branches/Apple/Leela/test/CodeGen/PowerPC/indirectbr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/PowerPC/indirectbr.ll?rev=86194&r1=86193&r2=86194&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/PowerPC/indirectbr.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/PowerPC/indirectbr.ll Thu Nov  5 17:37:53 2009
@@ -43,12 +43,12 @@
 
 L1:                                               ; preds = %L2, %bb2
   %res.3 = phi i32 [ %phitmp, %L2 ], [ 2, %bb2 ]  ; <i32> [#uses=1]
-; PIC: addis r4, r2, ha16(L_foo_L5-"L1$pb")
-; PIC: li r5, lo16(L_foo_L5-"L1$pb")
+; PIC: addis r4, r2, ha16(LBA4__foo__L5-"L1$pb")
+; PIC: li r5, lo16(LBA4__foo__L5-"L1$pb")
 ; PIC: add r4, r4, r5
 ; PIC: stw r4
-; STATIC: li r2, lo16(L_foo_L5)
-; STATIC: addis r2, r2, ha16(L_foo_L5)
+; STATIC: li r2, lo16(LBA4__foo__L5)
+; STATIC: addis r2, r2, ha16(LBA4__foo__L5)
 ; STATIC: stw r2
   store i8* blockaddress(@foo, %L5), i8** @nextaddr, align 4
   ret i32 %res.3





More information about the llvm-branch-commits mailing list