<div dir="ltr">I see you made another version of this change in r194848 - though I'm a little suspicious of that since there were several other "if null return then use CU DIE" checks that I removed in r194728 other than the one you just added back... </div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Nov 15, 2013 at 1:11 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'm assuming this didn't quite restore functionality as expected, since the public buildbot is now failing:<br>
<br><a href="http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/10552" target="_blank">http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/10552</a><br>
<br>It may be that you'd have to actually revert r194728 rather than make the partial change that you have here.<br><br>Still waiting on a test case though.</div><div class="HOEnZb"><div class="h5"><div class="gmail_extra">
<br><br><div class="gmail_quote">
On Fri, Nov 15, 2013 at 11:53 AM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

Author: adrian<br>
Date: Fri Nov 15 13:53:23 2013<br>
New Revision: 194843<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=194843&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=194843&view=rev</a><br>
Log:<br>
Restore the behaviour from before r194728.<br>
If getDIE() fails, getOrCreateContextDIE() should also return the CUDie.<br>
<br>
Modified:<br>
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=194843&r1=194842&r2=194843&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=194843&r1=194842&r2=194843&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Fri Nov 15 13:53:23 2013<br>
@@ -871,7 +871,9 @@ DIE *CompileUnit::getOrCreateContextDIE(<br>
     return getOrCreateNameSpace(DINameSpace(Context));<br>
   if (Context.isSubprogram())<br>
     return getOrCreateSubprogramDIE(DISubprogram(Context));<br>
-  return getDIE(Context);<br>
+  if (DIE *ContextDIE = getDIE(Context))<br>
+    return ContextDIE;<br>
+  return getCUDie();<br>
 }<br>
<br>
 /// getOrCreateTypeDIE - Find existing DIE or create new DIE for the<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>