[PATCH] DebugInfo: Allow CastInst instructions to show up around GlobalValues

Thu Aug 22 17:03:05 PDT 2013

- Address review comments.

Hi dblaikie, echristo,

http://llvm-reviews.chandlerc.com/D1478

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D1478?vs=3683&id=3686#toc

Files:
  lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  test/DebugInfo/non-type-template-arg-cast.ll

Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
===================================================================

--- lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -1145,6 +1145,7 @@
   if (!VP.getName().empty())
     addString(ParamDIE, dwarf::DW_AT_name, VP.getName());
   if (Value *Val = VP.getValue()) {
+    Val = Val->stripPointerCasts();
     if (ConstantInt *CI = dyn_cast<ConstantInt>(Val))
       addConstantValue(ParamDIE, CI, VP.getType().isUnsignedDIType());
     else if (GlobalValue *GV = dyn_cast<GlobalValue>(Val)) {
Index: test/DebugInfo/non-type-template-arg-cast.ll
===================================================================
--- /dev/null
+++ test/DebugInfo/non-type-template-arg-cast.ll
@@ -0,0 +1,77 @@
+; REQUIRES: object-emission
+
+; RUN: llc -O0 -filetype=obj < %s > %t
+; RUN: llvm-dwarfdump %t | FileCheck %s
+
+; This was created from the following source:
+; struct Type {
+;   unsigned int Field1;
+;   unsigned char Field2;
+; };
+
+; template <const Type *G>
+; void func() {
+; }
+
+; const Type Y = {};
+; int main() {
+;   func<&Y>();
+; }
+
+; CHECK: DW_TAG_template_value_parameter
+; CHECK-NEXT: DW_AT_type
+; CHECK-NEXT: DW_AT_name
+; CHECK-NEXT: DW_AT_location
+; CHECK: NULL
+
+%struct.Type = type { i32, i8 }
+
+ at _ZL1Y = internal constant { i32, i8, [3 x i8] } { i32 0, i8 0, [3 x i8] undef }, align 4
+
+; Function Attrs: uwtable
+define i32 @main() #0 {
+entry:
+  call void @_Z4funcIXadL_ZL1YEEEvv(), !dbg !25
+  ret i32 0, !dbg !26
+}
+
+; Function Attrs: nounwind uwtable
+define internal void @_Z4funcIXadL_ZL1YEEEvv() #1 {
+entry:
+  ret void, !dbg !27
+}
+
+attributes #0 = { uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf"="true" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf"="true" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!24}
+
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !22, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/majnemer/llvm/build//var/tmp/dlb.cpp] [DW_LANG_C_plus_plus]
+!1 = metadata !{metadata !"/var/tmp/dlb.cpp", metadata !"/usr/local/google/home/majnemer/llvm/build"}
+!2 = metadata !{i32 0}
+!3 = metadata !{metadata !4, metadata !9}
+!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"main", metadata !"main", metadata !"", i32 11, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @main, null, null, metadata !2, i32 11} ; [ DW_TAG_subprogram ] [line 11] [def] [main]
+!5 = metadata !{i32 786473, metadata !1}          ; [ DW_TAG_file_type ] [/usr/local/google/home/majnemer/llvm/build//var/tmp/dlb.cpp]
+!6 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!7 = metadata !{metadata !8}
+!8 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]
+!9 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"func<&Y>", metadata !"func<&Y>", metadata !"_Z4funcIXadL_ZL1YEEEvv", i32 7, metadata !10, i1 true, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_Z4funcIXadL_ZL1YEEEvv, metadata !12, null, metadata !2, i32 7} ; [ DW_TAG_subprogram ] [line 7] [local] [def] [func<&Y>]
+!10 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !11, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!11 = metadata !{null}
+!12 = metadata !{metadata !13}
+!13 = metadata !{i32 786480, null, metadata !"G", metadata !14, %struct.Type* bitcast ({ i32, i8, [3 x i8] }* @_ZL1Y to %struct.Type*), null, i32 0, i32 0} ; [ DW_TAG_template_value_parameter ]
+!14 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from ]
+!15 = metadata !{i32 786470, null, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, metadata !16} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from Type]
+!16 = metadata !{i32 786451, metadata !1, null, metadata !"Type", i32 1, i64 64, i64 32, i32 0, i32 0, null, metadata !17, i32 0, null, null} ; [ DW_TAG_structure_type ] [Type] [line 1, size 64, align 32, offset 0] [def] [from ]
+!17 = metadata !{metadata !18, metadata !20}
+!18 = metadata !{i32 786445, metadata !1, metadata !16, metadata !"Field1", i32 2, i64 32, i64 32, i64 0, i32 0, metadata !19} ; [ DW_TAG_member ] [Field1] [line 2, size 32, align 32, offset 0] [from unsigned int]
+!19 = metadata !{i32 786468, null, null, metadata !"unsigned int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 7} ; [ DW_TAG_base_type ] [unsigned int] [line 0, size 32, align 32, offset 0, enc DW_ATE_unsigned]
+!20 = metadata !{i32 786445, metadata !1, metadata !16, metadata !"Field2", i32 3, i64 8, i64 8, i64 32, i32 0, metadata !21} ; [ DW_TAG_member ] [Field2] [line 3, size 8, align 8, offset 32] [from unsigned char]
+!21 = metadata !{i32 786468, null, null, metadata !"unsigned char", i32 0, i64 8, i64 8, i64 0, i32 0, i32 8} ; [ DW_TAG_base_type ] [unsigned char] [line 0, size 8, align 8, offset 0, enc DW_ATE_unsigned_char]
+!22 = metadata !{metadata !23}
+!23 = metadata !{i32 786484, i32 0, null, metadata !"Y", metadata !"Y", metadata !"_ZL1Y", metadata !5, i32 10, metadata !15, i32 1, i32 1, { i32, i8, [3 x i8] }* @_ZL1Y, null} ; [ DW_TAG_variable ] [Y] [line 10] [local] [def]
+!24 = metadata !{i32 2, metadata !"Dwarf Version", i32 3}
+!25 = metadata !{i32 12, i32 0, metadata !4, null}
+!26 = metadata !{i32 13, i32 0, metadata !4, null}
+!27 = metadata !{i32 8, i32 0, metadata !9, null} ; [ DW_TAG_imported_declaration ]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D1478.2.patch
Type: text/x-patch
Size: 6355 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130822/5daa47ca/attachment.bin>
