[llvm] r194843 - Restore the behaviour from before r194728.

[David Blaikie]

I'm assuming this didn't quite restore functionality as expected, since the
public buildbot is now failing:

http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/10552

It may be that you'd have to actually revert r194728 rather than make the
partial change that you have here.

Still waiting on a test case though.


On Fri, Nov 15, 2013 at 11:53 AM, Adrian Prantl <aprantl at apple.com> wrote:

> Author: adrian
> Date: Fri Nov 15 13:53:23 2013
> New Revision: 194843
>
> URL: http://llvm.org/viewvc/llvm-project?rev=194843&view=rev
> Log:
> Restore the behaviour from before r194728.
> If getDIE() fails, getOrCreateContextDIE() should also return the CUDie.
>
> Modified:
>     llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>
> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=194843&r1=194842&r2=194843&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Fri Nov 15
> 13:53:23 2013
> @@ -871,7 +871,9 @@ DIE *CompileUnit::getOrCreateContextDIE(
>      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
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131115/539e14b4/attachment.html>