[llvm] r224780 - DIBuilder: Similar to createPointerType, make createMemberPointerType take

[Adrian Prantl]

> On Dec 23, 2014, at 3:45 PM, David Blaikie <dblaikie at gmail.com> wrote:
> 
> 
> 
> On Tue, Dec 23, 2014 at 3:42 PM, David Blaikie <dblaikie at gmail.com <mailto:dblaikie at gmail.com>> wrote:
> 
> 
> On Tue, Dec 23, 2014 at 11:11 AM, Adrian Prantl <aprantl at apple.com <mailto:aprantl at apple.com>> wrote:
> Author: adrian
> Date: Tue Dec 23 13:11:47 2014
> New Revision: 224780
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=224780&view=rev <http://llvm.org/viewvc/llvm-project?rev=224780&view=rev>
> Log:
> DIBuilder: Similar to createPointerType, make createMemberPointerType take
> a size and alignment. Several assertions in DwarfDebug rely on all variable
> types to report back a size, or to be derived from a type with a size.
> 
> Are these reasonable assertions? 
> 
> Does this change modify the resulting DWARF? (should we be putting a DW_AT_size on such things? I assume not, but haven't looked/compared/etc)
>  
> 
> Tested in CFE.
> 
> The Clang test verifies that this change produces different IR.
> 
> Are the assertions you mention accessible without your SROA patch (presumably, by just writing a post-SROA'd IR example that demonstrates the kind of output is no longer problematic)?

yes they are, but that’s not even necessary to test this change.

> Should we have a test for that, then?

I’ll add one to test my follow-up for r224780.

-- adrian
>  
> 
> Modified:
>     llvm/trunk/include/llvm/IR/DIBuilder.h
>     llvm/trunk/lib/IR/DIBuilder.cpp
> 
> Modified: llvm/trunk/include/llvm/IR/DIBuilder.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DIBuilder.h?rev=224780&r1=224779&r2=224780&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DIBuilder.h?rev=224780&r1=224779&r2=224780&view=diff>
> ==============================================================================
> --- llvm/trunk/include/llvm/IR/DIBuilder.h (original)
> +++ llvm/trunk/include/llvm/IR/DIBuilder.h Tue Dec 23 13:11:47 2014
> @@ -172,8 +172,12 @@ namespace llvm {
> 
>      /// \brief Create debugging information entry for a pointer to member.
>      /// @param PointeeTy Type pointed to by this pointer.
> +    /// @param SizeInBits  Size.
> +    /// @param AlignInBits Alignment. (optional)
>      /// @param Class Type for which this pointer points to members of.
> -    DIDerivedType createMemberPointerType(DIType PointeeTy, DIType Class);
> +    DIDerivedType createMemberPointerType(DIType PointeeTy, DIType Class,
> +                                          uint64_t SizeInBits,
> +                                          uint64_t AlignInBits = 0);
> 
>      /// createReferenceType - Create debugging information entry for a c++
>      /// style reference or rvalue reference type.
> 
> Modified: llvm/trunk/lib/IR/DIBuilder.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=224780&r1=224779&r2=224780&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=224780&r1=224779&r2=224780&view=diff>
> ==============================================================================
> --- llvm/trunk/lib/IR/DIBuilder.cpp (original)
> +++ llvm/trunk/lib/IR/DIBuilder.cpp Tue Dec 23 13:11:47 2014
> @@ -328,14 +328,15 @@ DIBuilder::createPointerType(DIType Poin
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> 
> -DIDerivedType DIBuilder::createMemberPointerType(DIType PointeeTy,
> -                                                 DIType Base) {
> +DIDerivedType
> +DIBuilder::createMemberPointerType(DIType PointeeTy, DIType Base,
> +                                   uint64_t SizeInBits, uint64_t AlignInBits) {
>    // Pointer types are encoded in DIDerivedType format.
>    Metadata *Elts[] = {HeaderBuilder::get(dwarf::DW_TAG_ptr_to_member_type)
>                            .concat(StringRef())
>                            .concat(0) // Line
> -                          .concat(0) // Size
> -                          .concat(0) // Align
> +                          .concat(SizeInBits) // Size
> +                          .concat(AlignInBits) // Align
>                            .concat(0) // Offset
>                            .concat(0) // Flags
>                            .get(VMContext),
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu <mailto:llvm-commits at cs.uiuc.edu>
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits <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/20141223/2d474377/attachment.html>