diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index de9390eb9f41..31f74a13490d 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -879,7 +879,9 @@ void CGDebugInfo::EmitFunctionStart(const char *Name, QualType ReturnType,
                                   getOrCreateType(ReturnType, Unit),
                                   Fn->hasInternalLinkage(), true/*definition*/);
 
-//  DebugFactory.InsertSubprogramStart(SP, Builder.GetInsertBlock());
+#ifndef ATTACH_DEBUG_INFO_TO_AN_INSN
+  DebugFactory.InsertSubprogramStart(SP, Builder.GetInsertBlock());
+#endif
 
   // Push function on region stack.
   RegionStack.push_back(SP);