[llvm] r273736 - Fix the type signature of DwarfExpression::Add.*Constant to support values >32 bits.
Adrian Prantl via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 24 14:35:09 PDT 2016
Author: adrian
Date: Fri Jun 24 16:35:09 2016
New Revision: 273736
URL: http://llvm.org/viewvc/llvm-project?rev=273736&view=rev
Log:
Fix the type signature of DwarfExpression::Add.*Constant to support values >32 bits.
This fixes an embarrassing bug when emitting .debug_loc entries for 64-bit+ constants,
which were previously silently truncated to 32 bits.
<rdar://problem/26843232>
Added:
llvm/trunk/test/DebugInfo/X86/constant-loclist.ll
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h
llvm/trunk/test/DebugInfo/X86/float_const_loclist.ll
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp?rev=273736&r1=273735&r2=273736&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.cpp Fri Jun 24 16:35:09 2016
@@ -166,13 +166,13 @@ void DwarfExpression::AddStackValue() {
EmitOp(dwarf::DW_OP_stack_value);
}
-void DwarfExpression::AddSignedConstant(int Value) {
+void DwarfExpression::AddSignedConstant(int64_t Value) {
EmitOp(dwarf::DW_OP_consts);
EmitSigned(Value);
AddStackValue();
}
-void DwarfExpression::AddUnsignedConstant(unsigned Value) {
+void DwarfExpression::AddUnsignedConstant(uint64_t Value) {
EmitOp(dwarf::DW_OP_constu);
EmitUnsigned(Value);
AddStackValue();
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h?rev=273736&r1=273735&r2=273736&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h Fri Jun 24 16:35:09 2016
@@ -96,9 +96,9 @@ public:
unsigned PieceOffsetInBits = 0);
/// Emit a signed constant.
- void AddSignedConstant(int Value);
+ void AddSignedConstant(int64_t Value);
/// Emit an unsigned constant.
- void AddUnsignedConstant(unsigned Value);
+ void AddUnsignedConstant(uint64_t Value);
/// Emit an unsigned constant.
void AddUnsignedConstant(const APInt &Value);
Added: llvm/trunk/test/DebugInfo/X86/constant-loclist.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/constant-loclist.ll?rev=273736&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/constant-loclist.ll (added)
+++ llvm/trunk/test/DebugInfo/X86/constant-loclist.ll Fri Jun 24 16:35:09 2016
@@ -0,0 +1,76 @@
+; RUN: %llc_dwarf -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
+
+; A hand-written testcase to check 64-bit constant handling in location lists.
+
+; CHECK: .debug_info contents:
+; CHECK: DW_TAG_variable
+; CHECK-NEXT: DW_AT_location [DW_FORM_data4] (0x[[D:.*]])
+; CHECK-NEXT: DW_AT_name {{.*}}"d"
+; CHECK: DW_TAG_variable
+; CHECK-NEXT: DW_AT_location [DW_FORM_data4] (0x[[I:.*]])
+; CHECK-NEXT: DW_AT_name {{.*}}"i"
+; CHECK: DW_TAG_variable
+; CHECK-NEXT: DW_AT_location [DW_FORM_data4] (0x[[U:.*]])
+; CHECK-NEXT: DW_AT_name {{.*}}"u"
+; CHECK: .debug_loc contents:
+; CHECK: [[D]]:
+; CHECK: Location description: 10 80 80 80 80 80 80 80 80 40
+; CHECK: [[I]]:
+; CHECK: Location description: 11 80 80 80 80 80 80 80 80 c0 00
+; CHECK: [[U]]:
+; CHECK: Location description: 10 80 80 80 80 80 80 80 80 40
+
+source_filename = "test.c"
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx"
+
+; Function Attrs: nounwind ssp uwtable
+define void @main() #0 !dbg !7 {
+ %1 = alloca double, align 8
+ %2 = alloca i64, align 8
+ %3 = alloca i64, align 8
+ store double 2.000000e+00, double* %1, align 8, !dbg !21
+ call void @llvm.dbg.value(metadata i64 0, i64 0, metadata !22, metadata !15), !dbg !24
+ call void @llvm.dbg.value(metadata i64 0, i64 0, metadata !25, metadata !15), !dbg !27
+ call void @llvm.dbg.value(metadata double 2.000000e+00, i64 0, metadata !19, metadata !15), !dbg !21
+ store i64 4611686018427387904, i64* %2, align 8, !dbg !24
+ call void @llvm.dbg.value(metadata i64 4611686018427387904, i64 0, metadata !22, metadata !15), !dbg !24
+ call void @llvm.dbg.value(metadata i64 4611686018427387904, i64 0, metadata !25, metadata !15), !dbg !27
+ store i64 4611686018427387904, i64* %3, align 8, !dbg !27
+ ret void, !dbg !28
+}
+
+; Function Attrs: nounwind readnone
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1
+
+
+attributes #0 = { nounwind ssp uwtable }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+!1 = !DIFile(filename: "test.c", directory: "/tmp")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 2}
+!4 = !{i32 2, !"Debug Info Version", i32 00000003}
+!5 = !{i32 1, !"PIC Level", i32 2}
+!6 = !{!"clang"}
+!7 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !8, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2)
+!8 = !DISubroutineType(types: !{})
+!15 = !DIExpression()
+!16 = !DILocation(line: 1, column: 14, scope: !7)
+!18 = !DILocation(line: 1, column: 24, scope: !7)
+!19 = !DILocalVariable(name: "d", scope: !7, file: !1, line: 2, type: !20)
+!20 = !DIBasicType(name: "double", size: 64, align: 64, encoding: DW_ATE_float)
+!21 = !DILocation(line: 2, column: 10, scope: !7)
+!22 = !DILocalVariable(name: "u", scope: !7, file: !1, line: 3, type: !23)
+!23 = !DIBasicType(name: "long long unsigned int", size: 64, align: 64, encoding: DW_ATE_unsigned)
+!24 = !DILocation(line: 3, column: 22, scope: !7)
+!25 = !DILocalVariable(name: "i", scope: !7, file: !1, line: 4, type: !26)
+!26 = !DIBasicType(name: "long long int", size: 64, align: 64, encoding: DW_ATE_signed)
+!27 = !DILocation(line: 4, column: 20, scope: !7)
+!28 = !DILocation(line: 5, column: 3, scope: !7)
Modified: llvm/trunk/test/DebugInfo/X86/float_const_loclist.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/float_const_loclist.ll?rev=273736&r1=273735&r2=273736&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/float_const_loclist.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/float_const_loclist.ll Fri Jun 24 16:35:09 2016
@@ -20,21 +20,21 @@
;
; CHECK: .debug_info contents:
; CHECK: DW_TAG_variable
-; CHECK-NEXT: DW_AT_location {{.*}} (0x00000000)
+; CHECK-NEXT: DW_AT_location {{.*}} (0x[[LD:.*]])
; CHECK-NEXT: DW_AT_name {{.*}}"ld"
; CHECK: DW_TAG_variable
-; CHECK-NEXT: DW_AT_location {{.*}} (0x00000031)
+; CHECK-NEXT: DW_AT_location {{.*}} (0x[[F:.*]])
; CHECK-NEXT: DW_AT_name {{.*}}"f"
;
; CHECK: .debug_loc contents:
-; CHECK: 0x00000000: Beginning address offset: [[START:.*]]
-; CHECK: Ending address offset: [[END:.*]]
-; CHECK: Location description: 10 80 f0 a3 e1 05 93 08 10 80 80 01 9d 10 40
-; constu ..., piece 8, constu ..., bit-piece 16 64
-; CHECK: 0x00000031: Beginning address offset: [[START]]
-; CHECK: Ending address offset: [[END]]
-; CHECK: Location description: 10 c3 eb a3 82 04
-; constu ...
+; CHECK: [[LD]]: Beginning address offset: [[START:.*]]
+; CHECK: Ending address offset: [[END:.*]]
+; CHECK: Location description: 10 80 f0 a3 e1 f5 d1 f0 fa c8 01 93 08 10 80 80 01 9d 10 40
+; constu 0xc8f5c28f5c28f800, piece 8, constu 0x00004000, bit-piece 16 64
+; CHECK: [[F]]: Beginning address offset: [[START]]
+; CHECK: Ending address offset: [[END]]
+; CHECK: Location description: 10 c3 eb a3 82 04
+; constu ...
source_filename = "test.c"
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.11.0"
More information about the llvm-commits
mailing list