Index: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp =================================================================== --- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -8940,7 +8940,7 @@ inITBlock()) return Match_RequiresNotITBlock; // LSL with zero immediate is not allowed in an IT block - if (Opc == ARM::tLSLri && Inst.getOperand(4).getImm() == 0 && inITBlock()) + if (Opc == ARM::tLSLri && Inst.getOperand(3).getImm() == 0 && inITBlock()) return Match_RequiresNotITBlock; } else if (isThumbOne()) { // Some high-register supporting Thumb1 encodings only allow both registers Index: llvm/trunk/test/MC/ARM/lsl-zero.s =================================================================== --- llvm/trunk/test/MC/ARM/lsl-zero.s +++ llvm/trunk/test/MC/ARM/lsl-zero.s @@ -122,19 +122,33 @@ itt eq lsleq r0, r1, #0 lslseq r0, r1, #0 + itt gt + lslgt r0, r1, #0 + lslsgt r0, r1, #0 // CHECK-NONARM: moveq.w r0, r1 @ encoding: [0x4f,0xea,0x01,0x00] // CHECK-NONARM: movseq.w r0, r1 @ encoding: [0x5f,0xea,0x01,0x00] +// CHECK-NONARM: movgt.w r0, r1 @ encoding: [0x4f,0xea,0x01,0x00] +// CHECK-NONARM: movsgt.w r0, r1 @ encoding: [0x5f,0xea,0x01,0x00] // CHECK-ARM: moveq r0, r1 @ encoding: [0x01,0x00,0xa0,0x01] // CHECK-ARM: movseq r0, r1 @ encoding: [0x01,0x00,0xb0,0x01] +// CHECK-ARM: movgt r0, r1 @ encoding: [0x01,0x00,0xa0,0xc1] +// CHECK-ARM: movsgt r0, r1 @ encoding: [0x01,0x00,0xb0,0xc1] itt eq moveq r0, r1, lsl #0 movseq r0, r1, lsl #0 + itt gt + movgt r0, r1, lsl #0 + movsgt r0, r1, lsl #0 // CHECK-NONARM: moveq.w r0, r1 @ encoding: [0x4f,0xea,0x01,0x00] // CHECK-NONARM: movseq.w r0, r1 @ encoding: [0x5f,0xea,0x01,0x00] +// CHECK-NONARM: movgt.w r0, r1 @ encoding: [0x4f,0xea,0x01,0x00] +// CHECK-NONARM: movsgt.w r0, r1 @ encoding: [0x5f,0xea,0x01,0x00] // CHECK-ARM: moveq r0, r1 @ encoding: [0x01,0x00,0xa0,0x01] // CHECK-ARM: movseq r0, r1 @ encoding: [0x01,0x00,0xb0,0x01] +// CHECK-ARM: movgt r0, r1 @ encoding: [0x01,0x00,0xa0,0xc1] +// CHECK-ARM: movsgt r0, r1 @ encoding: [0x01,0x00,0xb0,0xc1]