From: Lang Hames Date: Mon, 2 Apr 2012 19:58:43 +0000 (+0000) Subject: During two-address lowering, rescheduling an instruction does not untie X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=be9fe49b179a89a659fe786d64b176d2b360bb4a;p=oota-llvm.git During two-address lowering, rescheduling an instruction does not untie operands. Make TryInstructionTransform return false to reflect this. Fixes PR11861. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153892 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp index 24b8bc2048a..789617ba7fc 100644 --- a/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -1248,7 +1248,7 @@ TryInstructionTransform(MachineBasicBlock::iterator &mi, // re-schedule this MI below it. if (RescheduleMIBelowKill(mbbi, mi, nmi, regB)) { ++NumReSchedDowns; - return true; + return false; } if (TargetRegisterInfo::isVirtualRegister(regA)) @@ -1270,7 +1270,7 @@ TryInstructionTransform(MachineBasicBlock::iterator &mi, // re-schedule it before this MI if it's legal. if (RescheduleKillAboveMI(mbbi, mi, nmi, regB)) { ++NumReSchedUps; - return true; + return false; } // If this is an instruction with a load folded into it, try unfolding diff --git a/test/CodeGen/ARM/2012-04-02-TwoAddrInstrCrash.ll b/test/CodeGen/ARM/2012-04-02-TwoAddrInstrCrash.ll new file mode 100644 index 00000000000..33ad187926b --- /dev/null +++ b/test/CodeGen/ARM/2012-04-02-TwoAddrInstrCrash.ll @@ -0,0 +1,24 @@ +; RUN: llc < %s +; PR11861 +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32-S64" +target triple = "armv7-none-linux-gnueabi" + +define arm_aapcs_vfpcc void @foo() nounwind align 2 { + br i1 undef, label %5, label %1 + +;