From: Adrian Prantl <aprantl@apple.com>
Date: Fri, 15 Nov 2013 19:53:23 +0000 (+0000)
Subject: Restore the behaviour from before r194728.
X-Git-Tag: v01.01.07.01~14208
X-Git-Url: https://git.ti.com/gitweb?p=opencl%2Fllvm.git;a=commitdiff_plain;h=7d5f2bd5f9615c0f20d3a1f75ec01452d813283b

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 ee3735cff5..e399508bb9 100644
--- 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