From 1bbe61860dd610edf23d0b3654b2d6e29a6d4a7a Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Fri, 15 Nov 2013 19:53:23 +0000
Subject: [PATCH] Restore the behaviour from before r194728. If getDIE() fails,
 getOrCreateContextDIE() should also return the CUDie.

llvm-svn: 194843
---
 lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index ee3735cff5a..e399508bb94 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