From 306c04c2184ae524c03c2797b7c944d5ab8f938e Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Fri, 3 Jan 2014 01:30:05 +0000 Subject: Revert "Reverting r193835 due to weirdness with Go..." The cgo problem was that it wants dwarf2 which doesn't support direct constant encoding of the location. So let's add support for dwarf2 encoding (using a location expression) of data member locations. This reverts commit r198385. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198389 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/DebugInfo/X86/concrete_out_of_line.ll | 6 +++--- test/DebugInfo/X86/data_member_location.ll | 13 +++++++++++-- test/DebugInfo/X86/generate-odr-hash.ll | 3 --- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'test/DebugInfo/X86') diff --git a/test/DebugInfo/X86/concrete_out_of_line.ll b/test/DebugInfo/X86/concrete_out_of_line.ll index fab6793f03..4a152963a1 100644 --- a/test/DebugInfo/X86/concrete_out_of_line.ll +++ b/test/DebugInfo/X86/concrete_out_of_line.ll @@ -7,15 +7,15 @@ ; first check that we have a TAG_subprogram at a given offset and it has ; AT_inline. -; CHECK: 0x0000011e: DW_TAG_subprogram [17] +; CHECK: 0x0000011c: DW_TAG_subprogram [17] ; CHECK-NEXT: DW_AT_specification ; CHECK-NEXT: DW_AT_inline ; and then that a TAG_subprogram refers to it with AT_abstract_origin. -; CHECK: 0x0000015f: DW_TAG_subprogram [19] -; CHECK-NEXT: DW_AT_abstract_origin [DW_FORM_ref4] (cu + 0x011e => {0x0000011e}) +; CHECK: 0x0000015d: DW_TAG_subprogram [19] +; CHECK-NEXT: DW_AT_abstract_origin [DW_FORM_ref4] (cu + 0x011c => {0x0000011c}) define i32 @_ZN17nsAutoRefCnt7ReleaseEv() { entry: diff --git a/test/DebugInfo/X86/data_member_location.ll b/test/DebugInfo/X86/data_member_location.ll index a619d82ae3..bec0eaa406 100644 --- a/test/DebugInfo/X86/data_member_location.ll +++ b/test/DebugInfo/X86/data_member_location.ll @@ -1,4 +1,5 @@ ; RUN: llc -mtriple=x86_64-linux -O0 -o - -filetype=obj < %s | llvm-dwarfdump -debug-dump=info -| FileCheck %s +; RUN: llc -mtriple=x86_64-linux -dwarf-version=2 -O0 -o - -filetype=obj < %s | llvm-dwarfdump -debug-dump=info -| FileCheck -check-prefix=DWARF2 %s ; Generated from Clang with the following source: ; @@ -11,11 +12,19 @@ ; CHECK: DW_AT_name {{.*}} "c" ; CHECK-NOT: DW_TAG -; CHECK: DW_AT_data_member_location {{.*}} (<0x02> 23 00 ) +; CHECK: DW_AT_data_member_location {{.*}} (0x00) ; CHECK: DW_AT_name {{.*}} "i" ; CHECK-NOT: DW_TAG -; CHECK: DW_AT_data_member_location {{.*}} (<0x02> 23 04 ) +; CHECK: DW_AT_data_member_location {{.*}} (0x04) + +; DWARF2: DW_AT_name {{.*}} "c" +; DWARF2-NOT: DW_TAG +; DWARF2: DW_AT_data_member_location {{.*}} (<0x02> 23 00 ) + +; DWARF2: DW_AT_name {{.*}} "i" +; DWARF2-NOT: DW_TAG +; DWARF2: DW_AT_data_member_location {{.*}} (<0x02> 23 04 ) %struct.foo = type { i8, i32 } diff --git a/test/DebugInfo/X86/generate-odr-hash.ll b/test/DebugInfo/X86/generate-odr-hash.ll index a66533cdeb..28c4295826 100644 --- a/test/DebugInfo/X86/generate-odr-hash.ll +++ b/test/DebugInfo/X86/generate-odr-hash.ll @@ -1,8 +1,5 @@ ; REQUIRES: object-emission -; Fail while investigating problem with non-block representations of member offsets. -; XFAIL: * - ; RUN: llc %s -o %t -filetype=obj -O0 -generate-type-units -generate-odr-hash -mtriple=x86_64-unknown-linux-gnu ; RUN: llvm-dwarfdump %t | FileCheck %s -- cgit v1.2.3