diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 55eec53b4b63c07333d42cf22ce521f33b1aed3c..31cb0cab580c3b99fba333022bfc72a8747716a4 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -589,9 +589,10 @@ void AsmPrinter::EmitFunctionBody() {
   if (MAI->hasSubsectionsViaSymbols() && !HasAnyRealCode) {
     MCInst Noop;
     TM.getInstrInfo()->getNoopForMachoTarget(Noop);
-    if (Noop.getOpcode())
+    if (Noop.getOpcode()) {
+      OutStreamer.AddComment("avoids zero-length function");
       OutStreamer.EmitInstruction(Noop);
-    else  // Target not mc-ized yet.
+    } else  // Target not mc-ized yet.
       OutStreamer.EmitRawText(StringRef("\tnop\n"));
   }