vendor/llvm/llvm-trunk-r238337

1 files changed, 27 insertions, 25 deletions

diff --git a/test/tools/dsymutil/debug-map-parsing.test b/test/tools/dsymutil/debug-map-parsing.test
index f1b310f9b714b..3422316191feb 100644
--- a/test/tools/dsymutil/debug-map-parsing.test
+++ b/test/tools/dsymutil/debug-map-parsing.test
@@ -8,32 +8,32 @@ RUN: not llvm-dsymutil -v -parse-only %p/Inputs/inexistant 2>&1 | FileCheck %s -
 Check that We can parse the debug map of the basic executable.
 
 CHECK-NOT: error
-CHECK: DEBUG MAP:
+CHECK: DEBUG MAP: x86_64-unknown-unknown-macho
 CHECK: /Inputs/basic1.macho.x86_64.o:
-CHECK: 	0000000000000000 => 0000000100000ea0	_main
+CHECK: 	0000000000000000 => 0000000100000ea0+0x24	_main
 CHECK: /Inputs/basic2.macho.x86_64.o:
-CHECK: 	0000000000000310 => 0000000100001000	_baz
-CHECK: 	0000000000000020 => 0000000100000ed0	_foo
-CHECK: 	0000000000000070 => 0000000100000f20	_inc
-CHECK: 	0000000000000560 => 0000000100001008	_private_int
+CHECK: 	0000000000000310 => 0000000100001000+0x0	_baz
+CHECK: 	0000000000000020 => 0000000100000ed0+0x50	_foo
+CHECK: 	0000000000000070 => 0000000100000f20+0x17	_inc
+CHECK: 	0000000000000560 => 0000000100001008+0x0	_private_int
 CHECK: /Inputs/basic3.macho.x86_64.o:
-CHECK: 	0000000000000020 => 0000000100000f40	_bar
-CHECK: 	0000000000000070 => 0000000100000f90	_inc
-CHECK: 	0000000000000004 => 0000000100001004	_val
+CHECK: 	0000000000000020 => 0000000100000f40+0x50	_bar
+CHECK: 	0000000000000070 => 0000000100000f90+0x19	_inc
+CHECK: 	0000000000000004 => 0000000100001004+0x0	_val
 CHECK: END DEBUG MAP
 
 
 Check that we can parse the debug-map of the basic-lto executable
 
 CHECK-LTO-NOT: error
-CHECK-LTO: DEBUG MAP:
+CHECK-LTO: DEBUG MAP: x86_64-unknown-unknown-macho
 CHECK-LTO: /Inputs/basic-lto.macho.x86_64.o:
-CHECK-LTO: 	0000000000000050 => 0000000100000f90	_bar
-CHECK-LTO: 	0000000000000658 => 0000000100001000	_baz
-CHECK-LTO: 	0000000000000010 => 0000000100000f50	_foo
-CHECK-LTO: 	0000000000000000 => 0000000100000f40	_main
-CHECK-LTO: 	00000000000008e8 => 0000000100001008	_private_int
-CHECK-LTO: 	00000000000008ec => 0000000100001004	_val
+CHECK-LTO: 	0000000000000050 => 0000000100000f90+0x24	_bar
+CHECK-LTO: 	0000000000000658 => 0000000100001000+0x0	_baz
+CHECK-LTO: 	0000000000000010 => 0000000100000f50+0x40	_foo
+CHECK-LTO: 	0000000000000000 => 0000000100000f40+0x10	_main
+CHECK-LTO: 	00000000000008e8 => 0000000100001008+0x0	_private_int
+CHECK-LTO: 	00000000000008ec => 0000000100001004+0x0	_val
 CHECK-LTO: END DEBUG MAP
 
 Check thet we correctly handle debug maps with archive members (including only
@@ -48,18 +48,19 @@ CHECK-ARCHIVE-NEXT: 	opened new archive {{.*}}/libbasic.a'
 CHECK-ARCHIVE-NEXT: 	found member in current archive.
 CHECK-ARCHIVE-NEXT: trying to open {{.*}}/libbasic.a(basic3.macho.x86_64.o)'
 CHECK-ARCHIVE-NEXT: 	found member in current archive.
-CHECK-ARCHIVE: DEBUG MAP:   object addr =>  executable addr	symbol name
+CHECK-ARCHIVE: DEBUG MAP: x86_64-unknown-unknown-macho
+CHECK-ARCHIVE:       object addr =>  executable addr	symbol name
 CHECK-ARCHIVE: /Inputs/basic1.macho.x86_64.o:
-CHECK-ARCHIVE: 	0000000000000000 => 0000000100000ea0	_main
+CHECK-ARCHIVE: 	0000000000000000 => 0000000100000ea0+0x24	_main
 CHECK-ARCHIVE: /Inputs/./libbasic.a(basic2.macho.x86_64.o):
-CHECK-ARCHIVE: 	0000000000000310 => 0000000100001000	_baz
-CHECK-ARCHIVE: 	0000000000000020 => 0000000100000ed0	_foo
-CHECK-ARCHIVE: 	0000000000000070 => 0000000100000f20	_inc
-CHECK-ARCHIVE: 	0000000000000560 => 0000000100001004	_private_int
+CHECK-ARCHIVE: 	0000000000000310 => 0000000100001000+0x0	_baz
+CHECK-ARCHIVE: 	0000000000000020 => 0000000100000ed0+0x50	_foo
+CHECK-ARCHIVE: 	0000000000000070 => 0000000100000f20+0x17	_inc
+CHECK-ARCHIVE: 	0000000000000560 => 0000000100001004+0x0	_private_int
 CHECK-ARCHIVE: /Inputs/./libbasic.a(basic3.macho.x86_64.o):
-CHECK-ARCHIVE: 	0000000000000020 => 0000000100000f40	_bar
-CHECK-ARCHIVE: 	0000000000000070 => 0000000100000f90	_inc
-CHECK-ARCHIVE: 	0000000000000004 => 0000000100001008	_val
+CHECK-ARCHIVE: 	0000000000000020 => 0000000100000f40+0x50	_bar
+CHECK-ARCHIVE: 	0000000000000070 => 0000000100000f90+0x19	_inc
+CHECK-ARCHIVE: 	0000000000000004 => 0000000100001008+0x0	_val
 CHECK-ARCHIVE: END DEBUG MAP
 
 Check that we warn about missing object files (this presumes that the files aren't
@@ -69,6 +70,7 @@ NOT-FOUND: cannot open{{.*}}"/Inputs/basic1.macho.x86_64.o": {{[Nn]o}} such file
 NOT-FOUND: cannot open{{.*}}"/Inputs/basic2.macho.x86_64.o": {{[Nn]o}} such file
 NOT-FOUND: cannot open{{.*}}"/Inputs/basic3.macho.x86_64.o": {{[Nn]o}} such file
 NOT-FOUND: DEBUG MAP:
+NOT-FOUND-NEXT:  object addr =>  executable addr	symbol name
 NOT-FOUND-NEXT: END DEBUG MAP
 
 Check that we correctly error out on invalid executatble.