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