Index: lib/Target/Mips/MipsAsmPrinter.h
===================================================================
--- lib/Target/Mips/MipsAsmPrinter.h
+++ lib/Target/Mips/MipsAsmPrinter.h
@@ -124,6 +124,7 @@
   void EmitFunctionEntryLabel() override;
   void EmitFunctionBodyStart() override;
   void EmitFunctionBodyEnd() override;
+  void EmitBasicBlockEnd(const MachineBasicBlock &MBB) override;
   bool isBlockOnlyReachableByFallthrough(
                                    const MachineBasicBlock* MBB) const override;
   bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
Index: lib/Target/Mips/MipsAsmPrinter.cpp
===================================================================
--- lib/Target/Mips/MipsAsmPrinter.cpp
+++ lib/Target/Mips/MipsAsmPrinter.cpp
@@ -384,6 +384,12 @@
   OutStreamer->EmitDataRegion(MCDR_DataRegionEnd);
 }
 
+void MipsAsmPrinter::EmitBasicBlockEnd(const MachineBasicBlock &MBB) {
+  MipsTargetStreamer &TS = getTargetStreamer();
+  if (MBB.size() == 0)
+    TS.emitDirectiveInsn();
+}
+
 /// isBlockOnlyReachableByFallthough - Return true if the basic block has
 /// exactly one predecessor and the control transfer mechanism between
 /// the predecessor and this block is a fall-through.
Index: test/CodeGen/Mips/insn-zero-size-bb.ll
===================================================================
--- /dev/null
+++ test/CodeGen/Mips/insn-zero-size-bb.ll
@@ -0,0 +1,27 @@
+; RUN: llc < %s -march=mips -mcpu=mips32 | FileCheck %s
+; RUN: llc < %s -march=mips -mcpu=mips32r3 -mattr=+micromips | FileCheck %s
+; RUN: llc < %s -march=mips -mcpu=mips16 | FileCheck %s
+
+; Verify that when we are in micromips or mips16, we do emit the .insn
+; directive for zero-sized (empty) basic blocks.
+
+declare i32 @foo(...)
+declare void @bar()
+
+define void @main() {
+entry:
+  invoke void @bar() #0
+          to label %unreachable unwind label %return
+
+unreachable:
+; CHECK:          ${{.*}}: # %unreachable
+; CHECK-NEXT:         .insn
+  unreachable
+
+return:
+  %0 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @foo to i8*)
+          catch i8* null
+  ret void
+}
+
+attributes #0 = { noreturn }