Restore the behaviour from before r194728.

If getDIE() fails, getOrCreateContextDIE() should also return the CUDie.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194843 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index ee3735cff5a95e58dd8868291dd3f1a82cbc3f39..e399508bb949ef88708ca959c418be490ee86ba9 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -871,7 +871,9 @@ DIE *CompileUnit::getOrCreateContextDIE(DIScope Context) {
     return getOrCreateNameSpace(DINameSpace(Context));
   if (Context.isSubprogram())
     return getOrCreateSubprogramDIE(DISubprogram(Context));
-  return getDIE(Context);
+  if (DIE *ContextDIE = getDIE(Context))
+    return ContextDIE;
+  return getCUDie();
 }
 
 /// getOrCreateTypeDIE - Find existing DIE or create new DIE for the