1 files changed, 6 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index b6ea6a4166d..fb9e59958a1 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -1321,9 +1321,6 @@ DIE *CompileUnit::getOrCreateSubprogramDIE(DISubprogram SP) {
     DeclDie = getOrCreateSubprogramDIE(SPDecl);
   }
 
-  // Add to context owner.
-  ContextDIE->addChild(SPDie);
-
   // Add function template parameters.
   addTemplateParams(*SPDie, SP.getTemplateParams());
 
@@ -1333,9 +1330,15 @@ DIE *CompileUnit::getOrCreateSubprogramDIE(DISubprogram SP) {
     // Refer function declaration directly.
     addDIEEntry(SPDie, dwarf::DW_AT_specification, DeclDie);
 
+    // Add subprogram definitions to the CU die directly.
+    CUDie.get()->addChild(SPDie);
+
     return SPDie;
   }
 
+  // Add to context owner.
+  ContextDIE->addChild(SPDie);
+
   // Add the linkage name if we have one.
   StringRef LinkageName = SP.getLinkageName();
   if (!LinkageName.empty())