[llvm] r320227 - [NFC] Change the string offsets table tests to generate the object on the fly

Wolfgang Pieb via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 8 16:39:53 PST 2017


Author: wolfgangp
Date: Fri Dec  8 16:39:53 2017
New Revision: 320227

URL: http://llvm.org/viewvc/llvm-project?rev=320227&view=rev
Log:
[NFC] Change the string offsets table tests to generate the object on the fly
which enables us to remove the test scripts and object files from the repository.

https://reviews.llvm.org/D40914

Added:
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-1.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-2.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-3.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-4.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-5.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s
    llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets.s
Removed:
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.x86_64.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.x86_64.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.x86_64.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.x86_64.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.x86_64.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.x86_64.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.o
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.s
    llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.x86_64.o
    llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-dwp.test
    llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-invalid.test
    llvm/trunk/test/DebugInfo/dwarfdump-str-offsets.test

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.s (removed)
@@ -1,277 +0,0 @@
-# Test object to verify that dwarfdump handles dwp files with DWARF v5 string
-# offset tables. We have 2 CUs and 2 TUs, where it is assumed that 
-# CU1 and TU1 came from one object file, CU2 and TU2 from a second object
-# file.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets-dwp.s -filetype=obj \
-#         -o dwarfdump-str_offsets-dwp.x86_64.o
-
-        .section .debug_str.dwo,"MS", at progbits,1
-str_producer:
-        .asciz "Handmade DWARF producer"
-str_CU1:
-        .asciz "Compile_Unit_1"
-str_CU1_dir:
-        .asciz "/home/test/CU1"
-str_CU2:
-        .asciz "Compile_Unit_2"
-str_CU2_dir:
-        .asciz "/home/test/CU2"
-str_TU1:
-        .asciz "Type_Unit_1"
-str_TU1_type:
-        .asciz "MyStruct_1"
-str_TU2:
-        .asciz "Type_Unit_2"
-str_TU2_type:
-        .asciz "MyStruct_2"
-
-        .section .debug_str_offsets.dwo,"", at progbits
-# Object files 1's portion of the .debug_str_offsets.dwo section.
-.debug_str_offsets_object_file1:
-
-# CU1's contribution (from object file 1)
-.debug_str_offsets_start_CU1:
-        .long .debug_str_offsets_end_CU1-.debug_str_offsets_base_CU1
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base_CU1:
-        .long str_producer-.debug_str.dwo
-        .long str_CU1-.debug_str.dwo
-        .long str_CU1_dir-.debug_str.dwo
-.debug_str_offsets_end_CU1:
-
-# TU1's contribution (from object file 1)
-.debug_str_offsets_start_TU1:
-        .long .debug_str_offsets_end_TU1-.debug_str_offsets_base_TU1
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base_TU1:
-        .long str_TU1-.debug_str.dwo
-        .long str_TU1_type-.debug_str.dwo
-.debug_str_offsets_end_TU1:
-
-# Object files 2's portion of the .debug_str_offsets.dwo section.
-.debug_str_offsets_object_file2:
-
-# CU2's contribution (from object file 2)
-.debug_str_offsets_start_CU2:
-        .long .debug_str_offsets_end_CU2-.debug_str_offsets_base_CU2
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base_CU2:
-        .long str_producer-.debug_str.dwo
-        .long str_CU2-.debug_str.dwo
-        .long str_CU2_dir-.debug_str.dwo
-.debug_str_offsets_end_CU2:
-
-# TU2's contribution (from object file 2)
-.debug_str_offsets_start_TU2:
-        .long .debug_str_offsets_end_TU2-.debug_str_offsets_base_TU2
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base_TU2:
-        .long str_TU2-.debug_str.dwo
-        .long str_TU2_type-.debug_str.dwo
-.debug_str_offsets_end_TU2:
-
-
-# Abbrevs are shared for all compile and type units
-        .section .debug_abbrev.dwo,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x25  # DW_AT_producer
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x02  # Abbrev code
-        .byte 0x41  # DW_TAG_type_unit
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x03  # Abbrev code
-        .byte 0x13  # DW_TAG_structure_type
-        .byte 0x00  # DW_CHILDREN_no (no members)
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-abbrev_end:
-
-        .section .debug_info.dwo,"", at progbits
-
-# DWARF v5 CU header.
-CU1_5_start:
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo # Offset Into Abbrev. Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-# The DW_AT_str_offsets_base attribute for CU1 contains the offset of CU1's
-# contribution relative to the start of object file 1's portion of the
-# .debug_str_offsets section.
-        .long .debug_str_offsets_base_CU1-.debug_str_offsets_object_file1
-        .byte 2                # The index of the comp dir string
-        .byte 0 # NULL
-CU1_5_end:
-
-CU2_5_start:
-        .long  CU2_5_end-CU2_5_version  # Length of Unit
-CU2_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo # Offset Into Abbrev. Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-# The DW_AT_str_offsets_base attribute for CU2 contains the offset of CU2's
-# contribution relative to the start of object file 2's portion of the
-# .debug_str_offsets section.
-        .long .debug_str_offsets_base_CU2-.debug_str_offsets_object_file2
-        .byte 2                # The index of the comp dir string
-        .byte 0 # NULL
-CU2_5_end:
-
-        .section .debug_types.dwo,"", at progbits
-# DWARF v5 Type unit header.
-TU1_5_start:
-        .long  TU1_5_end-TU1_5_version  # Length of Unit
-TU1_5_version:
-        .short 5               # DWARF version number
-        .byte 2                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo    # Offset Into Abbrev. Section
-        .quad 0x0011223344556677 # Type Signature
-        .long TU1_5_type-TU1_5_start # Type offset
-# The type-unit DIE, which has a name.
-        .byte 2                # Abbreviation code
-        .byte 0                # Index of the unit type name string
-# The DW_AT_str_offsets_base attribute for TU1 contains the offset of TU1's
-# contribution relative to the start of object file 1's portion of the
-# .debug_str_offsets section.
-        .long .debug_str_offsets_base_TU1-.debug_str_offsets_object_file1
-# The type DIE, which has a name.
-TU1_5_type:
-        .byte 3                # Abbreviation code
-        .byte 1                # Index of the type name string
-        .byte 0 # NULL
-        .byte 0 # NULL
-TU1_5_end:
-
-TU2_5_start:
-        .long  TU2_5_end-TU2_5_version  # Length of Unit
-TU2_5_version:
-        .short 5               # DWARF version number
-        .byte 2                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo    # Offset Into Abbrev. Section
-        .quad 0x00aabbccddeeff99 # Type Signature
-        .long TU2_5_type-TU2_5_start # Type offset
-# The type-unit DIE, which has a name.
-        .byte 2                # Abbreviation code
-        .byte 0                # Index of the unit type name string
-# The DW_AT_str_offsets_base attribute for TU2 contains the offset of TU2's
-# contribution relative to the start of object file 2's portion of the
-# .debug_str_offsets section.
-        .long .debug_str_offsets_base_TU2-.debug_str_offsets_object_file2
-# The type DIE, which has a name.
-TU2_5_type:
-        .byte 3                # Abbreviation code
-        .byte 1                # Index of the type name string
-        .byte 0 # NULL
-        .byte 0 # NULL
-TU2_5_end:
-
-        .section .debug_cu_index,"", at progbits
-        # The index header
-        .long 2                # Version 
-        .long 3                # Columns of contribution matrix
-        .long 2                # number of units
-        .long 2                # number of hash buckets in table
-
-        # The signatures for both CUs.
-        .quad 0xddeeaaddbbaabbee # signature 1
-        .quad 0xff00ffeeffaaff00 # signature 2
-        # The indexes for both CUs.
-        .long 1                # index 1
-        .long 2                # index 2
-        # The sections to which both CUs contribute.
-        .long 1                # DW_SECT_INFO
-        .long 3                # DW_SECT_ABBREV
-        .long 6                # DW_SECT_STR_OFFSETS
-
-        # The starting offsets of both CU's contributions to info,
-        # abbrev and string offsets table.
-        .long CU1_5_start-.debug_info.dwo                   
-        .long 0
-        .long .debug_str_offsets_object_file1-.debug_str_offsets.dwo
-        .long CU2_5_start-.debug_info.dwo
-        .long 0
-        .long .debug_str_offsets_object_file2-.debug_str_offsets.dwo
-
-        # The lengths of both CU's contributions to info, abbrev and
-        # string offsets table.
-        .long CU1_5_end-CU1_5_start
-        .long abbrev_end-.debug_abbrev.dwo
-        .long .debug_str_offsets_end_CU1-.debug_str_offsets_start_CU1
-        .long CU2_5_end-CU2_5_start
-        .long abbrev_end-.debug_abbrev.dwo
-        .long .debug_str_offsets_end_CU2-.debug_str_offsets_start_CU2
-
-        .section .debug_tu_index,"", at progbits
-        # The index header
-        .long 2                # Version 
-        .long 3                # Columns of contribution matrix
-        .long 2                # number of units
-        .long 2                # number of hash buckets in table
-
-        # The signatures for both TUs.
-        .quad 0xeeaaddbbaabbeedd # signature 1
-        .quad 0x00ffeeffaaff00ff # signature 2
-        # The indexes for both TUs.
-        .long 1                # index 1
-        .long 2                # index 2
-        # The sections to which both TUs contribute.
-        .long 2                # DW_SECT_TYPES
-        .long 3                # DW_SECT_ABBREV
-        .long 6                # DW_SECT_STR_OFFSETS
-
-        # The starting offsets of both TU's contributions to info,
-        # abbrev and string offsets table.
-        .long TU1_5_start-.debug_types.dwo
-        .long 0
-        .long .debug_str_offsets_object_file1-.debug_str_offsets.dwo
-        .long TU2_5_start-.debug_types.dwo
-        .long 0
-        .long .debug_str_offsets_object_file2-.debug_str_offsets.dwo
-
-        # The lengths of both TU's contributions to info, abbrev and
-        # string offsets table.
-        .long TU1_5_end-TU1_5_start
-        .long abbrev_end-.debug_abbrev.dwo
-        .long .debug_str_offsets_end_TU1-.debug_str_offsets_start_TU1
-        .long TU2_5_end-TU2_5_start
-        .long abbrev_end-.debug_abbrev.dwo
-        .long .debug_str_offsets_end_TU2-.debug_str_offsets_start_TU2

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-dwp.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.s (removed)
@@ -1,34 +0,0 @@
-# Test object to verify that llvm-dwarfdump handles an invalid string offsets
-# table.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets-invalid-1.s -filetype=obj \
-#         -o dwarfdump-str-offsets-invalid-1.x86_64.o
-#
-# A rudimentary abbrev section.
-        .section .debug_abbrev,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-
-# A rudimentary compile unit to convince dwarfdump that we are dealing with a 
-# DWARF v5 string offsets table.
-        .section .debug_info,"", at progbits
-
-# DWARF v5 CU header.
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-# A compile-unit DIE, which has no attributes.
-        .byte 1                # Abbreviation code
-CU1_5_end:
-
-        .section .debug_str_offsets,"", at progbits
-# A degenerate section, not enough for a single contribution size.
-        .byte 2

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-1.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.s (removed)
@@ -1,36 +0,0 @@
-# Test object to verify that llvm-dwarfdump handles an invalid string offsets
-# table.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets-invalid-2.s -filetype=obj \
-#         -o dwarfdump-str-offsets-invalid-2.x86_64.o
-
-# A rudimentary abbrev section.
-        .section .debug_abbrev,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-
-# A rudimentary compile unit to convince dwarfdump that we are dealing with a
-# DWARF v5 string offsets table.
-        .section .debug_info,"", at progbits
-
-# DWARF v5 CU header.
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-# A compile-unit DIE, which has no attributes.
-        .byte 1                # Abbreviation code
-CU1_5_end:
-
-        .section .debug_str_offsets,"", at progbits
-# A degenerate section with fewer bytes than required for a DWARF64 size.
-        .long 0xffffffff
-        .long 0
-        .short 4

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-2.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.s (removed)
@@ -1,88 +0,0 @@
-# Test object to verify that llvm-dwarfdump handles an invalid string offsets
-# table.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets-invalid-3.s -filetype=obj \
-#         -o dwarfdump-str-offsets-invalid-3.x86_64.o
-
-        .section .debug_str,"MS", at progbits,1
-str_producer:
-        .asciz "Handmade DWARF producer"
-str_CU1:
-        .asciz "Compile_Unit_1"
-str_CU1_dir:
-        .asciz "/home/test/CU1"
-str_CU2:
-        .asciz "Compile_Unit_2"
-str_CU2_dir:
-        .asciz "/home/test/CU2"
-str_TU:
-        .asciz "Type_Unit"
-str_TU_type:
-        .asciz "MyStruct"
-
-        .section .debug_str.dwo,"MS", at progbits,1
-dwo_str_CU_5_producer:
-        .asciz "Handmade split DWARF producer"
-dwo_str_CU_5_name:
-        .asciz "V5_split_compile_unit"
-dwo_str_CU_5_comp_dir:
-        .asciz "/home/test/splitCU"
-dwo_str_TU_5:
-        .asciz "V5_split_type_unit"
-dwo_str_TU_5_type:
-        .asciz "V5_split_Mystruct"
-
-# A rudimentary abbrev section.
-        .section .debug_abbrev,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-
-# A rudimentary compile unit to convince dwarfdump that we are dealing with a
-# DWARF v5 string offsets table.
-        .section .debug_info,"", at progbits
-
-# DWARF v5 CU header.
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-# A compile-unit DIE, which has no attributes.
-        .byte 1                # Abbreviation code
-CU1_5_end:
-
-        .section .debug_str_offsets,"", at progbits
-# CU1's contribution
-# Invalid length
-        .long 0xfffffffe
-        .long .debug_str_offsets_segment0_end-.debug_str_offsets_base0
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base0:
-        .long str_producer
-        .long str_CU1
-        .long str_CU1_dir
-.debug_str_offsets_segment0_end:
-# CU2's contribution
-        .long .debug_str_offsets_segment1_end-.debug_str_offsets_base1
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base1:
-        .long str_producer
-        .long str_CU2
-        .long str_CU2_dir
-.debug_str_offsets_segment1_end:
-# The TU's contribution
-        .long .debug_str_offsets_segment2_end-.debug_str_offsets_base2
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base2:
-        .long str_TU
-        .long str_TU_type
-.debug_str_offsets_segment2_end:

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-3.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.s (removed)
@@ -1,50 +0,0 @@
-# Test object to verify that llvm-dwarfdump handles an invalid string offsets
-# table.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets-invalid-4.s -filetype=obj \
-#         -o dwarfdump-str-offsets-invalid-4.x86_64.o
-
-        .section .debug_str,"MS", at progbits,1
-str_producer:
-        .asciz "Handmade DWARF producer"
-str_CU1:
-        .asciz "Compile_Unit_1"
-
-# A rudimentary abbrev section.
-        .section .debug_abbrev,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-
-# A rudimentary compile unit to convince dwarfdump that we are dealing with a
-# DWARF v5 string offsets table.
-        .section .debug_info,"", at progbits
-
-# DWARF v5 CU header.
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-# A compile-unit DIE, which has no attributes.
-        .byte 1                # Abbreviation code
-CU1_5_end:
-
-# Every unit contributes to the string_offsets table.
-        .section .debug_str_offsets,"", at progbits
-# CU1's contribution
-# The length is not a multiple of 4. Check that we don't read off the
-# end.
-        .long .debug_str_offsets_segment0_end-.debug_str_offsets_base0
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base0:
-        .long str_producer
-        .long str_CU1
-        .byte 0
-.debug_str_offsets_segment0_end:

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-4.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.s (removed)
@@ -1,10 +0,0 @@
-# Test object to verify that llvm-dwarfdump handles a degenerate string offsets
-# section.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets-invalid-5.s -filetype=obj \
-#         -o dwarfdump-str-offsets-invalid-5.x86_64.o
-# Every unit contributes to the string_offsets table.
-        .section .debug_str_offsets,"", at progbits
-# A degenerate section, not enough for a single entry.
-        .byte 2

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-invalid-5.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets-macho.s (removed)
@@ -1,201 +0,0 @@
-# Test object to verify dwarfdump handles v5 string offset tables in Mach-O.
-# This is similar to dwarfdump-str-offsets.s with 2 CUs and 1 TU, but no
-# split sections.
-#
-# To generate the test object:
-# llvm-mc -triple i386-apple-darwin9 dwarfdump-str-offsets-macho.s -filetype=obj \
-#         -o dwarfdump-str-offsets-macho.o
-
-	.section	__DWARF,__debug_str,regular,debug
-Linfo_string:
-	.asciz "Handmade DWARF producer"
-str_CU1:
-        .asciz "Compile_Unit_1"
-str_CU1_dir:
-        .asciz "/home/test/CU1"
-str_CU2:
-        .asciz "Compile_Unit_2"
-str_CU2_dir:
-        .asciz "/home/test/CU2"
-str_TU:
-        .asciz "Type_Unit"
-str_TU_type:
-        .asciz "MyStruct"
-str_Subprogram:
-        .asciz "MyFunc"
-str_Variable1:
-        .asciz "MyVar1"
-str_Variable2:
-        .asciz "MyVar2"
-str_Variable3:
-        .asciz "MyVar3"
-
-	.section	__DWARF,__debug_str_offs,regular,debug
-Ldebug_str_offsets:
-        .long Ldebug_str_offsets_segment0_end-Ldebug_str_offsets_base0
-        .short 5    # DWARF version
-        .short 0    # Padding
-Ldebug_str_offsets_base0:
-        .long str_producer
-        .long str_CU1
-        .long str_CU1_dir
-        .long str_Subprogram
-        .long str_Variable1
-        .long str_Variable2
-        .long str_Variable3
-Ldebug_str_offsets_segment0_end:
-# CU2's contribution
-        .long Ldebug_str_offsets_segment1_end-Ldebug_str_offsets_base1
-        .short 5    # DWARF version
-        .short 0    # Padding
-Ldebug_str_offsets_base1:
-        .long str_producer
-        .long str_CU2
-        .long str_CU2_dir
-Ldebug_str_offsets_segment1_end:
-# The TU's contribution
-        .long Ldebug_str_offsets_segment2_end-Ldebug_str_offsets_base2
-        .short 5    # DWARF version
-        .short 0    # Padding
-Ldebug_str_offsets_base2:
-        .long str_TU
-        .long str_TU_type
-Ldebug_str_offsets_segment2_end:
-
-	.section	__DWARF,__debug_abbrev,regular,debug
-Lsection_abbrev:
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x25  # DW_AT_producer
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x1b  # DW_AT_comp_dir
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x02  # Abbrev code
-        .byte 0x41  # DW_TAG_type_unit
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x03  # Abbrev code
-        .byte 0x13  # DW_TAG_structure_type
-        .byte 0x00  # DW_CHILDREN_no (no members)
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x04  # Abbrev code
-        .byte 0x2e  # DW_TAG_subprogram
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x03  # DW_AT_name
-        .byte 0x25  # DW_FORM_strx1
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x05  # Abbrev code
-        .byte 0x34  # DW_TAG_variable
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x03  # DW_AT_name
-        .byte 0x26  # DW_FORM_strx2
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x06  # Abbrev code
-        .byte 0x34  # DW_TAG_variable
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x03  # DW_AT_name
-        .byte 0x27  # DW_FORM_strx3
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x07  # Abbrev code
-        .byte 0x34  # DW_TAG_variable
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x03  # DW_AT_name
-        .byte 0x28  # DW_FORM_strx4
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-
-	.section	__DWARF,__debug_info,regular,debug
-Lsection_info:
-# DWARF v5 CU header.
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long 0                # Offset Into Abbrev. Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-        .long Ldebug_str_offsets_base0-Ldebug_str_offsets
-        .byte 2                # The index of the comp dir string
-# A subprogram DIE with DW_AT_name, using DW_FORM_strx1.
-        .byte 4                # Abbreviation code
-        .byte 3                # Subprogram name string (DW_FORM_strx1)
-# A variable DIE with DW_AT_name, using DW_FORM_strx2.
-        .byte 5                # Abbreviation code
-        .short 0x0004          # Subprogram name string (DW_FORM_strx2)
-# A variable DIE with DW_AT_name, using DW_FORM_strx3.
-        .byte 6                # Abbreviation code
-        .byte 5                # Subprogram name string (DW_FORM_strx3)
-        .short 0               # Subprogram name string (DW_FORM_strx3)
-# A variable DIE with DW_AT_name, using DW_FORM_strx4.
-        .byte 7                # Abbreviation code
-        .quad 0x00000006       # Subprogram name string (DW_FORM_strx4)
-        .byte 0 # NULL
-        .byte 0 # NULL
-        .byte 0 # NULL
-CU1_5_end:
-
-# DWARF v5 CU header
-        .long  CU2_5_end-CU2_5_version  # Length of Unit
-CU2_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long 0                # Offset Into Abbrev. Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-        .long Ldebug_str_offsets_base1-Ldebug_str_offsets
-        .byte 2                # The index of the comp dir string
-        .byte 0 # NULL
-CU2_5_end:
-
-	.section	__DWARF,__debug_types,regular,debug
-# DWARF v5 Type unit header.
-TU_5_start:
-        .long  TU_5_end-TU_5_version  # Length of Unit
-TU_5_version:
-        .short 5               # DWARF version number
-        .byte 2                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long 0                # Offset Into Abbrev. Section
-        .quad 0x0011223344556677 # Type Signature
-        .long TU_5_type-TU_5_start # Type offset
-# The type-unit DIE, which has a name.
-        .byte 2                # Abbreviation code
-        .byte 0                # Index of the unit type name string
-        .long Ldebug_str_offsets_base2-Ldebug_str_offsets  # offset into the str_offsets section
-# The type DIE, which has a name.
-TU_5_type:
-        .byte 3                # Abbreviation code
-        .byte 1                # Index of the type name string
-        .byte 0 # NULL
-        .byte 0 # NULL
-TU_5_end:
-
-
-.subsections_via_symbols

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.s?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.s (original)
+++ llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.s (removed)
@@ -1,305 +0,0 @@
-# Test object to verify dwarfdump handles v5 string offset tables.
-# We have 2 v5 CUs, a v5 TU, and a split v5 CU and TU.
-#
-# To generate the test object:
-# llvm-mc -triple x86_64-unknown-linux dwarfdump-str-offsets.s -filetype=obj \
-#         -o dwarfdump-str-offsets.x86_64.o
-
-        .section .debug_str,"MS", at progbits,1
-str_producer:
-        .asciz "Handmade DWARF producer"
-str_CU1:
-        .asciz "Compile_Unit_1"
-str_CU1_dir:
-        .asciz "/home/test/CU1"
-str_CU2:
-        .asciz "Compile_Unit_2"
-str_CU2_dir:
-        .asciz "/home/test/CU2"
-str_TU:
-        .asciz "Type_Unit"
-str_TU_type:
-        .asciz "MyStruct"
-str_Subprogram:
-        .asciz "MyFunc"
-str_Variable1:
-        .asciz "MyVar1"
-str_Variable2:
-        .asciz "MyVar2"
-str_Variable3:
-        .asciz "MyVar3"
-
-# Every unit contributes to the string_offsets table.
-        .section .debug_str_offsets,"", at progbits
-# CU1's contribution
-        .long .debug_str_offsets_segment0_end-.debug_str_offsets_base0
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base0:
-        .long str_producer
-        .long str_CU1
-        .long str_CU1_dir
-        .long str_Subprogram
-        .long str_Variable1
-        .long str_Variable2
-        .long str_Variable3
-.debug_str_offsets_segment0_end:
-# CU2's contribution
-        .long .debug_str_offsets_segment1_end-.debug_str_offsets_base1
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base1:
-        .long str_producer
-        .long str_CU2
-        .long str_CU2_dir
-.debug_str_offsets_segment1_end:
-# The TU's contribution
-        .long .debug_str_offsets_segment2_end-.debug_str_offsets_base2
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_str_offsets_base2:
-        .long str_TU
-        .long str_TU_type
-.debug_str_offsets_segment2_end:
-
-        .section .debug_str.dwo,"MS", at progbits,1
-dwo_str_CU_5_producer:
-        .asciz "Handmade split DWARF producer"
-dwo_str_CU_5_name:
-        .asciz "V5_split_compile_unit"
-dwo_str_CU_5_comp_dir:
-        .asciz "/home/test/splitCU"
-dwo_str_TU_5:
-        .asciz "V5_split_type_unit"
-dwo_str_TU_5_type:
-        .asciz "V5_split_Mystruct"
-
-        .section .debug_str_offsets.dwo,"", at progbits
-# The split CU's contribution
-        .long .debug_dwo_str_offsets_segment0_end-.debug_dwo_str_offsets_base0
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_dwo_str_offsets_base0:
-        .long dwo_str_CU_5_producer-.debug_str.dwo
-        .long dwo_str_CU_5_name-.debug_str.dwo
-        .long dwo_str_CU_5_comp_dir-.debug_str.dwo
-.debug_dwo_str_offsets_segment0_end:
-# The split TU's contribution
-        .long .debug_dwo_str_offsets_segment1_end-.debug_dwo_str_offsets_base1
-        .short 5    # DWARF version
-        .short 0    # Padding
-.debug_dwo_str_offsets_base1:
-        .long dwo_str_TU_5-.debug_str.dwo
-        .long dwo_str_TU_5_type-.debug_str.dwo
-.debug_dwo_str_offsets_segment1_end:
-
-# All CUs/TUs use the same abbrev section for simplicity.
-        .section .debug_abbrev,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x25  # DW_AT_producer
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x1b  # DW_AT_comp_dir
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x02  # Abbrev code
-        .byte 0x41  # DW_TAG_type_unit
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x03  # Abbrev code
-        .byte 0x13  # DW_TAG_structure_type
-        .byte 0x00  # DW_CHILDREN_no (no members)
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x04  # Abbrev code
-        .byte 0x2e  # DW_TAG_subprogram
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x03  # DW_AT_name
-        .byte 0x25  # DW_FORM_strx1
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x05  # Abbrev code
-        .byte 0x34  # DW_TAG_variable
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x03  # DW_AT_name
-        .byte 0x26  # DW_FORM_strx2
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x06  # Abbrev code
-        .byte 0x34  # DW_TAG_variable
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x03  # DW_AT_name
-        .byte 0x27  # DW_FORM_strx3
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x07  # Abbrev code
-        .byte 0x34  # DW_TAG_variable
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x03  # DW_AT_name
-        .byte 0x28  # DW_FORM_strx4
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-
-# And a .dwo copy of a subset for the .dwo sections.
-        .section .debug_abbrev.dwo,"", at progbits
-        .byte 0x01  # Abbrev code
-        .byte 0x11  # DW_TAG_compile_unit
-        .byte 0x00  # DW_CHILDREN_no
-        .byte 0x25  # DW_AT_producer
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x1b  # DW_AT_comp_dir
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x02  # Abbrev code
-        .byte 0x41  # DW_TAG_type_unit
-        .byte 0x01  # DW_CHILDREN_yes
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x72  # DW_AT_str_offsets_base
-        .byte 0x17  # DW_FORM_sec_offset
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x03  # Abbrev code
-        .byte 0x13  # DW_TAG_structure_type
-        .byte 0x00  # DW_CHILDREN_no (no members)
-        .byte 0x03  # DW_AT_name
-        .byte 0x1a  # DW_FORM_strx
-        .byte 0x00  # EOM(1)
-        .byte 0x00  # EOM(2)
-        .byte 0x00  # EOM(3)
-        
-        .section .debug_info,"", at progbits
-
-# DWARF v5 CU header.
-        .long  CU1_5_end-CU1_5_version  # Length of Unit
-CU1_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name, 
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-        .long .debug_str_offsets_base0
-        .byte 2                # The index of the comp dir string
-# A subprogram DIE with DW_AT_name, using DW_FORM_strx1.
-        .byte 4                # Abbreviation code
-        .byte 3                # Subprogram name string (DW_FORM_strx1)
-# A variable DIE with DW_AT_name, using DW_FORM_strx2.
-        .byte 5                # Abbreviation code
-        .short 0x0004          # Subprogram name string (DW_FORM_strx2)
-# A variable DIE with DW_AT_name, using DW_FORM_strx3.
-        .byte 6                # Abbreviation code
-        .byte 5                # Subprogram name string (DW_FORM_strx3)
-        .short 0               # Subprogram name string (DW_FORM_strx3)
-# A variable DIE with DW_AT_name, using DW_FORM_strx4.
-        .byte 7                # Abbreviation code
-        .quad 0x00000006       # Subprogram name string (DW_FORM_strx4)
-        .byte 0 # NULL
-        .byte 0 # NULL
-        .byte 0 # NULL
-CU1_5_end:
-
-# DWARF v5 CU header
-        .long  CU2_5_end-CU2_5_version  # Length of Unit
-CU2_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name, 
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-        .long .debug_str_offsets_base1
-        .byte 2                # The index of the comp dir string
-        .byte 0 # NULL
-CU2_5_end:
-
-        .section .debug_types,"", at progbits
-# DWARF v5 Type unit header.
-TU_5_start:
-        .long  TU_5_end-TU_5_version  # Length of Unit
-TU_5_version:
-        .short 5               # DWARF version number
-        .byte 2                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev    # Offset Into Abbrev. Section
-        .quad 0x0011223344556677 # Type Signature
-        .long TU_5_type-TU_5_start # Type offset
-# The type-unit DIE, which has a name.
-        .byte 2                # Abbreviation code
-        .byte 0                # Index of the unit type name string
-        .long .debug_str_offsets_base2  # offset into the str_offsets section
-# The type DIE, which has a name.
-TU_5_type:
-        .byte 3                # Abbreviation code
-        .byte 1                # Index of the type name string
-        .byte 0 # NULL
-        .byte 0 # NULL
-TU_5_end:
-        
-        .section .debug_info.dwo,"", at progbits
-
-# DWARF v5 split CU header.
-        .long  CU_split_5_end-CU_split_5_version  # Length of Unit
-CU_split_5_version:
-        .short 5               # DWARF version number
-        .byte 1                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo  # Offset Into Abbrev Section
-# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name, 
-# DW_AT_str_offsets and DW_AT_compdir.
-        .byte 1                # Abbreviation code
-        .byte 0                # The index of the producer string
-        .byte 1                # The index of the CU name string
-        .long .debug_dwo_str_offsets_base0-.debug_str_offsets.dwo
-        .byte 2                # The index of the comp dir string
-        .byte 0 # NULL
-CU_split_5_end:
-        
-        .section .debug_types.dwo,"", at progbits
-
-# DWARF v5 split type unit header.
-TU_split_5_start:
-        .long  TU_split_5_end-TU_split_5_version  # Length of Unit
-TU_split_5_version:
-        .short 5               # DWARF version number
-        .byte 6                # DWARF Unit Type
-        .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo  # Offset Into Abbrev Section
-        .quad 0x8899aabbccddeeff # Type Signature
-        .long TU_split_5_type-TU_split_5_start  # Type offset
-# The type-unit DIE, which has a name.
-        .byte 2                # Abbreviation code
-        .byte 0                # The index of the type unit name string
-        .long .debug_dwo_str_offsets_base1-.debug_str_offsets.dwo 
-# The type DIE, which has a name.
-TU_split_5_type:
-        .byte 3                # Abbreviation code
-        .byte 1                # The index of the type name string
-        .byte 0 # NULL
-        .byte 0 # NULL
-TU_split_5_end:

Removed: llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.x86_64.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/dwarfdump-str-offsets.x86_64.o?rev=320226&view=auto
==============================================================================
Binary file - no diff available.

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,332 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck %s
+
+# Test object to verify that dwarfdump handles dwp files with DWARF v5 string
+# offset tables. We have 2 CUs and 2 TUs, where it is assumed that 
+# CU1 and TU1 came from one object file, CU2 and TU2 from a second object
+# file.
+#
+        .section .debug_str.dwo,"MS", at progbits,1
+str_producer:
+        .asciz "Handmade DWARF producer"
+str_CU1:
+        .asciz "Compile_Unit_1"
+str_CU1_dir:
+        .asciz "/home/test/CU1"
+str_CU2:
+        .asciz "Compile_Unit_2"
+str_CU2_dir:
+        .asciz "/home/test/CU2"
+str_TU1:
+        .asciz "Type_Unit_1"
+str_TU1_type:
+        .asciz "MyStruct_1"
+str_TU2:
+        .asciz "Type_Unit_2"
+str_TU2_type:
+        .asciz "MyStruct_2"
+
+        .section .debug_str_offsets.dwo,"", at progbits
+# Object files 1's portion of the .debug_str_offsets.dwo section.
+.debug_str_offsets_object_file1:
+
+# CU1's contribution (from object file 1)
+.debug_str_offsets_start_CU1:
+        .long .debug_str_offsets_end_CU1-.debug_str_offsets_base_CU1
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base_CU1:
+        .long str_producer-.debug_str.dwo
+        .long str_CU1-.debug_str.dwo
+        .long str_CU1_dir-.debug_str.dwo
+.debug_str_offsets_end_CU1:
+
+# TU1's contribution (from object file 1)
+.debug_str_offsets_start_TU1:
+        .long .debug_str_offsets_end_TU1-.debug_str_offsets_base_TU1
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base_TU1:
+        .long str_TU1-.debug_str.dwo
+        .long str_TU1_type-.debug_str.dwo
+.debug_str_offsets_end_TU1:
+
+# Object files 2's portion of the .debug_str_offsets.dwo section.
+.debug_str_offsets_object_file2:
+
+# CU2's contribution (from object file 2)
+.debug_str_offsets_start_CU2:
+        .long .debug_str_offsets_end_CU2-.debug_str_offsets_base_CU2
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base_CU2:
+        .long str_producer-.debug_str.dwo
+        .long str_CU2-.debug_str.dwo
+        .long str_CU2_dir-.debug_str.dwo
+.debug_str_offsets_end_CU2:
+
+# TU2's contribution (from object file 2)
+.debug_str_offsets_start_TU2:
+        .long .debug_str_offsets_end_TU2-.debug_str_offsets_base_TU2
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base_TU2:
+        .long str_TU2-.debug_str.dwo
+        .long str_TU2_type-.debug_str.dwo
+.debug_str_offsets_end_TU2:
+
+
+# Abbrevs are shared for all compile and type units
+        .section .debug_abbrev.dwo,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x25  # DW_AT_producer
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x02  # Abbrev code
+        .byte 0x41  # DW_TAG_type_unit
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x03  # Abbrev code
+        .byte 0x13  # DW_TAG_structure_type
+        .byte 0x00  # DW_CHILDREN_no (no members)
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+abbrev_end:
+
+        .section .debug_info.dwo,"", at progbits
+
+# DWARF v5 CU header.
+CU1_5_start:
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev.dwo # Offset Into Abbrev. Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+# The DW_AT_str_offsets_base attribute for CU1 contains the offset of CU1's
+# contribution relative to the start of object file 1's portion of the
+# .debug_str_offsets section.
+        .long .debug_str_offsets_base_CU1-.debug_str_offsets_object_file1
+        .byte 2                # The index of the comp dir string
+        .byte 0 # NULL
+CU1_5_end:
+
+CU2_5_start:
+        .long  CU2_5_end-CU2_5_version  # Length of Unit
+CU2_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev.dwo # Offset Into Abbrev. Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+# The DW_AT_str_offsets_base attribute for CU2 contains the offset of CU2's
+# contribution relative to the start of object file 2's portion of the
+# .debug_str_offsets section.
+        .long .debug_str_offsets_base_CU2-.debug_str_offsets_object_file2
+        .byte 2                # The index of the comp dir string
+        .byte 0 # NULL
+CU2_5_end:
+
+        .section .debug_types.dwo,"", at progbits
+# DWARF v5 Type unit header.
+TU1_5_start:
+        .long  TU1_5_end-TU1_5_version  # Length of Unit
+TU1_5_version:
+        .short 5               # DWARF version number
+        .byte 2                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev.dwo    # Offset Into Abbrev. Section
+        .quad 0x0011223344556677 # Type Signature
+        .long TU1_5_type-TU1_5_start # Type offset
+# The type-unit DIE, which has a name.
+        .byte 2                # Abbreviation code
+        .byte 0                # Index of the unit type name string
+# The DW_AT_str_offsets_base attribute for TU1 contains the offset of TU1's
+# contribution relative to the start of object file 1's portion of the
+# .debug_str_offsets section.
+        .long .debug_str_offsets_base_TU1-.debug_str_offsets_object_file1
+# The type DIE, which has a name.
+TU1_5_type:
+        .byte 3                # Abbreviation code
+        .byte 1                # Index of the type name string
+        .byte 0 # NULL
+        .byte 0 # NULL
+TU1_5_end:
+
+TU2_5_start:
+        .long  TU2_5_end-TU2_5_version  # Length of Unit
+TU2_5_version:
+        .short 5               # DWARF version number
+        .byte 2                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev.dwo    # Offset Into Abbrev. Section
+        .quad 0x00aabbccddeeff99 # Type Signature
+        .long TU2_5_type-TU2_5_start # Type offset
+# The type-unit DIE, which has a name.
+        .byte 2                # Abbreviation code
+        .byte 0                # Index of the unit type name string
+# The DW_AT_str_offsets_base attribute for TU2 contains the offset of TU2's
+# contribution relative to the start of object file 2's portion of the
+# .debug_str_offsets section.
+        .long .debug_str_offsets_base_TU2-.debug_str_offsets_object_file2
+# The type DIE, which has a name.
+TU2_5_type:
+        .byte 3                # Abbreviation code
+        .byte 1                # Index of the type name string
+        .byte 0 # NULL
+        .byte 0 # NULL
+TU2_5_end:
+
+        .section .debug_cu_index,"", at progbits
+        # The index header
+        .long 2                # Version 
+        .long 3                # Columns of contribution matrix
+        .long 2                # number of units
+        .long 2                # number of hash buckets in table
+
+        # The signatures for both CUs.
+        .quad 0xddeeaaddbbaabbee # signature 1
+        .quad 0xff00ffeeffaaff00 # signature 2
+        # The indexes for both CUs.
+        .long 1                # index 1
+        .long 2                # index 2
+        # The sections to which both CUs contribute.
+        .long 1                # DW_SECT_INFO
+        .long 3                # DW_SECT_ABBREV
+        .long 6                # DW_SECT_STR_OFFSETS
+
+        # The starting offsets of both CU's contributions to info,
+        # abbrev and string offsets table.
+        .long CU1_5_start-.debug_info.dwo                   
+        .long 0
+        .long .debug_str_offsets_object_file1-.debug_str_offsets.dwo
+        .long CU2_5_start-.debug_info.dwo
+        .long 0
+        .long .debug_str_offsets_object_file2-.debug_str_offsets.dwo
+
+        # The lengths of both CU's contributions to info, abbrev and
+        # string offsets table.
+        .long CU1_5_end-CU1_5_start
+        .long abbrev_end-.debug_abbrev.dwo
+        .long .debug_str_offsets_end_CU1-.debug_str_offsets_start_CU1
+        .long CU2_5_end-CU2_5_start
+        .long abbrev_end-.debug_abbrev.dwo
+        .long .debug_str_offsets_end_CU2-.debug_str_offsets_start_CU2
+
+        .section .debug_tu_index,"", at progbits
+        # The index header
+        .long 2                # Version 
+        .long 3                # Columns of contribution matrix
+        .long 2                # number of units
+        .long 2                # number of hash buckets in table
+
+        # The signatures for both TUs.
+        .quad 0xeeaaddbbaabbeedd # signature 1
+        .quad 0x00ffeeffaaff00ff # signature 2
+        # The indexes for both TUs.
+        .long 1                # index 1
+        .long 2                # index 2
+        # The sections to which both TUs contribute.
+        .long 2                # DW_SECT_TYPES
+        .long 3                # DW_SECT_ABBREV
+        .long 6                # DW_SECT_STR_OFFSETS
+
+        # The starting offsets of both TU's contributions to info,
+        # abbrev and string offsets table.
+        .long TU1_5_start-.debug_types.dwo
+        .long 0
+        .long .debug_str_offsets_object_file1-.debug_str_offsets.dwo
+        .long TU2_5_start-.debug_types.dwo
+        .long 0
+        .long .debug_str_offsets_object_file2-.debug_str_offsets.dwo
+
+        # The lengths of both TU's contributions to info, abbrev and
+        # string offsets table.
+        .long TU1_5_end-TU1_5_start
+        .long abbrev_end-.debug_abbrev.dwo
+        .long .debug_str_offsets_end_TU1-.debug_str_offsets_start_TU1
+        .long TU2_5_end-TU2_5_start
+        .long abbrev_end-.debug_abbrev.dwo
+        .long .debug_str_offsets_end_TU2-.debug_str_offsets_start_TU2
+
+
+# Verify that the correct strings from each unit are displayed and that the
+# index for the .debug_str_offsets section has the right values.
+
+# CHECK:      Compile Unit
+# CHECK-NOT:  NULL
+# CHECK:      DW_TAG_compile_unit
+# CHECK-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1")
+# CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1")
+# CHECK-NOT:  NULL
+
+# CHECK:      Compile Unit
+# CHECK-NOT:  NULL
+# CHECK:      DW_TAG_compile_unit
+# CHECK-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2")
+# CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2")
+# 
+# CHECK:      Type Unit
+# CHECK-NOT:  NULL
+# CHECK:      DW_TAG_type_unit
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit_1")
+# CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000001c)
+# CHECK-NOT:  NULL
+# CHECK:      DW_TAG_structure_type
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct_1")
+#
+# CHECK:      Type Unit
+# CHECK-NOT:  NULL
+# CHECK:      DW_TAG_type_unit
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit_2")
+# CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000001c)
+# CHECK-NOT:  NULL
+# CHECK:      DW_TAG_structure_type
+# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct_2")
+
+# Verify the correct offets of the compile and type units contributions in the
+# index tables.
+
+# CHECK:      .debug_cu_index contents:
+# CHECK-NOT:  contents:
+# CHECK:      1 0xddeeaaddbbaabbee [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
+# CHECK-SAME: [0x00000000
+# CHECK-NEXT: 2 0xff00ffeeffaaff00 [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
+# CHECK-SAME: [0x00000024
+
+# CHECK:      .debug_tu_index contents:
+# CHECK-NOT:  contents:
+# CHECK:      1 0xeeaaddbbaabbeedd [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
+# CHECK-SAME: [0x00000000
+# CHECK-NEXT: 2 0x00ffeeffaaff00ff [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
+# CHECK:      [0x00000024

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-1.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-1.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-1.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,37 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=INVALIDCONTRIB %s
+#
+# Test object to verify that llvm-dwarfdump handles an invalid string offsets
+# table.
+#
+# A rudimentary abbrev section.
+        .section .debug_abbrev,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+
+# A rudimentary compile unit to convince dwarfdump that we are dealing with a 
+# DWARF v5 string offsets table.
+        .section .debug_info,"", at progbits
+
+# DWARF v5 CU header.
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+# A compile-unit DIE, which has no attributes.
+        .byte 1                # Abbreviation code
+CU1_5_end:
+
+        .section .debug_str_offsets,"", at progbits
+# A degenerate section, not enough for a single contribution size.
+        .byte 2
+
+# INVALIDCONTRIB:            .debug_str_offsets contents:
+# INVALIDCONTRIB-NOT:        contents:
+# INVALIDCONTRIB:            error: invalid contribution to string offsets table in section .debug_str_offsets.

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-2.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-2.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-2.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,39 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=INVALIDCONTRIB %s
+#
+# Test object to verify that llvm-dwarfdump handles an invalid string offsets
+# table.
+#
+# A rudimentary abbrev section.
+        .section .debug_abbrev,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+
+# A rudimentary compile unit to convince dwarfdump that we are dealing with a
+# DWARF v5 string offsets table.
+        .section .debug_info,"", at progbits
+
+# DWARF v5 CU header.
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+# A compile-unit DIE, which has no attributes.
+        .byte 1                # Abbreviation code
+CU1_5_end:
+
+        .section .debug_str_offsets,"", at progbits
+# A degenerate section with fewer bytes than required for a DWARF64 size.
+        .long 0xffffffff
+        .long 0
+        .short 4
+
+# INVALIDCONTRIB:            .debug_str_offsets contents:
+# INVALIDCONTRIB-NOT:        contents:
+# INVALIDCONTRIB:            error: invalid contribution to string offsets table in section .debug_str_offsets.

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-3.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-3.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-3.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-3.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,91 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=INVALIDCONTRIB %s
+#
+# Test object to verify that llvm-dwarfdump handles an invalid string offsets
+# table.
+
+        .section .debug_str,"MS", at progbits,1
+str_producer:
+        .asciz "Handmade DWARF producer"
+str_CU1:
+        .asciz "Compile_Unit_1"
+str_CU1_dir:
+        .asciz "/home/test/CU1"
+str_CU2:
+        .asciz "Compile_Unit_2"
+str_CU2_dir:
+        .asciz "/home/test/CU2"
+str_TU:
+        .asciz "Type_Unit"
+str_TU_type:
+        .asciz "MyStruct"
+
+        .section .debug_str.dwo,"MS", at progbits,1
+dwo_str_CU_5_producer:
+        .asciz "Handmade split DWARF producer"
+dwo_str_CU_5_name:
+        .asciz "V5_split_compile_unit"
+dwo_str_CU_5_comp_dir:
+        .asciz "/home/test/splitCU"
+dwo_str_TU_5:
+        .asciz "V5_split_type_unit"
+dwo_str_TU_5_type:
+        .asciz "V5_split_Mystruct"
+
+# A rudimentary abbrev section.
+        .section .debug_abbrev,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+
+# A rudimentary compile unit to convince dwarfdump that we are dealing with a
+# DWARF v5 string offsets table.
+        .section .debug_info,"", at progbits
+
+# DWARF v5 CU header.
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+# A compile-unit DIE, which has no attributes.
+        .byte 1                # Abbreviation code
+CU1_5_end:
+
+        .section .debug_str_offsets,"", at progbits
+# CU1's contribution
+# Invalid length
+        .long 0xfffffffe
+        .long .debug_str_offsets_segment0_end-.debug_str_offsets_base0
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base0:
+        .long str_producer
+        .long str_CU1
+        .long str_CU1_dir
+.debug_str_offsets_segment0_end:
+# CU2's contribution
+        .long .debug_str_offsets_segment1_end-.debug_str_offsets_base1
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base1:
+        .long str_producer
+        .long str_CU2
+        .long str_CU2_dir
+.debug_str_offsets_segment1_end:
+# The TU's contribution
+        .long .debug_str_offsets_segment2_end-.debug_str_offsets_base2
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base2:
+        .long str_TU
+        .long str_TU_type
+.debug_str_offsets_segment2_end:
+
+# INVALIDCONTRIB:            .debug_str_offsets contents:
+# INVALIDCONTRIB-NOT:        contents:
+# INVALIDCONTRIB:            error: invalid contribution to string offsets table in section .debug_str_offsets.

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-4.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-4.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-4.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-4.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,53 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=INVALIDLENGTH %s
+#
+# Test object to verify that llvm-dwarfdump handles an invalid string offsets
+# table.
+
+        .section .debug_str,"MS", at progbits,1
+str_producer:
+        .asciz "Handmade DWARF producer"
+str_CU1:
+        .asciz "Compile_Unit_1"
+
+# A rudimentary abbrev section.
+        .section .debug_abbrev,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+
+# A rudimentary compile unit to convince dwarfdump that we are dealing with a
+# DWARF v5 string offsets table.
+        .section .debug_info,"", at progbits
+
+# DWARF v5 CU header.
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+# A compile-unit DIE, which has no attributes.
+        .byte 1                # Abbreviation code
+CU1_5_end:
+
+# Every unit contributes to the string_offsets table.
+        .section .debug_str_offsets,"", at progbits
+# CU1's contribution
+# The length is not a multiple of 4. Check that we don't read off the
+# end.
+        .long .debug_str_offsets_segment0_end-.debug_str_offsets_base0
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base0:
+        .long str_producer
+        .long str_CU1
+        .byte 0
+.debug_str_offsets_segment0_end:
+
+# INVALIDLENGTH:             .debug_str_offsets contents:
+# INVALIDLENGTH-NOT:         contents:
+# INVALIDLENGTH:             error: contribution to string offsets table in section .debug_str_offsets has invalid length.

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-5.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-5.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-5.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-invalid-5.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,14 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=INVALIDSECTIONLENGTH %s
+#
+# Test object to verify that llvm-dwarfdump handles a degenerate string offsets
+# section.
+#
+# Every unit contributes to the string_offsets table.
+        .section .debug_str_offsets,"", at progbits
+# A degenerate section, not enough for a single entry.
+        .byte 2
+
+# INVALIDSECTIONLENGTH:      .debug_str_offsets contents:
+# INVALIDSECTIONLENGTH-NOT:  contents:
+# INVALIDSECTIONLENGTH:      error: size of .debug_str_offsets is not a multiple of 4.

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,264 @@
+# RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=COMMON %s
+#
+# Test object to verify dwarfdump handles v5 string offset tables in Mach-O.
+# This is similar to dwarfdump-str-offsets.s with 2 CUs and 1 TU, but no
+# split sections.
+#
+	.section	__DWARF,__debug_str,regular,debug
+Linfo_string:
+	.asciz "Handmade DWARF producer"
+str_CU1:
+        .asciz "Compile_Unit_1"
+str_CU1_dir:
+        .asciz "/home/test/CU1"
+str_CU2:
+        .asciz "Compile_Unit_2"
+str_CU2_dir:
+        .asciz "/home/test/CU2"
+str_TU:
+        .asciz "Type_Unit"
+str_TU_type:
+        .asciz "MyStruct"
+str_Subprogram:
+        .asciz "MyFunc"
+str_Variable1:
+        .asciz "MyVar1"
+str_Variable2:
+        .asciz "MyVar2"
+str_Variable3:
+        .asciz "MyVar3"
+
+	.section	__DWARF,__debug_str_offs,regular,debug
+Ldebug_str_offsets:
+        .long Ldebug_str_offsets_segment0_end-Ldebug_str_offsets_base0
+        .short 5    # DWARF version
+        .short 0    # Padding
+Ldebug_str_offsets_base0:
+        .long str_producer
+        .long str_CU1
+        .long str_CU1_dir
+        .long str_Subprogram
+        .long str_Variable1
+        .long str_Variable2
+        .long str_Variable3
+Ldebug_str_offsets_segment0_end:
+# CU2's contribution
+        .long Ldebug_str_offsets_segment1_end-Ldebug_str_offsets_base1
+        .short 5    # DWARF version
+        .short 0    # Padding
+Ldebug_str_offsets_base1:
+        .long str_producer
+        .long str_CU2
+        .long str_CU2_dir
+Ldebug_str_offsets_segment1_end:
+# The TU's contribution
+        .long Ldebug_str_offsets_segment2_end-Ldebug_str_offsets_base2
+        .short 5    # DWARF version
+        .short 0    # Padding
+Ldebug_str_offsets_base2:
+        .long str_TU
+        .long str_TU_type
+Ldebug_str_offsets_segment2_end:
+
+	.section	__DWARF,__debug_abbrev,regular,debug
+Lsection_abbrev:
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x25  # DW_AT_producer
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x1b  # DW_AT_comp_dir
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x02  # Abbrev code
+        .byte 0x41  # DW_TAG_type_unit
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x03  # Abbrev code
+        .byte 0x13  # DW_TAG_structure_type
+        .byte 0x00  # DW_CHILDREN_no (no members)
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x04  # Abbrev code
+        .byte 0x2e  # DW_TAG_subprogram
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x03  # DW_AT_name
+        .byte 0x25  # DW_FORM_strx1
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x05  # Abbrev code
+        .byte 0x34  # DW_TAG_variable
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x03  # DW_AT_name
+        .byte 0x26  # DW_FORM_strx2
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x06  # Abbrev code
+        .byte 0x34  # DW_TAG_variable
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x03  # DW_AT_name
+        .byte 0x27  # DW_FORM_strx3
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x07  # Abbrev code
+        .byte 0x34  # DW_TAG_variable
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x03  # DW_AT_name
+        .byte 0x28  # DW_FORM_strx4
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+
+	.section	__DWARF,__debug_info,regular,debug
+Lsection_info:
+# DWARF v5 CU header.
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long 0                # Offset Into Abbrev. Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+        .long Ldebug_str_offsets_base0-Ldebug_str_offsets
+        .byte 2                # The index of the comp dir string
+# A subprogram DIE with DW_AT_name, using DW_FORM_strx1.
+        .byte 4                # Abbreviation code
+        .byte 3                # Subprogram name string (DW_FORM_strx1)
+# A variable DIE with DW_AT_name, using DW_FORM_strx2.
+        .byte 5                # Abbreviation code
+        .short 0x0004          # Subprogram name string (DW_FORM_strx2)
+# A variable DIE with DW_AT_name, using DW_FORM_strx3.
+        .byte 6                # Abbreviation code
+        .byte 5                # Subprogram name string (DW_FORM_strx3)
+        .short 0               # Subprogram name string (DW_FORM_strx3)
+# A variable DIE with DW_AT_name, using DW_FORM_strx4.
+        .byte 7                # Abbreviation code
+        .quad 0x00000006       # Subprogram name string (DW_FORM_strx4)
+        .byte 0 # NULL
+        .byte 0 # NULL
+        .byte 0 # NULL
+CU1_5_end:
+
+# DWARF v5 CU header
+        .long  CU2_5_end-CU2_5_version  # Length of Unit
+CU2_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long 0                # Offset Into Abbrev. Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name,
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+        .long Ldebug_str_offsets_base1-Ldebug_str_offsets
+        .byte 2                # The index of the comp dir string
+        .byte 0 # NULL
+CU2_5_end:
+
+	.section	__DWARF,__debug_types,regular,debug
+# DWARF v5 Type unit header.
+TU_5_start:
+        .long  TU_5_end-TU_5_version  # Length of Unit
+TU_5_version:
+        .short 5               # DWARF version number
+        .byte 2                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long 0                # Offset Into Abbrev. Section
+        .quad 0x0011223344556677 # Type Signature
+        .long TU_5_type-TU_5_start # Type offset
+# The type-unit DIE, which has a name.
+        .byte 2                # Abbreviation code
+        .byte 0                # Index of the unit type name string
+        .long Ldebug_str_offsets_base2-Ldebug_str_offsets  # offset into the str_offsets section
+# The type DIE, which has a name.
+TU_5_type:
+        .byte 3                # Abbreviation code
+        .byte 1                # Index of the type name string
+        .byte 0 # NULL
+        .byte 0 # NULL
+TU_5_end:
+
+
+.subsections_via_symbols
+
+# We are using a hand-constructed object file and are interest in the correct
+# diplay of the DW_str_offsetsbase attribute and the correct display of strings.
+#
+# Abbreviation for DW_AT_str_offsets_base
+# COMMON:      .debug_abbrev contents:
+# COMMON-NOT:  contents:
+# COMMON:      DW_TAG_compile_unit
+# COMMON-NOT:  DW_TAG
+# COMMON:      DW_AT_str_offsets_base DW_FORM_sec_offset
+# 
+# Verify that strings are displayed correctly as indexed strings
+# COMMON:      .debug_info contents:
+# COMMON-NOT:  contents:     
+# COMMON:      DW_TAG_compile_unit
+# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1")
+# COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
+# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_subprogram
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx1] ( indexed (00000003) string = "MyFunc")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_variable
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx2] ( indexed (00000004) string = "MyVar1")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_variable
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx3] ( indexed (00000005) string = "MyVar2")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_variable
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx4] ( indexed (00000006) string = "MyVar3")
+# 
+# Second compile unit (b.cpp)
+# COMMON:      DW_TAG_compile_unit
+# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2")
+# COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000002c)
+# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2")
+# 
+# The type unit
+# COMMON:      .debug_types contents:
+# COMMON:      DW_TAG_type_unit
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit")
+# COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset]       (0x00000040)
+# COMMON:      DW_TAG_structure_type
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct")
+# 
+# The .debug_str_offsets section
+# COMMON:      .debug_str_offsets contents:
+# COMMON-NEXT: 0x00000000: Contribution size = 28, Version = 5
+# COMMON-NEXT: 0x00000008: 00000000 "Handmade DWARF producer"
+# COMMON-NEXT: 0x0000000c: 00000018 "Compile_Unit_1"
+# COMMON-NEXT: 0x00000010: 00000027 "/home/test/CU1"
+# COMMON-NEXT: 0x00000014: 00000067 "MyFunc"
+# COMMON-NEXT: 0x00000018: 0000006e "MyVar1"
+# COMMON-NEXT: 0x0000001c: 00000075 "MyVar2"
+# COMMON-NEXT: 0x00000020: 0000007c "MyVar3"
+# COMMON-NEXT: 0x00000024: Contribution size = 12, Version = 5
+# COMMON-NEXT: 0x0000002c: 00000000 "Handmade DWARF producer"
+# COMMON-NEXT: 0x00000030: 00000036 "Compile_Unit_2"
+# COMMON-NEXT: 0x00000034: 00000045 "/home/test/CU2"
+# COMMON-NEXT: 0x00000038: Contribution size = 8, Version = 5
+# COMMON-NEXT: 0x00000040: 00000054 "Type_Unit"
+# COMMON-NEXT: 0x00000044: 0000005e "MyStruct"

Added: llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets.s?rev=320227&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets.s (added)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-str-offsets.s Fri Dec  8 16:39:53 2017
@@ -0,0 +1,396 @@
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t.o
+# RUN: llvm-dwarfdump -v %t.o | FileCheck --check-prefix=COMMON --check-prefix=SPLIT %s
+
+# Test object to verify dwarfdump handles v5 string offset tables.
+# We have 2 v5 CUs, a v5 TU, and a split v5 CU and TU.
+#
+
+        .section .debug_str,"MS", at progbits,1
+str_producer:
+        .asciz "Handmade DWARF producer"
+str_CU1:
+        .asciz "Compile_Unit_1"
+str_CU1_dir:
+        .asciz "/home/test/CU1"
+str_CU2:
+        .asciz "Compile_Unit_2"
+str_CU2_dir:
+        .asciz "/home/test/CU2"
+str_TU:
+        .asciz "Type_Unit"
+str_TU_type:
+        .asciz "MyStruct"
+str_Subprogram:
+        .asciz "MyFunc"
+str_Variable1:
+        .asciz "MyVar1"
+str_Variable2:
+        .asciz "MyVar2"
+str_Variable3:
+        .asciz "MyVar3"
+
+# Every unit contributes to the string_offsets table.
+        .section .debug_str_offsets,"", at progbits
+# CU1's contribution
+        .long .debug_str_offsets_segment0_end-.debug_str_offsets_base0
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base0:
+        .long str_producer
+        .long str_CU1
+        .long str_CU1_dir
+        .long str_Subprogram
+        .long str_Variable1
+        .long str_Variable2
+        .long str_Variable3
+.debug_str_offsets_segment0_end:
+# CU2's contribution
+        .long .debug_str_offsets_segment1_end-.debug_str_offsets_base1
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base1:
+        .long str_producer
+        .long str_CU2
+        .long str_CU2_dir
+.debug_str_offsets_segment1_end:
+# The TU's contribution
+        .long .debug_str_offsets_segment2_end-.debug_str_offsets_base2
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_str_offsets_base2:
+        .long str_TU
+        .long str_TU_type
+.debug_str_offsets_segment2_end:
+
+        .section .debug_str.dwo,"MS", at progbits,1
+dwo_str_CU_5_producer:
+        .asciz "Handmade split DWARF producer"
+dwo_str_CU_5_name:
+        .asciz "V5_split_compile_unit"
+dwo_str_CU_5_comp_dir:
+        .asciz "/home/test/splitCU"
+dwo_str_TU_5:
+        .asciz "V5_split_type_unit"
+dwo_str_TU_5_type:
+        .asciz "V5_split_Mystruct"
+
+        .section .debug_str_offsets.dwo,"", at progbits
+# The split CU's contribution
+        .long .debug_dwo_str_offsets_segment0_end-.debug_dwo_str_offsets_base0
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_dwo_str_offsets_base0:
+        .long dwo_str_CU_5_producer-.debug_str.dwo
+        .long dwo_str_CU_5_name-.debug_str.dwo
+        .long dwo_str_CU_5_comp_dir-.debug_str.dwo
+.debug_dwo_str_offsets_segment0_end:
+# The split TU's contribution
+        .long .debug_dwo_str_offsets_segment1_end-.debug_dwo_str_offsets_base1
+        .short 5    # DWARF version
+        .short 0    # Padding
+.debug_dwo_str_offsets_base1:
+        .long dwo_str_TU_5-.debug_str.dwo
+        .long dwo_str_TU_5_type-.debug_str.dwo
+.debug_dwo_str_offsets_segment1_end:
+
+# All CUs/TUs use the same abbrev section for simplicity.
+        .section .debug_abbrev,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x25  # DW_AT_producer
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x1b  # DW_AT_comp_dir
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x02  # Abbrev code
+        .byte 0x41  # DW_TAG_type_unit
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x03  # Abbrev code
+        .byte 0x13  # DW_TAG_structure_type
+        .byte 0x00  # DW_CHILDREN_no (no members)
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x04  # Abbrev code
+        .byte 0x2e  # DW_TAG_subprogram
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x03  # DW_AT_name
+        .byte 0x25  # DW_FORM_strx1
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x05  # Abbrev code
+        .byte 0x34  # DW_TAG_variable
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x03  # DW_AT_name
+        .byte 0x26  # DW_FORM_strx2
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x06  # Abbrev code
+        .byte 0x34  # DW_TAG_variable
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x03  # DW_AT_name
+        .byte 0x27  # DW_FORM_strx3
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x07  # Abbrev code
+        .byte 0x34  # DW_TAG_variable
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x03  # DW_AT_name
+        .byte 0x28  # DW_FORM_strx4
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+
+# And a .dwo copy of a subset for the .dwo sections.
+        .section .debug_abbrev.dwo,"", at progbits
+        .byte 0x01  # Abbrev code
+        .byte 0x11  # DW_TAG_compile_unit
+        .byte 0x00  # DW_CHILDREN_no
+        .byte 0x25  # DW_AT_producer
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x1b  # DW_AT_comp_dir
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x02  # Abbrev code
+        .byte 0x41  # DW_TAG_type_unit
+        .byte 0x01  # DW_CHILDREN_yes
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x72  # DW_AT_str_offsets_base
+        .byte 0x17  # DW_FORM_sec_offset
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x03  # Abbrev code
+        .byte 0x13  # DW_TAG_structure_type
+        .byte 0x00  # DW_CHILDREN_no (no members)
+        .byte 0x03  # DW_AT_name
+        .byte 0x1a  # DW_FORM_strx
+        .byte 0x00  # EOM(1)
+        .byte 0x00  # EOM(2)
+        .byte 0x00  # EOM(3)
+        
+        .section .debug_info,"", at progbits
+
+# DWARF v5 CU header.
+        .long  CU1_5_end-CU1_5_version  # Length of Unit
+CU1_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name, 
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+        .long .debug_str_offsets_base0
+        .byte 2                # The index of the comp dir string
+# A subprogram DIE with DW_AT_name, using DW_FORM_strx1.
+        .byte 4                # Abbreviation code
+        .byte 3                # Subprogram name string (DW_FORM_strx1)
+# A variable DIE with DW_AT_name, using DW_FORM_strx2.
+        .byte 5                # Abbreviation code
+        .short 0x0004          # Subprogram name string (DW_FORM_strx2)
+# A variable DIE with DW_AT_name, using DW_FORM_strx3.
+        .byte 6                # Abbreviation code
+        .byte 5                # Subprogram name string (DW_FORM_strx3)
+        .short 0               # Subprogram name string (DW_FORM_strx3)
+# A variable DIE with DW_AT_name, using DW_FORM_strx4.
+        .byte 7                # Abbreviation code
+        .quad 0x00000006       # Subprogram name string (DW_FORM_strx4)
+        .byte 0 # NULL
+        .byte 0 # NULL
+        .byte 0 # NULL
+CU1_5_end:
+
+# DWARF v5 CU header
+        .long  CU2_5_end-CU2_5_version  # Length of Unit
+CU2_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name, 
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+        .long .debug_str_offsets_base1
+        .byte 2                # The index of the comp dir string
+        .byte 0 # NULL
+CU2_5_end:
+
+        .section .debug_types,"", at progbits
+# DWARF v5 Type unit header.
+TU_5_start:
+        .long  TU_5_end-TU_5_version  # Length of Unit
+TU_5_version:
+        .short 5               # DWARF version number
+        .byte 2                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev    # Offset Into Abbrev. Section
+        .quad 0x0011223344556677 # Type Signature
+        .long TU_5_type-TU_5_start # Type offset
+# The type-unit DIE, which has a name.
+        .byte 2                # Abbreviation code
+        .byte 0                # Index of the unit type name string
+        .long .debug_str_offsets_base2  # offset into the str_offsets section
+# The type DIE, which has a name.
+TU_5_type:
+        .byte 3                # Abbreviation code
+        .byte 1                # Index of the type name string
+        .byte 0 # NULL
+        .byte 0 # NULL
+TU_5_end:
+        
+        .section .debug_info.dwo,"", at progbits
+
+# DWARF v5 split CU header.
+        .long  CU_split_5_end-CU_split_5_version  # Length of Unit
+CU_split_5_version:
+        .short 5               # DWARF version number
+        .byte 1                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev.dwo  # Offset Into Abbrev Section
+# The compile-unit DIE, which has a DW_AT_producer, DW_AT_name, 
+# DW_AT_str_offsets and DW_AT_compdir.
+        .byte 1                # Abbreviation code
+        .byte 0                # The index of the producer string
+        .byte 1                # The index of the CU name string
+        .long .debug_dwo_str_offsets_base0-.debug_str_offsets.dwo
+        .byte 2                # The index of the comp dir string
+        .byte 0 # NULL
+CU_split_5_end:
+        
+        .section .debug_types.dwo,"", at progbits
+
+# DWARF v5 split type unit header.
+TU_split_5_start:
+        .long  TU_split_5_end-TU_split_5_version  # Length of Unit
+TU_split_5_version:
+        .short 5               # DWARF version number
+        .byte 6                # DWARF Unit Type
+        .byte 8                # Address Size (in bytes)
+        .long .debug_abbrev.dwo  # Offset Into Abbrev Section
+        .quad 0x8899aabbccddeeff # Type Signature
+        .long TU_split_5_type-TU_split_5_start  # Type offset
+# The type-unit DIE, which has a name.
+        .byte 2                # Abbreviation code
+        .byte 0                # The index of the type unit name string
+        .long .debug_dwo_str_offsets_base1-.debug_str_offsets.dwo 
+# The type DIE, which has a name.
+TU_split_5_type:
+        .byte 3                # Abbreviation code
+        .byte 1                # The index of the type name string
+        .byte 0 # NULL
+        .byte 0 # NULL
+TU_split_5_end:
+
+# We are using a hand-constructed object file and are interest in the correct
+# diplay of the DW_str_offsetsbase attribute, the correct display of strings
+# and the dump of the .debug_str_offsets[.dwo] table.
+
+# Abbreviation for DW_AT_str_offsets_base
+# COMMON:      .debug_abbrev contents:
+# COMMON-NOT:  contents:
+# COMMON:      DW_TAG_compile_unit
+# COMMON-NOT:  DW_TAG
+# COMMON:      DW_AT_str_offsets_base DW_FORM_sec_offset
+# 
+# Verify that strings are displayed correctly as indexed strings
+# COMMON:      .debug_info contents:
+# COMMON-NOT:  contents:     
+# COMMON:      DW_TAG_compile_unit
+# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1")
+# COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
+# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_subprogram
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx1] ( indexed (00000003) string = "MyFunc")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_variable
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx2] ( indexed (00000004) string = "MyVar1")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_variable
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx3] ( indexed (00000005) string = "MyVar2")
+# COMMON-NOT:  NULL
+# COMMON:      DW_TAG_variable
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx4] ( indexed (00000006) string = "MyVar3")
+# 
+# Second compile unit (b.cpp)
+# COMMON:      DW_TAG_compile_unit
+# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2")
+# COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000002c)
+# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2")
+# 
+# The split CU
+# SPLIT:       .debug_info.dwo contents:
+# SPLIT-NOT:   contents:
+# SPLIT:       DW_TAG_compile_unit
+# SPLIT-NEXT:  DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade split DWARF producer")
+# SPLIT-NEXT:  DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "V5_split_compile_unit")
+# SPLIT-NEXT:  DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
+# SPLIT-NEXT:  DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/splitCU")
+# 
+# The type unit
+# COMMON:      .debug_types contents:
+# COMMON:      DW_TAG_type_unit
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit")
+# COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset]       (0x00000040)
+# COMMON:      DW_TAG_structure_type
+# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct")
+# 
+# The split type unit
+# SPLIT:       .debug_types.dwo contents:
+# SPLIT:       DW_TAG_type_unit
+# SPLIT-NEXT:  DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "V5_split_type_unit")
+# SPLIT-NEXT:  DW_AT_str_offsets_base [DW_FORM_sec_offset]       (0x0000001c)
+# SPLIT:       DW_TAG_structure_type
+# SPLIT-NEXT:  DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "V5_split_Mystruct")
+# 
+# The .debug_str_offsets section
+# COMMON:      .debug_str_offsets contents:
+# COMMON-NEXT: 0x00000000: Contribution size = 28, Version = 5
+# COMMON-NEXT: 0x00000008: 00000000 "Handmade DWARF producer"
+# COMMON-NEXT: 0x0000000c: 00000018 "Compile_Unit_1"
+# COMMON-NEXT: 0x00000010: 00000027 "/home/test/CU1"
+# COMMON-NEXT: 0x00000014: 00000067 "MyFunc"
+# COMMON-NEXT: 0x00000018: 0000006e "MyVar1"
+# COMMON-NEXT: 0x0000001c: 00000075 "MyVar2"
+# COMMON-NEXT: 0x00000020: 0000007c "MyVar3"
+# COMMON-NEXT: 0x00000024: Contribution size = 12, Version = 5
+# COMMON-NEXT: 0x0000002c: 00000000 "Handmade DWARF producer"
+# COMMON-NEXT: 0x00000030: 00000036 "Compile_Unit_2"
+# COMMON-NEXT: 0x00000034: 00000045 "/home/test/CU2"
+# COMMON-NEXT: 0x00000038: Contribution size = 8, Version = 5
+# COMMON-NEXT: 0x00000040: 00000054 "Type_Unit"
+# COMMON-NEXT: 0x00000044: 0000005e "MyStruct"
+# 
+# SPLIT:       .debug_str_offsets.dwo contents:
+# SPLIT-NEXT:  0x00000000: Contribution size = 12, Version = 5
+# SPLIT-NEXT:  0x00000008: 00000000 "Handmade split DWARF producer"
+# SPLIT-NEXT:  0x0000000c: 0000001e "V5_split_compile_unit"
+# SPLIT-NEXT:  0x00000010: 00000034 "/home/test/splitCU"
+# SPLIT-NEXT:  0x00000014: Contribution size = 8, Version = 5
+# SPLIT-NEXT:  0x0000001c: 00000047 "V5_split_type_unit"
+# SPLIT-NEXT:  0x00000020: 0000005a "V5_split_Mystruct"

Removed: llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-dwp.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-dwp.test?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-dwp.test (original)
+++ llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-dwp.test (removed)
@@ -1,56 +0,0 @@
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-dwp.x86_64.o | FileCheck %s
-
-; Verify that the correct strings from each unit are displayed and that the
-; index for the .debug_str_offsets section has the right values.
-
-; CHECK:      Compile Unit
-; CHECK-NOT:  NULL
-; CHECK:      DW_TAG_compile_unit
-; CHECK-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1")
-; CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1")
-; CHECK-NOT:  NULL
-
-; CHECK:      Compile Unit
-; CHECK-NOT:  NULL
-; CHECK:      DW_TAG_compile_unit
-; CHECK-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2")
-; CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2")
-; 
-; CHECK:      Type Unit
-; CHECK-NOT:  NULL
-; CHECK:      DW_TAG_type_unit
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit_1")
-; CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000001c)
-; CHECK-NOT:  NULL
-; CHECK:      DW_TAG_structure_type
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct_1")
-;
-; CHECK:      Type Unit
-; CHECK-NOT:  NULL
-; CHECK:      DW_TAG_type_unit
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit_2")
-; CHECK-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000001c)
-; CHECK-NOT:  NULL
-; CHECK:      DW_TAG_structure_type
-; CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct_2")
-
-; Verify the correct offets of the compile and type units contributions in the
-; index tables.
-
-; CHECK:      .debug_cu_index contents:
-; CHECK-NOT:  contents:
-; CHECK:      1 0xddeeaaddbbaabbee [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
-; CHECK-SAME: [0x00000000
-; CHECK-NEXT: 2 0xff00ffeeffaaff00 [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
-; CHECK-SAME: [0x00000024
-
-; CHECK:      .debug_tu_index contents:
-; CHECK-NOT:  contents:
-; CHECK:      1 0xeeaaddbbaabbeedd [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
-; CHECK-SAME: [0x00000000
-; CHECK-NEXT: 2 0x00ffeeffaaff00ff [{{0x[0-9a-f]*, 0x[0-9a-f]*}}) [{{0x[0-9a-f]*, 0x[0-9a-f]*}})
-; CHECK:      [0x00000024

Removed: llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-invalid.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-invalid.test?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-invalid.test (original)
+++ llvm/trunk/test/DebugInfo/dwarfdump-str-offsets-invalid.test (removed)
@@ -1,24 +0,0 @@
-; Verify that llvm-dwarfdump handles invalid string offset tables.
-
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-invalid-1.x86_64.o | \
-RUN:   FileCheck --check-prefix=INVALIDCONTRIB %s
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-invalid-2.x86_64.o | \
-RUN:   FileCheck --check-prefix=INVALIDCONTRIB %s
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-invalid-3.x86_64.o | \
-RUN:   FileCheck --check-prefix=INVALIDCONTRIB %s
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-invalid-4.x86_64.o | \
-RUN:   FileCheck --check-prefix=INVALIDLENGTH %s
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-invalid-5.x86_64.o | \
-RUN:   FileCheck --check-prefix=INVALIDSECTIONLENGTH %s
-
-INVALIDCONTRIB:            .debug_str_offsets contents:
-INVALIDCONTRIB-NOT:        contents:
-INVALIDCONTRIB:            error: invalid contribution to string offsets table in section .debug_str_offsets.
-
-INVALIDLENGTH:             .debug_str_offsets contents:
-INVALIDLENGTH-NOT:         contents:
-INVALIDLENGTH:             error: contribution to string offsets table in section .debug_str_offsets has invalid length.
-
-INVALIDSECTIONLENGTH:      .debug_str_offsets contents:
-INVALIDSECTIONLENGTH-NOT:  contents:
-INVALIDSECTIONLENGTH:      error: size of .debug_str_offsets is not a multiple of 4.

Removed: llvm/trunk/test/DebugInfo/dwarfdump-str-offsets.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dwarfdump-str-offsets.test?rev=320226&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/dwarfdump-str-offsets.test (original)
+++ llvm/trunk/test/DebugInfo/dwarfdump-str-offsets.test (removed)
@@ -1,94 +0,0 @@
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets.x86_64.o | FileCheck --check-prefix=COMMON \
-RUN:   --check-prefix=SPLIT %s
-RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-str-offsets-macho.o | FileCheck --check-prefix=COMMON %s
-
-; We are using a hand-constructed object file and are interest in the correct
-; diplay of the DW_str_offsetsbase attribute, the correct display of strings
-; and the dump of the .debug_str_offsets[.dwo] table.
-;
-; Abbreviation for DW_AT_str_offsets_base
-COMMON:      .debug_abbrev contents:
-COMMON-NOT:  contents:
-COMMON:      DW_TAG_compile_unit
-COMMON-NOT:  DW_TAG
-COMMON:      DW_AT_str_offsets_base DW_FORM_sec_offset
-
-; Verify that strings are displayed correctly as indexed strings
-COMMON:      .debug_info contents:
-COMMON-NOT:  contents:     
-COMMON:      DW_TAG_compile_unit
-COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
-COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1")
-COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
-COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1")
-COMMON-NOT:  NULL
-COMMON:      DW_TAG_subprogram
-COMMON-NEXT: DW_AT_name [DW_FORM_strx1] ( indexed (00000003) string = "MyFunc")
-COMMON-NOT:  NULL
-COMMON:      DW_TAG_variable
-COMMON-NEXT: DW_AT_name [DW_FORM_strx2] ( indexed (00000004) string = "MyVar1")
-COMMON-NOT:  NULL
-COMMON:      DW_TAG_variable
-COMMON-NEXT: DW_AT_name [DW_FORM_strx3] ( indexed (00000005) string = "MyVar2")
-COMMON-NOT:  NULL
-COMMON:      DW_TAG_variable
-COMMON-NEXT: DW_AT_name [DW_FORM_strx4] ( indexed (00000006) string = "MyVar3")
-
-; Second compile unit (b.cpp)
-COMMON:      DW_TAG_compile_unit
-COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer")
-COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2")
-COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x0000002c)
-COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2")
-
-; The split CU
-SPLIT:       .debug_info.dwo contents:
-SPLIT-NOT:   contents:
-SPLIT:       DW_TAG_compile_unit
-SPLIT-NEXT:  DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade split DWARF producer")
-SPLIT-NEXT:  DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "V5_split_compile_unit")
-SPLIT-NEXT:  DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
-SPLIT-NEXT:  DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/splitCU")
-
-; The type unit
-COMMON:      .debug_types contents:
-COMMON:      DW_TAG_type_unit
-COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit")
-COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset]       (0x00000040)
-COMMON:      DW_TAG_structure_type
-COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct")
-
-; The split type unit
-SPLIT:       .debug_types.dwo contents:
-SPLIT:       DW_TAG_type_unit
-SPLIT-NEXT:  DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "V5_split_type_unit")
-SPLIT-NEXT:  DW_AT_str_offsets_base [DW_FORM_sec_offset]       (0x0000001c)
-SPLIT:       DW_TAG_structure_type
-SPLIT-NEXT:  DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "V5_split_Mystruct")
-
-; The .debug_str_offsets section
-COMMON:      .debug_str_offsets contents:
-COMMON-NEXT: 0x00000000: Contribution size = 28, Version = 5
-COMMON-NEXT: 0x00000008: 00000000 "Handmade DWARF producer"
-COMMON-NEXT: 0x0000000c: 00000018 "Compile_Unit_1"
-COMMON-NEXT: 0x00000010: 00000027 "/home/test/CU1"
-COMMON-NEXT: 0x00000014: 00000067 "MyFunc"
-COMMON-NEXT: 0x00000018: 0000006e "MyVar1"
-COMMON-NEXT: 0x0000001c: 00000075 "MyVar2"
-COMMON-NEXT: 0x00000020: 0000007c "MyVar3"
-COMMON-NEXT: 0x00000024: Contribution size = 12, Version = 5
-COMMON-NEXT: 0x0000002c: 00000000 "Handmade DWARF producer"
-COMMON-NEXT: 0x00000030: 00000036 "Compile_Unit_2"
-COMMON-NEXT: 0x00000034: 00000045 "/home/test/CU2"
-COMMON-NEXT: 0x00000038: Contribution size = 8, Version = 5
-COMMON-NEXT: 0x00000040: 00000054 "Type_Unit"
-COMMON-NEXT: 0x00000044: 0000005e "MyStruct"
-
-SPLIT:       .debug_str_offsets.dwo contents:
-SPLIT-NEXT:  0x00000000: Contribution size = 12, Version = 5
-SPLIT-NEXT:  0x00000008: 00000000 "Handmade split DWARF producer"
-SPLIT-NEXT:  0x0000000c: 0000001e "V5_split_compile_unit"
-SPLIT-NEXT:  0x00000010: 00000034 "/home/test/splitCU"
-SPLIT-NEXT:  0x00000014: Contribution size = 8, Version = 5
-SPLIT-NEXT:  0x0000001c: 00000047 "V5_split_type_unit"
-SPLIT-NEXT:  0x00000020: 0000005a "V5_split_Mystruct"




More information about the llvm-commits mailing list