am 31195f0b: Merge "Update aosp/master llvm for rebase to r233350"

* commit '31195f0bdca6ee2a5e72d07edf13e1d81206d949':
  Update aosp/master llvm for rebase to r233350

1 files changed, 204 insertions, 0 deletions

diff --git a/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test b/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
new file mode 100644
index 0000000..ad3ba5a
--- /dev/null
+++ b/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
@@ -0,0 +1,204 @@
+REQUIRES: shell
+RUN: llvm-dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto-dw4.macho.x86_64 | llvm-dwarfdump - | FileCheck %s
+
+CHECK: file format Mach-O 64-bit x86-64
+
+CHECK: debug_info contents
+
+CHECK:  Compile Unit: {{.*}} version = 0x0004
+CHECK:  DW_TAG_compile_unit [1] *
+CHECK:    DW_AT_producer [DW_FORM_strp]	( .debug_str[0x00000001] = "clang version 3.7.0 ")
+CHECK:    DW_AT_language [DW_FORM_data2]	(DW_LANG_C99)
+CHECK:    DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000016] = "basic1.c")
+CHECK:    DW_AT_stmt_list [DW_FORM_sec_offset]      (0x00000000)
+CHECK:    DW_AT_comp_dir [DW_FORM_strp]	( .debug_str[0x0000001f] = "/Inputs")
+CHECK:    DW_AT_low_pc [DW_FORM_addr]       (0x0000000100000f40)
+CHECK:    DW_AT_high_pc [DW_FORM_data4]     (0x0000000b)
+CHECK:    DW_TAG_subprogram [2] *
+CHECK:      DW_AT_low_pc [DW_FORM_addr]	(0x0000000100000f40)
+CHECK:      DW_AT_high_pc [DW_FORM_data4]	(0x0000000b)
+CHECK:      DW_AT_frame_base [DW_FORM_exprloc]	(<0x1> 56 )
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000027] = "main")
+CHECK:      DW_AT_decl_file [DW_FORM_data1] ("/Inputs{{[/\\]}}basic1.c")
+CHECK:      DW_AT_prototyped [DW_FORM_flag_present]	(true)
+CHECK:      DW_AT_type [DW_FORM_ref_addr]   (0x00000000000000a1)
+CHECK:      DW_AT_external [DW_FORM_flag_present]	(true)
+CHECK:      DW_TAG_formal_parameter [3]  
+CHECK:        DW_AT_location [DW_FORM_exprloc]	(<0x3> 55 93 04 )
+CHECK:        DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000002c] = "argc")
+CHECK:        DW_AT_decl_file [DW_FORM_data1]       ("/Inputs{{[/\\]}}basic1.c")
+CHECK:        DW_AT_type [DW_FORM_ref_addr] (0x00000000000000a1)
+CHECK:      DW_TAG_formal_parameter [4]  
+CHECK:        DW_AT_location [DW_FORM_exprloc]	(<0x1> 54 )
+CHECK:        DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000031] = "argv")
+CHECK:        DW_AT_type [DW_FORM_ref4]     (cu + 0x0060 => {0x00000060})
+CHECK:      NULL
+CHECK:    DW_TAG_pointer_type [5]
+CHECK:       DW_AT_type [DW_FORM_ref4]       (cu + 0x0065 => {0x00000065})
+CHECK:    DW_TAG_pointer_type [5]  
+CHECK:    DW_TAG_const_type [6]  
+CHECK:    DW_TAG_base_type [7]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000036] = "char")
+CHECK:      DW_AT_encoding [DW_FORM_data1]	(DW_ATE_signed_char)
+CHECK:      DW_AT_byte_size [DW_FORM_data1]	(0x01)
+CHECK:    NULL
+
+CHECK:  Compile Unit:{{.*}} version = 0x0004
+
+CHECK:  DW_TAG_compile_unit [1] *
+CHECK:    DW_AT_producer [DW_FORM_strp]	( .debug_str[0x00000001] = "clang version 3.7.0 ")
+CHECK:    DW_AT_language [DW_FORM_data2]	(DW_LANG_C99)
+CHECK:    DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000003b] = "basic2.c")
+CHECK:    DW_AT_stmt_list [DW_FORM_sec_offset]      (0x00000044)
+CHECK:    DW_AT_low_pc [DW_FORM_addr]       (0x0000000100000f50)
+CHECK:    DW_AT_high_pc [DW_FORM_data4]     (0x00000037)
+CHECK:    DW_TAG_base_type [7]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000044] = "int")
+CHECK:    DW_TAG_variable [8]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000048] = "baz")
+CHECK:      DW_AT_location [DW_FORM_exprloc]	(<0x9> 03 00 10 00 00 01 00 00 00 )
+CHECK:    DW_TAG_variable [8]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000004c] = "private_int")
+CHECK:      DW_AT_decl_file [DW_FORM_data1] ("/Inputs{{[/\\]}}basic2.c")
+CHECK:      DW_AT_location [DW_FORM_exprloc]	(<0x9> 03 08 10 00 00 01 00 00 00 )
+CHECK:    DW_TAG_subprogram [9]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000058] = "inc")
+CHECK:      DW_AT_type [DW_FORM_ref4]	(cu + 0x002a => {0x000000a1})
+CHECK:      DW_AT_inline [DW_FORM_data1]	(DW_INL_inlined)
+CHECK:    DW_TAG_subprogram [10] *
+CHECK:      DW_AT_low_pc [DW_FORM_addr]	(0x0000000100000f50)
+CHECK:      DW_AT_high_pc [DW_FORM_data4]	(0x00000037)
+CHECK:      DW_AT_frame_base [DW_FORM_exprloc]	(<0x1> 56 )
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000005c] = "foo")
+CHECK:      DW_AT_decl_file [DW_FORM_data1] ("/Inputs{{[/\\]}}basic2.c")
+CHECK:      DW_AT_prototyped [DW_FORM_flag_present]	(true)
+CHECK:      DW_AT_type [DW_FORM_ref4]	(cu + 0x002a => {0x000000a1})
+CHECK:      DW_TAG_formal_parameter [11]
+CHECK:        DW_AT_location [DW_FORM_sec_offset]   (0x00000000)
+CHECK:        DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000060] = "arg")
+CHECK:        DW_AT_type [DW_FORM_ref4]	(cu + 0x002a => {0x000000a1})
+CHECK:      DW_TAG_inlined_subroutine [12]  
+CHECK:        DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x005b => {0x000000d2} "inc")
+CHECK:        DW_AT_low_pc [DW_FORM_addr]	(0x0000000100000f61)
+CHECK:        DW_AT_high_pc [DW_FORM_data4]	(0x0000000f)
+CHECK:      NULL
+CHECK:    NULL
+
+CHECK:  Compile Unit: {{.*}} version = 0x0004
+
+CHECK:  DW_TAG_compile_unit [1] *
+CHECK:    DW_AT_producer [DW_FORM_strp]	( .debug_str[0x00000001] = "clang version 3.7.0 ")
+CHECK:    DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000064] = "basic3.c")
+CHECK:    DW_AT_stmt_list [DW_FORM_sec_offset]      (0x0000009a)
+CHECK:    DW_AT_low_pc [DW_FORM_addr]       (0x0000000100000f90)
+CHECK:    DW_AT_high_pc [DW_FORM_data4]     (0x00000024)
+CHECK:    DW_TAG_variable [13]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x0000006d] = "val")
+CHECK:      DW_AT_decl_file [DW_FORM_data1] ("/Inputs{{[/\\]}}basic3.c")
+CHECK:      DW_AT_location [DW_FORM_exprloc]	(<0x9> 03 04 10 00 00 01 00 00 00 )
+CHECK:    DW_TAG_volatile_type [14]  
+CHECK:    DW_TAG_subprogram [15]  
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000058] = "inc")
+CHECK:      DW_AT_inline [DW_FORM_data1]	(DW_INL_inlined)
+CHECK:    DW_TAG_subprogram [2] *
+CHECK:      DW_AT_low_pc [DW_FORM_addr]	(0x0000000100000f90)
+CHECK:      DW_AT_high_pc [DW_FORM_data4]	(0x00000024)
+CHECK:      DW_AT_frame_base [DW_FORM_exprloc]	(<0x1> 56 )
+CHECK:      DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000071] = "bar")
+CHECK:      DW_TAG_formal_parameter [16]
+CHECK:        DW_AT_location [DW_FORM_sec_offset]   (0x00000025)
+CHECK:        DW_AT_name [DW_FORM_strp]	( .debug_str[0x00000060] = "arg")
+CHECK:      DW_TAG_inlined_subroutine [17]  
+CHECK:        DW_AT_abstract_origin [DW_FORM_ref4]	(cu + 0x0044 => {0x0000015f} "inc")
+CHECK:        DW_AT_ranges [DW_FORM_sec_offset]     (0x00000000
+CHECK:           [0x0000000100000f94 - 0x0000000100000f9a)
+CHECK:           [0x0000000100000f9f - 0x0000000100000fa7))
+
+CHECK:      NULL
+CHECK:    NULL
+
+
+CHECK: .debug_loc contents:
+CHECK-NEXT: 0x00000000: Beginning address offset: 0x0000000000000000
+CHECK-NEXT:                Ending address offset: 0x000000000000000c
+CHECK-NEXT:                 Location description: 55 93 04
+CHECK-NEXT: {{^$}}
+CHECK-NEXT: 0x00000025: Beginning address offset: 0x0000000000000000
+CHECK-NEXT:                Ending address offset: 0x000000000000000f
+CHECK-NEXT:                 Location description: 55 93 04 
+CHECK-NEXT: {{^$}}
+CHECK-NEXT:             Beginning address offset: 0x0000000000000019
+CHECK-NEXT:                Ending address offset: 0x000000000000001d
+CHECK-NEXT:                 Location description: 55 93 04 
+
+CHECK: .debug_aranges contents:
+CHECK-NEXT: Address Range Header: length = 0x0000002c, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x08, seg_size = 0x00
+CHECK-NEXT: [0x0000000100000f40 - 0x0000000100000f4b)
+CHECK-NEXT: Address Range Header: length = 0x0000002c, version = 0x0002, cu_offset = 0x00000077, addr_size = 0x08, seg_size = 0x00
+CHECK-NEXT: [0x0000000100000f50 - 0x0000000100000f87)
+CHECK-NEXT: Address Range Header: length = 0x0000002c, version = 0x0002, cu_offset = 0x0000011b, addr_size = 0x08, seg_size = 0x00
+CHECK-NEXT: [0x0000000100000f90 - 0x0000000100000fb4)
+
+CHECK: .debug_line contents:
+CHECK:                 Dir  Mod Time   File Len   File Name
+CHECK-NEXT:                 ---- ---------- ---------- ---------------------------
+CHECK-NEXT: file_names[  1]    0 0x00000000 0x00000000 basic1.c
+CHECK: Address            Line   Column File   ISA Discriminator Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
+CHECK-NEXT: 0x0000000100000f40     26      0      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000f44     27     10      1   0             0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f49     27      3      1   0             0 
+CHECK-NEXT: 0x0000000100000f4b     27      3      1   0             0  end_sequence
+
+CHECK:                 Dir  Mod Time   File Len   File Name
+CHECK-NEXT:                 ---- ---------- ---------- ---------------------------
+CHECK-NEXT: file_names[  1]    0 0x00000000 0x00000000 basic2.c
+CHECK: Address            Line   Column File   ISA Discriminator Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
+CHECK-NEXT: 0x0000000100000f50     19      0      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000f54     20     18      1   0             0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f5a     20     17      1   0             0 
+CHECK-NEXT: 0x0000000100000f5c     20     10      1   0             0 
+CHECK-NEXT: 0x0000000100000f61     15     10      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000f70     20     23      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000f74     20     36      1   0             0 
+CHECK-NEXT: 0x0000000100000f83     20     31      1   0             0 
+CHECK-NEXT: 0x0000000100000f85     20      3      1   0             0 
+CHECK-NEXT: 0x0000000100000f87     20      3      1   0             0  end_sequence
+
+CHECK:                 Dir  Mod Time   File Len   File Name
+CHECK-NEXT:                 ---- ---------- ---------- ---------------------------
+CHECK-NEXT: file_names[  1]    0 0x00000000 0x00000000 basic3.c
+CHECK: Address            Line   Column File   ISA Discriminator Flags
+CHECK-NEXT: ------------------ ------ ------ ------ --- ------------- -------------
+CHECK-NEXT: 0x0000000100000f90     16      0      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000f94     12     10      1   0             0  is_stmt prologue_end
+CHECK-NEXT: 0x0000000100000f9a     17      7      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000f9f     12     10      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000fa7     20      1      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000fa9     19     18      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000fab     19     10      1   0             0 
+CHECK-NEXT: 0x0000000100000fb2     20      1      1   0             0  is_stmt
+CHECK-NEXT: 0x0000000100000fb4     20      1      1   0             0  is_stmt end_sequence
+
+CHECK: .debug_pubnames contents:
+CHECK-NEXT: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000077
+CHECK-NEXT: Offset     Name
+CHECK-NEXT: 0x0000002a "main"
+CHECK-NEXT: length = 0x0000002e version = 0x0002 unit_offset = 0x00000077 unit_size = 0x000000a4
+CHECK-NEXT: Offset     Name
+CHECK-NEXT: 0x00000031 "baz"
+CHECK-NEXT: 0x00000046 "private_int"
+CHECK-NEXT: 0x00000067 "foo"
+CHECK-NEXT: length = 0x0000001e version = 0x0002 unit_offset = 0x0000011b unit_size = 0x00000085
+CHECK-NEXT: Offset     Name
+CHECK-NEXT: 0x0000002a "val"
+CHECK-NEXT: 0x00000050 "bar"
+
+CHECK: .debug_pubtypes contents:
+CHECK-NEXT: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000077
+CHECK-NEXT: Offset     Name
+CHECK-NEXT: 0x0000006f "char"
+CHECK-NEXT: length = 0x00000016 version = 0x0002 unit_offset = 0x00000077 unit_size = 0x000000a4
+CHECK-NEXT: Offset     Name
+CHECK-NEXT: 0x0000002a "int"