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

[Adrian Prantl]

At this point I’m very suspicious myself. I still in the process of figuring out what is happening here.
Eventually we should either add all of them back in or replace all of them with assertions.

cheers,
adrian

On Nov 15, 2013, at 1:12 PM, David Blaikie <dblaikie at gmail.com> wrote:

> 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... 
> 
> 
> On Fri, Nov 15, 2013 at 1:11 PM, David Blaikie <dblaikie at gmail.com> wrote:
> 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
> 
>