Index: lib/Target/Mips/MicroMipsInstrInfo.td =================================================================== --- lib/Target/Mips/MicroMipsInstrInfo.td +++ lib/Target/Mips/MicroMipsInstrInfo.td @@ -223,7 +223,6 @@ [], IIBranch, FrmR> { let isTerminator = 1; let isBarrier = 1; - let hasDelaySlot = 1; let isBranch = 1; let isIndirectBranch = 1; } Index: test/MC/Mips/micromips-16-bit-instructions.s =================================================================== --- test/MC/Mips/micromips-16-bit-instructions.s +++ test/MC/Mips/micromips-16-bit-instructions.s @@ -31,8 +31,7 @@ # CHECK-EL: jrc $9 # encoding: [0xa9,0x45] # CHECK-NEXT: jalr $9 # encoding: [0xc9,0x45] # CHECK-EL: jraddiusp 20 # encoding: [0x05,0x47] -# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-EL: jalrs16 $9 # encoding: [0xe9,0x45] +# CHECK-NEXT: jalrs16 $9 # encoding: [0xe9,0x45] # CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] # CHECK-EL: jr16 $9 # encoding: [0x89,0x45] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] @@ -61,8 +60,7 @@ # CHECK-EB: jrc $9 # encoding: [0x45,0xa9] # CHECK-NEXT: jalr $9 # encoding: [0x45,0xc9] # CHECK-EB: jraddiusp 20 # encoding: [0x47,0x05] -# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-EB: jalrs16 $9 # encoding: [0x45,0xe9] +# CHECK-NEXT: jalrs16 $9 # encoding: [0x45,0xe9] # CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] # CHECK-EB: jr16 $9 # encoding: [0x45,0x89] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]