[dragonegg] r195356 - Debug.cpp: Try to unbreak build corresponding to llvm's r195055.

[Bill Wendling]

Does this need to go into 3.4?

-bw

On Nov 21, 2013, at 10:35 AM, David Blaikie <dblaikie at gmail.com> wrote:

> 
> 
> 
> 2013/11/21 NAKAMURA Takumi <geek4civic at gmail.com>
> Author: chapuni
> Date: Thu Nov 21 07:40:40 2013
> New Revision: 195356
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=195356&view=rev
> Log:
> Debug.cpp: Try to unbreak build corresponding to llvm's r195055.
> 
> Thanks for the fix, Takumi!
>  
> 
> Modified:
>     dragonegg/trunk/src/Debug.cpp
> 
> Modified: dragonegg/trunk/src/Debug.cpp
> URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Debug.cpp?rev=195356&r1=195355&r2=195356&view=diff
> ==============================================================================
> --- dragonegg/trunk/src/Debug.cpp (original)
> +++ dragonegg/trunk/src/Debug.cpp Thu Nov 21 07:40:40 2013
> @@ -1099,7 +1099,7 @@ DICompositeType DebugInfo::CreateComposi
>    case dwarf::DW_TAG_structure_type:
>      return Builder.createStructType(Context, Name, F, LineNumber, SizeInBits,
>                                      AlignInBits, Flags, DerivedFrom, Elements,
> -                                    0, ContainingType);
> +                                    0, DIType(ContainingType));
>    case dwarf::DW_TAG_union_type:
>      return Builder.createUnionType(Context, Name, F, LineNumber, SizeInBits,
>                                     AlignInBits, Flags, Elements, RuntimeLang);
> @@ -1127,7 +1127,8 @@ DISubprogram DebugInfo::CreateSubprogram
>    assert(CTy.Verify() && "Expected a composite type!");
>    if (ContainingType.isValid() || VK || VIndex)
>      return Builder.createMethod(Context, Name, LinkageName, F, LineNo, CTy,
> -                                isLocalToUnit, isDefinition, VK, VIndex, NULL,
> +                                isLocalToUnit, isDefinition, VK, VIndex,
> +                                DIType(),
>                                  Flags, isOptimized, Fn, NULL);
>    return Builder.createFunction(Context, Name, LinkageName, F, LineNo, CTy,
>                                  isLocalToUnit, isDefinition, LineNo, Flags,
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> _______________________________________________
> 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/20131121/ca3f5188/attachment.html>