[llvm] r225378 - Debug info: Allow aggregate types to be described by constants.
Eric Christopher
echristo at gmail.com
Wed Jan 7 13:41:52 PST 2015
Cool deal, thanks!
-eric
On Wed Jan 07 2015 at 1:36:52 PM Adrian Prantl <aprantl at apple.com> wrote:
> good point! r225399.
> -- adrian
>
>
> On Jan 7, 2015, at 1:28 PM, Eric Christopher <echristo at gmail.com> wrote:
>
> Feel like updating the comment to describe what's happening?
>
> Thanks!
>
> -eric
>
> On Wed Jan 07 2015 at 12:52:25 PM Adrian Prantl <aprantl at apple.com> wrote:
>
>> Author: adrian
>> Date: Wed Jan 7 14:48:58 2015
>> New Revision: 225378
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=225378&view=rev
>> Log:
>> Debug info: Allow aggregate types to be described by constants.
>>
>> Added:
>> llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll
>> Modified:
>> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>>
>> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
>> CodeGen/AsmPrinter/DwarfUnit.cpp?rev=225378&r1=225377&r2=225378&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
>> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Wed Jan 7 14:48:58
>> 2015
>> @@ -630,10 +630,13 @@ static bool isUnsignedDIType(DwarfDebug
>> // FIXME: reference and rvalue_reference /probably/ shouldn't be
>> allowed
>> // here, but accept them for now due to a bug in SROA producing bogus
>> // dbg.values.
>> - if (T == dwarf::DW_TAG_pointer_type ||
>> + if (T == dwarf::DW_TAG_array_type ||
>> + T == dwarf::DW_TAG_class_type ||
>> + T == dwarf::DW_TAG_pointer_type ||
>> T == dwarf::DW_TAG_ptr_to_member_type ||
>> T == dwarf::DW_TAG_reference_type ||
>> - T == dwarf::DW_TAG_rvalue_reference_type)
>> + T == dwarf::DW_TAG_rvalue_reference_type ||
>> + T == dwarf::DW_TAG_structure_type)
>> return true;
>> assert(T == dwarf::DW_TAG_typedef || T == dwarf::DW_TAG_const_type ||
>> T == dwarf::DW_TAG_volatile_type ||
>>
>> Added: llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/
>> DebugInfo/X86/constant-aggregate.ll?rev=225378&view=auto
>> ============================================================
>> ==================
>> --- llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll (added)
>> +++ llvm/trunk/test/DebugInfo/X86/constant-aggregate.ll Wed Jan 7
>> 14:48:58 2015
>> @@ -0,0 +1,118 @@
>> +; RUN: llc %s -filetype=obj -o %t.o
>> +; RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s
>> +; Test emitting a constant for an aggregate type.
>> +;
>> +; clang -S -O1 -emit-llvm
>> +;
>> +; typedef struct { unsigned i; } S;
>> +;
>> +; unsigned foo(S s) {
>> +; s.i = 1;
>> +; return s.i;
>> +; }
>> +;
>> +; class C { public: unsigned i; };
>> +;
>> +; unsigned foo(C c) {
>> +; c.i = 2;
>> +; return c.i;
>> +; }
>> +;
>> +; unsigned bar() {
>> +; int a[1] = { 3 };
>> +; return a[0];
>> +; }
>> +;
>> +; CHECK: DW_TAG_formal_parameter
>> +; CHECK-NEXT: DW_AT_const_value [DW_FORM_udata] (1)
>> +; CHECK-NEXT: DW_AT_name {{.*}} "s"
>> +;
>> +; CHECK: DW_TAG_formal_parameter
>> +; CHECK-NEXT: DW_AT_const_value [DW_FORM_udata] (2)
>> +; CHECK-NEXT: DW_AT_name {{.*}} "c"
>> +;
>> +; CHECK: DW_TAG_variable
>> +; CHECK-NEXT: DW_AT_const_value [DW_FORM_udata] (3)
>> +; CHECK-NEXT: DW_AT_name {{.*}} "a"
>> +
>> +; ModuleID = 'sroasplit-4.cpp'
>> +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
>> +target triple = "x86_64-apple-macosx10.10.0"
>> +
>> +; Function Attrs: nounwind readnone ssp uwtable
>> +define i32 @_Z3foo1S(i32 %s.coerce) #0 {
>> +entry:
>> + tail call void @llvm.dbg.value(metadata i32 %s.coerce, i64 0, metadata
>> !18, metadata !37), !dbg !38
>> + tail call void @llvm.dbg.value(metadata i32 1, i64 0, metadata !18,
>> metadata !37), !dbg !38
>> + ret i32 1, !dbg !39
>> +}
>> +
>> +; Function Attrs: nounwind readnone ssp uwtable
>> +define i32 @_Z3foo1C(i32 %c.coerce) #0 {
>> +entry:
>> + tail call void @llvm.dbg.value(metadata i32 %c.coerce, i64 0, metadata
>> !23, metadata !37), !dbg !40
>> + tail call void @llvm.dbg.value(metadata i32 2, i64 0, metadata !23,
>> metadata !37), !dbg !40
>> + ret i32 2, !dbg !41
>> +}
>> +
>> +; Function Attrs: nounwind readnone ssp uwtable
>> +define i32 @_Z3barv() #0 {
>> +entry:
>> + tail call void @llvm.dbg.value(metadata i32 3, i64 0, metadata !28,
>> metadata !37), !dbg !42
>> + ret i32 3, !dbg !43
>> +}
>> +
>> +; Function Attrs: nounwind readnone
>> +declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1
>> +
>> +attributes #0 = { nounwind readnone ssp uwtable }
>> +attributes #1 = { nounwind readnone }
>> +
>> +!llvm.dbg.cu = !{!0}
>> +!llvm.module.flags = !{!33, !34, !35}
>> +!llvm.ident = !{!36}
>> +
>> +!0 = !{!"0x11\004\00clang version 3.6.0 (trunk 225364) (llvm/trunk
>> 225366)\001\00\000\00\001", !1, !2, !3, !11, !2, !2} ; [
>> DW_TAG_compile_unit ] [/sroasplit-4.cpp] [DW_LANG_C_plus_plus]
>> +!1 = !{!"sroasplit-4.cpp", !""}
>> +!2 = !{}
>> +!3 = !{!4, !8}
>> +!4 = !{!"0x13\00\001\0032\0032\000\000\000", !1, null, null, !5, null,
>> null, !"_ZTS1S"} ; [ DW_TAG_structure_type ] [line 1, size 32, align 32,
>> offset 0] [def] [from ]
>> +!5 = !{!6}
>> +!6 = !{!"0xd\00i\001\0032\0032\000\000", !1, !"_ZTS1S", !7} ; [
>> DW_TAG_member ] [i] [line 1, size 32, align 32, offset 0] [from unsigned
>> int]
>> +!7 = !{!"0x24\00unsigned int\000\0032\0032\000\000\007", null, null} ;
>> [ DW_TAG_base_type ] [unsigned int] [line 0, size 32, align 32, offset 0,
>> enc DW_ATE_unsigned]
>> +!8 = !{!"0x2\00C\008\0032\0032\000\000\000", !1, null, null, !9, null,
>> null, !"_ZTS1C"} ; [ DW_TAG_class_type ] [C] [line 8, size 32, align 32,
>> offset 0] [def] [from ]
>> +!9 = !{!10}
>> +!10 = !{!"0xd\00i\008\0032\0032\000\003", !1, !"_ZTS1C", !7} ; [
>> DW_TAG_member ] [i] [line 8, size 32, align 32, offset 0] [public] [from
>> unsigned int]
>> +!11 = !{!12, !19, !24}
>> +!12 = !{!"0x2e\00foo\00foo\00_Z3foo1S\003\000\001\000\000\00256\001\003",
>> !1, !13, !14, null, i32 (i32)* @_Z3foo1S, null, null, !17} ; [
>> DW_TAG_subprogram ] [line 3] [def] [foo]
>> +!13 = !{!"0x29", !1} ; [ DW_TAG_file_type ]
>> [/sroasplit-4.cpp]
>> +!14 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !15,
>> null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0,
>> offset 0] [from ]
>> +!15 = !{!7, !16}
>> +!16 = !{!"0x16\00S\001\000\000\000\000", !1, null, !"_ZTS1S"} ; [
>> DW_TAG_typedef ] [S] [line 1, size 0, align 0, offset 0] [from _ZTS1S]
>> +!17 = !{!18}
>> +!18 = !{!"0x101\00s\0016777219\000", !12, !13, !16} ; [
>> DW_TAG_arg_variable ] [s] [line 3]
>> +!19 = !{!"0x2e\00foo\00foo\00_Z3foo1C\0010\000\001\000\000\00256\001\0010",
>> !1, !13, !20, null, i32 (i32)* @_Z3foo1C, null, null, !22} ; [
>> DW_TAG_subprogram ] [line 10] [def] [foo]
>> +!20 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !21,
>> null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0,
>> offset 0] [from ]
>> +!21 = !{!7, !"_ZTS1C"}
>> +!22 = !{!23}
>> +!23 = !{!"0x101\00c\0016777226\000", !19, !13, !"_ZTS1C"} ; [
>> DW_TAG_arg_variable ] [c] [line 10]
>> +!24 = !{!"0x2e\00bar\00bar\00_Z3barv\0015\000\001\000\000\00256\001\0015",
>> !1, !13, !25, null, i32 ()* @_Z3barv, null, null, !27} ; [
>> DW_TAG_subprogram ] [line 15] [def] [bar]
>> +!25 = !{!"0x15\00\000\000\000\000\000\000", null, null, null, !26,
>> null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0,
>> offset 0] [from ]
>> +!26 = !{!7}
>> +!27 = !{!28}
>> +!28 = !{!"0x100\00a\0016\000", !24, !13, !29} ; [
>> DW_TAG_auto_variable ] [a] [line 16]
>> +!29 = !{!"0x1\00\000\0032\0032\000\000\000", null, null, !30, !31,
>> null, null, null} ; [ DW_TAG_array_type ] [line 0, size 32, align 32,
>> offset 0] [from int]
>> +!30 = !{!"0x24\00int\000\0032\0032\000\000\005", null, null} ; [
>> DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc
>> DW_ATE_signed]
>> +!31 = !{!32}
>> +!32 = !{!"0x21\000\001"} ; [
>> DW_TAG_subrange_type ] [0, 0]
>> +!33 = !{i32 2, !"Dwarf Version", i32 2}
>> +!34 = !{i32 2, !"Debug Info Version", i32 2}
>> +!35 = !{i32 1, !"PIC Level", i32 2}
>> +!36 = !{!"clang version 3.6.0 (trunk 225364) (llvm/trunk 225366)"}
>> +!37 = !{!"0x102"} ; [ DW_TAG_expression ]
>> +!38 = !{i32 3, i32 16, !12, null}
>> +!39 = !{i32 5, i32 3, !12, null}
>> +!40 = !{i32 10, i32 16, !19, null}
>> +!41 = !{i32 12, i32 3, !19, null}
>> +!42 = !{i32 16, i32 6, !24, null}
>> +!43 = !{i32 17, i32 3, !24, null}
>>
>>
>> _______________________________________________
>> 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/20150107/82cbd8da/attachment.html>
More information about the llvm-commits
mailing list