[DWARFv5] Update definitions to match published spec

[probinson]

Summary

Some late additions to DWARF v5 were not in Dwarf.def; also one form was redefined.
Add the new cases to relevant switches in different parts of LLVM.
Replace DW_FORM_ref_sup with DW_FORM_ref_sup[4,8].

I did not add support for DW_FORM_strx3 or DW_FORM_addrx3 other than defining the constants. We don't have any infrastructure to support these.

[aprantl]

Thanks.

include/llvm/Support/Dwarf.def

167

Comment: versus Comment.?

[probinson]

beanz got his in first, so the DWARFEmitter.cpp changes move to DWARFVisitor.cpp. I'm rebuilding to make sure I didn't make any new typos, then will commit.

include/llvm/Support/Dwarf.def

167

Good point.

[clayborg]

Seem like a lot of the Dwarf.def macros could use an extra "version" parameter. Might help code to verify that certain tags, attributes, forms, or more are valid for the current DWARF version.

llvm/trunk/include/llvm/Support/Dwarf.def

142 ↗

(On Diff #90748)

might be nice at some point to make HANDLE_DW_TAG take a 3rd parameter that is the DWARF version that it is introduced in:

HANDLE_DW_TAG(0x0035, volatile_type, 2)
HANDLE_DW_TAG(0x0036, dwarf_procedure, 3)

Then code could actually enforce the validity of the DWARF tag for the current DWARF version.

243 ↗

(On Diff #90748)

Might be nice to include the DWARF version in the HANDLE_DW_AT macro as well?

406 ↗

(On Diff #90748)

Might be nice to include the DWARF version in the HANDLE_DW_FORM macro as well?

[probinson]

In D30664#693714, @clayborg wrote:

Seem like a lot of the Dwarf.def macros could use an extra "version" parameter. Might help code to verify that certain tags, attributes, forms, or more are valid for the current DWARF version.

I am definitely moving in the direction of version checking for forms. Version checking is not so important for other things, as in general anything the consumer doesn't understand can be skipped without having the world explode. But if a consumer doesn't understand a form, the entire section is toast.

[clayborg]

The reason I bring up the version is we want a "llvm-dwarfdump --verify" eventually and this might help to provide warnings like:

warning: using DWARF 5 tag in DWARF 4

for DW_TAG values that are in the non-user range.

[probinson]

Ah. I had been thinking more in terms of defining constants like DW_TAG_hi_v4 and doing range checks. That lets you not have to assign arbitrary version numbers to the vendor extensions.

include/llvm/Support/Dwarf.def

 HANDLE_DW_TAG(0x002e, subprogram)
 HANDLE_DW_TAG(0x002f, template_type_parameter)
 HANDLE_DW_TAG(0x0030, template_value_parameter)
 HANDLE_DW_TAG(0x0031, thrown_type)
 HANDLE_DW_TAG(0x0032, try_block)
 HANDLE_DW_TAG(0x0033, variant_part)
 HANDLE_DW_TAG(0x0034, variable)
 HANDLE_DW_TAG(0x0035, volatile_type)
+// New in DWARF v3:
 HANDLE_DW_TAG(0x0036, dwarf_procedure)
 HANDLE_DW_TAG(0x0037, restrict_type)
 HANDLE_DW_TAG(0x0038, interface_type)
 HANDLE_DW_TAG(0x0039, namespace)
 HANDLE_DW_TAG(0x003a, imported_module)
 HANDLE_DW_TAG(0x003b, unspecified_type)
 HANDLE_DW_TAG(0x003c, partial_unit)
 HANDLE_DW_TAG(0x003d, imported_unit)
 HANDLE_DW_TAG(0x003f, condition)
 HANDLE_DW_TAG(0x0040, shared_type)
+// New in DWARF v4:
 HANDLE_DW_TAG(0x0041, type_unit)
 HANDLE_DW_TAG(0x0042, rvalue_reference_type)
 HANDLE_DW_TAG(0x0043, template_alias)
-
-// New in DWARF v5.
+// New in DWARF v5:
 HANDLE_DW_TAG(0x0044, coarray_type)
 HANDLE_DW_TAG(0x0045, generic_subrange)
 HANDLE_DW_TAG(0x0046, dynamic_type)
 HANDLE_DW_TAG(0x0047, atomic_type)
 HANDLE_DW_TAG(0x0048, call_site)
 HANDLE_DW_TAG(0x0049, call_site_parameter)
 HANDLE_DW_TAG(0x004a, skeleton_unit)
 HANDLE_DW_TAG(0x004b, immutable_type)
-
-// User-defined tags.
+// Vendor extensions.
 HANDLE_DW_TAG(0x4081, MIPS_loop)
 HANDLE_DW_TAG(0x4101, format_label)
 HANDLE_DW_TAG(0x4102, function_template)
 HANDLE_DW_TAG(0x4103, class_template)
 HANDLE_DW_TAG(0x4106, GNU_template_template_param)
 HANDLE_DW_TAG(0x4107, GNU_template_parameter_pack)
 HANDLE_DW_TAG(0x4108, GNU_formal_parameter_pack)
 HANDLE_DW_TAG(0x4200, APPLE_property)

 HANDLE_DW_AT(0x46, segment)
 HANDLE_DW_AT(0x47, specification)
 HANDLE_DW_AT(0x48, static_link)
 HANDLE_DW_AT(0x49, type)
 HANDLE_DW_AT(0x4a, use_location)
 HANDLE_DW_AT(0x4b, variable_parameter)
 HANDLE_DW_AT(0x4c, virtuality)
 HANDLE_DW_AT(0x4d, vtable_elem_location)
+// New in DWARF v3:
 HANDLE_DW_AT(0x4e, allocated)
 HANDLE_DW_AT(0x4f, associated)
 HANDLE_DW_AT(0x50, data_location)
 HANDLE_DW_AT(0x51, byte_stride)
 HANDLE_DW_AT(0x52, entry_pc)
 HANDLE_DW_AT(0x53, use_UTF8)
 HANDLE_DW_AT(0x54, extension)
 HANDLE_DW_AT(0x55, ranges)

 HANDLE_DW_AT(0x61, mutable)
 HANDLE_DW_AT(0x62, threads_scaled)
 HANDLE_DW_AT(0x63, explicit)
 HANDLE_DW_AT(0x64, object_pointer)
 HANDLE_DW_AT(0x65, endianity)
 HANDLE_DW_AT(0x66, elemental)
 HANDLE_DW_AT(0x67, pure)
 HANDLE_DW_AT(0x68, recursive)
+// New in DWARF v4:
 HANDLE_DW_AT(0x69, signature)
 HANDLE_DW_AT(0x6a, main_subprogram)
 HANDLE_DW_AT(0x6b, data_bit_offset)
 HANDLE_DW_AT(0x6c, const_expr)
 HANDLE_DW_AT(0x6d, enum_class)
 HANDLE_DW_AT(0x6e, linkage_name)
-
 // New in DWARF v5:
 HANDLE_DW_AT(0x6f, string_length_bit_size)
 HANDLE_DW_AT(0x70, string_length_byte_size)
 HANDLE_DW_AT(0x71, rank)
 HANDLE_DW_AT(0x72, str_offsets_base)
 HANDLE_DW_AT(0x73, addr_base)
 HANDLE_DW_AT(0x74, rnglists_base)
 HANDLE_DW_AT(0x75, dwo_id) ///< Retracted from DWARF 5.

 HANDLE_DW_AT(0x85, call_data_location)
 HANDLE_DW_AT(0x86, call_data_value)
 HANDLE_DW_AT(0x87, noreturn)
 HANDLE_DW_AT(0x88, alignment)
 HANDLE_DW_AT(0x89, export_symbols)
 HANDLE_DW_AT(0x8a, deleted)
 HANDLE_DW_AT(0x8b, defaulted)
 HANDLE_DW_AT(0x8c, loclists_base)
-
+// Vendor extensions.
 HANDLE_DW_AT(0x2002, MIPS_loop_begin)
 HANDLE_DW_AT(0x2003, MIPS_tail_loop_begin)
 HANDLE_DW_AT(0x2004, MIPS_epilog_begin)
 HANDLE_DW_AT(0x2005, MIPS_loop_unroll_factor)
 HANDLE_DW_AT(0x2006, MIPS_software_pipeline_depth)
 HANDLE_DW_AT(0x2007, MIPS_linkage_name)
 HANDLE_DW_AT(0x2008, MIPS_stride)
 HANDLE_DW_AT(0x2009, MIPS_abstract_name)
 HANDLE_DW_AT(0x200a, MIPS_clone_origin)
 HANDLE_DW_AT(0x200b, MIPS_has_inlines)
 HANDLE_DW_AT(0x200c, MIPS_stride_byte)
 HANDLE_DW_AT(0x200d, MIPS_stride_elem)
 HANDLE_DW_AT(0x200e, MIPS_ptr_dopetype)
 HANDLE_DW_AT(0x200f, MIPS_allocatable_dopetype)
 HANDLE_DW_AT(0x2010, MIPS_assumed_shape_dopetype)
-
 // This one appears to have only been implemented by Open64 for
 // fortran and may conflict with other extensions.
 HANDLE_DW_AT(0x2011, MIPS_assumed_size)
-
 // GNU extensions
 HANDLE_DW_AT(0x2101, sf_names)
 HANDLE_DW_AT(0x2102, src_info)
 HANDLE_DW_AT(0x2103, mac_info)
 HANDLE_DW_AT(0x2104, src_coords)
 HANDLE_DW_AT(0x2105, body_begin)
 HANDLE_DW_AT(0x2106, body_end)
 HANDLE_DW_AT(0x2107, GNU_vector)
 HANDLE_DW_AT(0x2110, GNU_template_name)
-
 HANDLE_DW_AT(0x210f, GNU_odr_signature)
 HANDLE_DW_AT(0x2119, GNU_macros)
-
 // Extensions for Fission proposal.
 HANDLE_DW_AT(0x2130, GNU_dwo_name)
 HANDLE_DW_AT(0x2131, GNU_dwo_id)
 HANDLE_DW_AT(0x2132, GNU_ranges_base)
 HANDLE_DW_AT(0x2133, GNU_addr_base)
 HANDLE_DW_AT(0x2134, GNU_pubnames)
 HANDLE_DW_AT(0x2135, GNU_pubtypes)
 HANDLE_DW_AT(0x2136, GNU_discriminator)
-
 // Borland extensions.
 HANDLE_DW_AT(0x3b11, BORLAND_property_read)
 HANDLE_DW_AT(0x3b12, BORLAND_property_write)
 HANDLE_DW_AT(0x3b13, BORLAND_property_implements)
 HANDLE_DW_AT(0x3b14, BORLAND_property_index)
 HANDLE_DW_AT(0x3b15, BORLAND_property_default)
 HANDLE_DW_AT(0x3b20, BORLAND_Delphi_unit)
 HANDLE_DW_AT(0x3b21, BORLAND_Delphi_class)
 HANDLE_DW_AT(0x3b22, BORLAND_Delphi_record)
 HANDLE_DW_AT(0x3b23, BORLAND_Delphi_metaclass)
 HANDLE_DW_AT(0x3b24, BORLAND_Delphi_constructor)
 HANDLE_DW_AT(0x3b25, BORLAND_Delphi_destructor)
 HANDLE_DW_AT(0x3b26, BORLAND_Delphi_anonymous_method)
 HANDLE_DW_AT(0x3b27, BORLAND_Delphi_interface)
 HANDLE_DW_AT(0x3b28, BORLAND_Delphi_ABI)
 HANDLE_DW_AT(0x3b29, BORLAND_Delphi_return)
 HANDLE_DW_AT(0x3b30, BORLAND_Delphi_frameptr)
 HANDLE_DW_AT(0x3b31, BORLAND_closure)
-
 // LLVM project extensions.
 HANDLE_DW_AT(0x3e00, LLVM_include_path)
 HANDLE_DW_AT(0x3e01, LLVM_config_macros)
 HANDLE_DW_AT(0x3e02, LLVM_isysroot)
-
 // Apple extensions.
 HANDLE_DW_AT(0x3fe1, APPLE_optimized)
 HANDLE_DW_AT(0x3fe2, APPLE_flags)
 HANDLE_DW_AT(0x3fe3, APPLE_isa)
 HANDLE_DW_AT(0x3fe4, APPLE_block)
 HANDLE_DW_AT(0x3fe5, APPLE_major_runtime_vers)
 HANDLE_DW_AT(0x3fe6, APPLE_runtime_class)
 HANDLE_DW_AT(0x3fe7, APPLE_omit_frame_ptr)

 HANDLE_DW_FORM(0x0f, udata)
 HANDLE_DW_FORM(0x10, ref_addr)
 HANDLE_DW_FORM(0x11, ref1)
 HANDLE_DW_FORM(0x12, ref2)
 HANDLE_DW_FORM(0x13, ref4)
 HANDLE_DW_FORM(0x14, ref8)
 HANDLE_DW_FORM(0x15, ref_udata)
 HANDLE_DW_FORM(0x16, indirect)
+// New in DWARF v4:
 HANDLE_DW_FORM(0x17, sec_offset)
 HANDLE_DW_FORM(0x18, exprloc)
 HANDLE_DW_FORM(0x19, flag_present)
-
-// New in DWARF v5.
+// This was defined out of sequence.
+HANDLE_DW_FORM(0x20, ref_sig8)
+// New in DWARF v5:
 HANDLE_DW_FORM(0x1a, strx)
 HANDLE_DW_FORM(0x1b, addrx)
-HANDLE_DW_FORM(0x1c, ref_sup)
+HANDLE_DW_FORM(0x1c, ref_sup4)
 HANDLE_DW_FORM(0x1d, strp_sup)
 HANDLE_DW_FORM(0x1e, data16)
 HANDLE_DW_FORM(0x1f, line_strp)
-HANDLE_DW_FORM(0x20, ref_sig8)
 HANDLE_DW_FORM(0x21, implicit_const)
 HANDLE_DW_FORM(0x22, loclistx)
 HANDLE_DW_FORM(0x23, rnglistx)
-
+HANDLE_DW_FORM(0x24, ref_sup8)
+HANDLE_DW_FORM(0x25, strx1)
+HANDLE_DW_FORM(0x26, strx2)
+HANDLE_DW_FORM(0x27, strx3)
+HANDLE_DW_FORM(0x28, strx4)
+HANDLE_DW_FORM(0x29, addrx1)
+HANDLE_DW_FORM(0x2a, addrx2)
+HANDLE_DW_FORM(0x2b, addrx3)
+HANDLE_DW_FORM(0x2c, addrx4)
 // Extensions for Fission proposal
 HANDLE_DW_FORM(0x1f01, GNU_addr_index)
 HANDLE_DW_FORM(0x1f02, GNU_str_index)
-
 // Alternate debug sections proposal (output of "dwz" tool).
 HANDLE_DW_FORM(0x1f20, GNU_ref_alt)
 HANDLE_DW_FORM(0x1f21, GNU_strp_alt)
 
 // DWARF Expression operators.
 HANDLE_DW_OP(0x03, addr)
 HANDLE_DW_OP(0x06, deref)
 HANDLE_DW_OP(0x08, const1u)

 HANDLE_DW_OP(0x20, not)
 HANDLE_DW_OP(0x21, or)
 HANDLE_DW_OP(0x22, plus)
 HANDLE_DW_OP(0x23, plus_uconst)
 HANDLE_DW_OP(0x24, shl)
 HANDLE_DW_OP(0x25, shr)
 HANDLE_DW_OP(0x26, shra)
 HANDLE_DW_OP(0x27, xor)
-HANDLE_DW_OP(0x2f, skip)
 HANDLE_DW_OP(0x28, bra)
 HANDLE_DW_OP(0x29, eq)
 HANDLE_DW_OP(0x2a, ge)
 HANDLE_DW_OP(0x2b, gt)
 HANDLE_DW_OP(0x2c, le)
 HANDLE_DW_OP(0x2d, lt)
 HANDLE_DW_OP(0x2e, ne)
+HANDLE_DW_OP(0x2f, skip)
 HANDLE_DW_OP(0x30, lit0)
 HANDLE_DW_OP(0x31, lit1)
 HANDLE_DW_OP(0x32, lit2)
 HANDLE_DW_OP(0x33, lit3)
 HANDLE_DW_OP(0x34, lit4)
 HANDLE_DW_OP(0x35, lit5)
 HANDLE_DW_OP(0x36, lit6)
 HANDLE_DW_OP(0x37, lit7)

 HANDLE_DW_OP(0x8f, breg31)
 HANDLE_DW_OP(0x90, regx)
 HANDLE_DW_OP(0x91, fbreg)
 HANDLE_DW_OP(0x92, bregx)
 HANDLE_DW_OP(0x93, piece)
 HANDLE_DW_OP(0x94, deref_size)
 HANDLE_DW_OP(0x95, xderef_size)
 HANDLE_DW_OP(0x96, nop)
+// New in DWARF v3:
 HANDLE_DW_OP(0x97, push_object_address)
 HANDLE_DW_OP(0x98, call2)
 HANDLE_DW_OP(0x99, call4)
 HANDLE_DW_OP(0x9a, call_ref)
 HANDLE_DW_OP(0x9b, form_tls_address)
 HANDLE_DW_OP(0x9c, call_frame_cfa)
 HANDLE_DW_OP(0x9d, bit_piece)
+// New in DWARF v4:
 HANDLE_DW_OP(0x9e, implicit_value)
 HANDLE_DW_OP(0x9f, stack_value)
+// New in DWARF v5:
 HANDLE_DW_OP(0xa0, implicit_pointer)
 HANDLE_DW_OP(0xa1, addrx)
 HANDLE_DW_OP(0xa2, constx)
 HANDLE_DW_OP(0xa3, entry_value)
 HANDLE_DW_OP(0xa4, const_type)
 HANDLE_DW_OP(0xa5, regval_type)
 HANDLE_DW_OP(0xa6, deref_type)
 HANDLE_DW_OP(0xa7, xderef_type)
 HANDLE_DW_OP(0xa8, convert)
 HANDLE_DW_OP(0xa9, reinterpret)
-
 // Vendor extensions.
 // Extensions for GNU-style thread-local storage.
 HANDLE_DW_OP(0xe0, GNU_push_tls_address)
-
 // Extensions for Fission proposal.
 HANDLE_DW_OP(0xfb, GNU_addr_index)
 HANDLE_DW_OP(0xfc, GNU_const_index)
 
 // DWARF languages.
 HANDLE_DW_LANG(0x0001, C89)
 HANDLE_DW_LANG(0x0002, C)
 HANDLE_DW_LANG(0x0003, Ada83)
 HANDLE_DW_LANG(0x0004, C_plus_plus)
 HANDLE_DW_LANG(0x0005, Cobol74)
 HANDLE_DW_LANG(0x0006, Cobol85)
 HANDLE_DW_LANG(0x0007, Fortran77)
 HANDLE_DW_LANG(0x0008, Fortran90)
 HANDLE_DW_LANG(0x0009, Pascal83)
 HANDLE_DW_LANG(0x000a, Modula2)
-
 // New in DWARF v3:
 HANDLE_DW_LANG(0x000b, Java)
 HANDLE_DW_LANG(0x000c, C99)
 HANDLE_DW_LANG(0x000d, Ada95)
 HANDLE_DW_LANG(0x000e, Fortran95)
 HANDLE_DW_LANG(0x000f, PLI)
 HANDLE_DW_LANG(0x0010, ObjC)
 HANDLE_DW_LANG(0x0011, ObjC_plus_plus)
 HANDLE_DW_LANG(0x0012, UPC)
 HANDLE_DW_LANG(0x0013, D)
-
 // New in DWARF v4:
 HANDLE_DW_LANG(0x0014, Python)
-
 // New in DWARF v5:
 HANDLE_DW_LANG(0x0015, OpenCL)
 HANDLE_DW_LANG(0x0016, Go)
 HANDLE_DW_LANG(0x0017, Modula3)
 HANDLE_DW_LANG(0x0018, Haskell)
 HANDLE_DW_LANG(0x0019, C_plus_plus_03)
 HANDLE_DW_LANG(0x001a, C_plus_plus_11)
 HANDLE_DW_LANG(0x001b, OCaml)
 HANDLE_DW_LANG(0x001c, Rust)
 HANDLE_DW_LANG(0x001d, C11)
 HANDLE_DW_LANG(0x001e, Swift)
 HANDLE_DW_LANG(0x001f, Julia)
 HANDLE_DW_LANG(0x0020, Dylan)
 HANDLE_DW_LANG(0x0021, C_plus_plus_14)
 HANDLE_DW_LANG(0x0022, Fortran03)
 HANDLE_DW_LANG(0x0023, Fortran08)
 HANDLE_DW_LANG(0x0024, RenderScript)
 HANDLE_DW_LANG(0x0025, BLISS)
-
 // Vendor extensions.
 HANDLE_DW_LANG(0x8001, Mips_Assembler)
 HANDLE_DW_LANG(0x8e57, GOOGLE_RenderScript)
 HANDLE_DW_LANG(0xb000, BORLAND_Delphi)
 
 // DWARF attribute type encodings.
 HANDLE_DW_ATE(0x01, address)
 HANDLE_DW_ATE(0x02, boolean)
 HANDLE_DW_ATE(0x03, complex_float)
 HANDLE_DW_ATE(0x04, float)
 HANDLE_DW_ATE(0x05, signed)
 HANDLE_DW_ATE(0x06, signed_char)
 HANDLE_DW_ATE(0x07, unsigned)
 HANDLE_DW_ATE(0x08, unsigned_char)
+// New in DWARF v3:
 HANDLE_DW_ATE(0x09, imaginary_float)
 HANDLE_DW_ATE(0x0a, packed_decimal)
 HANDLE_DW_ATE(0x0b, numeric_string)
 HANDLE_DW_ATE(0x0c, edited)
 HANDLE_DW_ATE(0x0d, signed_fixed)
 HANDLE_DW_ATE(0x0e, unsigned_fixed)
 HANDLE_DW_ATE(0x0f, decimal_float)
+// New in DWARF v4:
 HANDLE_DW_ATE(0x10, UTF)
+// New in DWARF v5:
 HANDLE_DW_ATE(0x11, UCS)
 HANDLE_DW_ATE(0x12, ASCII)
 
 // DWARF virtuality codes.
 HANDLE_DW_VIRTUALITY(0x00, none)
 HANDLE_DW_VIRTUALITY(0x01, virtual)
 HANDLE_DW_VIRTUALITY(0x02, pure_virtual)
 
 // DWARF v5 Defaulted Member Encodings.
 HANDLE_DW_DEFAULTED(0x00, no)
 HANDLE_DW_DEFAULTED(0x01, in_class)
 HANDLE_DW_DEFAULTED(0x02, out_of_class)
 
 // DWARF calling convention codes.
 HANDLE_DW_CC(0x01, normal)
 HANDLE_DW_CC(0x02, program)
 HANDLE_DW_CC(0x03, nocall)
+// New in DWARF v5:
 HANDLE_DW_CC(0x04, pass_by_reference)
 HANDLE_DW_CC(0x05, pass_by_value)
+// Vendor extensions.
 HANDLE_DW_CC(0x41, GNU_borland_fastcall_i386)
 HANDLE_DW_CC(0xb0, BORLAND_safecall)
 HANDLE_DW_CC(0xb1, BORLAND_stdcall)
 HANDLE_DW_CC(0xb2, BORLAND_pascal)
 HANDLE_DW_CC(0xb3, BORLAND_msfastcall)
 HANDLE_DW_CC(0xb4, BORLAND_msreturn)
 HANDLE_DW_CC(0xb5, BORLAND_thiscall)
 HANDLE_DW_CC(0xb6, BORLAND_fastcall)
 HANDLE_DW_CC(0xc0, LLVM_vectorcall)
 
 // Line Number Extended Opcode Encodings
 HANDLE_DW_LNE(0x01, end_sequence)
 HANDLE_DW_LNE(0x02, set_address)
 HANDLE_DW_LNE(0x03, define_file)
+// New in DWARF v4:
 HANDLE_DW_LNE(0x04, set_discriminator)
 
 // Line Number Standard Opcode Encodings.
 HANDLE_DW_LNS(0x00, extended_op)
 HANDLE_DW_LNS(0x01, copy)
 HANDLE_DW_LNS(0x02, advance_pc)
 HANDLE_DW_LNS(0x03, advance_line)
 HANDLE_DW_LNS(0x04, set_file)
 HANDLE_DW_LNS(0x05, set_column)
 HANDLE_DW_LNS(0x06, negate_stmt)
 HANDLE_DW_LNS(0x07, set_basic_block)
 HANDLE_DW_LNS(0x08, const_add_pc)
 HANDLE_DW_LNS(0x09, fixed_advance_pc)
+// New in DWARF v3:
 HANDLE_DW_LNS(0x0a, set_prologue_end)
 HANDLE_DW_LNS(0x0b, set_epilogue_begin)
 HANDLE_DW_LNS(0x0c, set_isa)
 
 // DWARF v5 Line number header entry format.
 HANDLE_DW_LNCT(0x01, path)
 HANDLE_DW_LNCT(0x02, directory_index)
 HANDLE_DW_LNCT(0x03, timestamp)
 HANDLE_DW_LNCT(0x04, size)
 HANDLE_DW_LNCT(0x05, MD5)
 
+// DWARF v5 Macro information.
 HANDLE_DW_MACRO(0x01, define)
 HANDLE_DW_MACRO(0x02, undef)
 HANDLE_DW_MACRO(0x03, start_file)
 HANDLE_DW_MACRO(0x04, end_file)
 HANDLE_DW_MACRO(0x05, define_strp)
 HANDLE_DW_MACRO(0x06, undef_strp)
 HANDLE_DW_MACRO(0x07, import)
 HANDLE_DW_MACRO(0x08, define_sup)
 HANDLE_DW_MACRO(0x09, undef_sup)
 HANDLE_DW_MACRO(0x0a, import_sup)
 HANDLE_DW_MACRO(0x0b, define_strx)
 HANDLE_DW_MACRO(0x0c, undef_strx)
 
-// Range list entry encoding values.
+// DWARF v5 Range List Entry encoding values.
 HANDLE_DW_RLE(0x00, end_of_list)
 HANDLE_DW_RLE(0x01, base_addressx)
 HANDLE_DW_RLE(0x02, startx_endx)
 HANDLE_DW_RLE(0x03, startx_length)
 HANDLE_DW_RLE(0x04, offset_pair)
 HANDLE_DW_RLE(0x05, base_address)
 HANDLE_DW_RLE(0x06, start_end)
 HANDLE_DW_RLE(0x07, start_length)

 HANDLE_DW_CFA(0x07, undefined)
 HANDLE_DW_CFA(0x08, same_value)
 HANDLE_DW_CFA(0x09, register)
 HANDLE_DW_CFA(0x0a, remember_state)
 HANDLE_DW_CFA(0x0b, restore_state)
 HANDLE_DW_CFA(0x0c, def_cfa)
 HANDLE_DW_CFA(0x0d, def_cfa_register)
 HANDLE_DW_CFA(0x0e, def_cfa_offset)
+// New in DWARF v3:
 HANDLE_DW_CFA(0x0f, def_cfa_expression)
 HANDLE_DW_CFA(0x10, expression)
 HANDLE_DW_CFA(0x11, offset_extended_sf)
 HANDLE_DW_CFA(0x12, def_cfa_sf)
 HANDLE_DW_CFA(0x13, def_cfa_offset_sf)
 HANDLE_DW_CFA(0x14, val_offset)
 HANDLE_DW_CFA(0x15, val_offset_sf)
 HANDLE_DW_CFA(0x16, val_expression)
+// Vendor extensions.
 HANDLE_DW_CFA(0x1d, MIPS_advance_loc8)
 HANDLE_DW_CFA(0x2d, GNU_window_save)
 HANDLE_DW_CFA(0x2e, GNU_args_size)
 
 // Apple Objective-C Property Attributes.
 // Keep this list in sync with clang's DeclSpec.h ObjCPropertyAttributeKind!
 HANDLE_DW_APPLE_PROPERTY(0x01, readonly)
 HANDLE_DW_APPLE_PROPERTY(0x02, getter)

lib/CodeGen/AsmPrinter/DIE.cpp

void DIEInteger::EmitValue(const AsmPrinter *Asm, dwarf::Form Form) const {
   case dwarf::DW_FORM_flag_present:
     // Emit something to keep the lines and comments in sync.
     // FIXME: Is there a better way to do this?
     Asm->OutStreamer->AddBlankLine();
     return;
   case dwarf::DW_FORM_flag:
   case dwarf::DW_FORM_ref1:
   case dwarf::DW_FORM_data1:
+  case dwarf::DW_FORM_strx1:
+  case dwarf::DW_FORM_addrx1:
   case dwarf::DW_FORM_ref2:
   case dwarf::DW_FORM_data2:
+  case dwarf::DW_FORM_strx2:
+  case dwarf::DW_FORM_addrx2:
   case dwarf::DW_FORM_strp:
   case dwarf::DW_FORM_ref4:
   case dwarf::DW_FORM_data4:
+  case dwarf::DW_FORM_ref_sup4:
+  case dwarf::DW_FORM_strx4:
+  case dwarf::DW_FORM_addrx4:
   case dwarf::DW_FORM_ref8:
   case dwarf::DW_FORM_ref_sig8:
   case dwarf::DW_FORM_data8:
+  case dwarf::DW_FORM_ref_sup8:
   case dwarf::DW_FORM_GNU_ref_alt:
   case dwarf::DW_FORM_GNU_strp_alt:
   case dwarf::DW_FORM_line_strp:
   case dwarf::DW_FORM_sec_offset:
   case dwarf::DW_FORM_strp_sup:
-  case dwarf::DW_FORM_ref_sup:
   case dwarf::DW_FORM_addr:
   case dwarf::DW_FORM_ref_addr:
     Asm->OutStreamer->EmitIntValue(Integer, SizeOf(Asm, Form));
     return;
   case dwarf::DW_FORM_GNU_str_index:
   case dwarf::DW_FORM_GNU_addr_index:
   case dwarf::DW_FORM_ref_udata:
   case dwarf::DW_FORM_udata:

 unsigned DIEInteger::SizeOf(const AsmPrinter *AP, dwarf::Form Form) const {
   switch (Form) {
   case dwarf::DW_FORM_implicit_const:
   case dwarf::DW_FORM_flag_present:
     return 0;
   case dwarf::DW_FORM_flag:
   case dwarf::DW_FORM_ref1:
   case dwarf::DW_FORM_data1:
+  case dwarf::DW_FORM_strx1:
+  case dwarf::DW_FORM_addrx1:
     return sizeof(int8_t);
   case dwarf::DW_FORM_ref2:
   case dwarf::DW_FORM_data2:
+  case dwarf::DW_FORM_strx2:
+  case dwarf::DW_FORM_addrx2:
     return sizeof(int16_t);
   case dwarf::DW_FORM_ref4:
   case dwarf::DW_FORM_data4:
+  case dwarf::DW_FORM_ref_sup4:
+  case dwarf::DW_FORM_strx4:
+  case dwarf::DW_FORM_addrx4:
     return sizeof(int32_t);
   case dwarf::DW_FORM_ref8:
   case dwarf::DW_FORM_ref_sig8:
   case dwarf::DW_FORM_data8:
+  case dwarf::DW_FORM_ref_sup8:
     return sizeof(int64_t);
   case dwarf::DW_FORM_ref_addr:
     if (AP->getDwarfVersion() == 2)
       return AP->getPointerSize();
     LLVM_FALLTHROUGH;
   case dwarf::DW_FORM_strp:
   case dwarf::DW_FORM_GNU_ref_alt:
   case dwarf::DW_FORM_GNU_strp_alt:
   case dwarf::DW_FORM_line_strp:
   case dwarf::DW_FORM_sec_offset:
   case dwarf::DW_FORM_strp_sup:
-  case dwarf::DW_FORM_ref_sup:
     switch (AP->OutStreamer->getContext().getDwarfFormat()) {
     case dwarf::DWARF32:
       return 4;
     case dwarf::DWARF64:
       return 8;
     }
     llvm_unreachable("Invalid DWARF format");
   case dwarf::DW_FORM_GNU_str_index:

lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp

if (A && F) {
             break;
 
           case DW_FORM_strp:
           case DW_FORM_GNU_ref_alt:
           case DW_FORM_GNU_strp_alt:
           case DW_FORM_line_strp:
           case DW_FORM_sec_offset:
           case DW_FORM_strp_sup:
-          case DW_FORM_ref_sup:
             ++FixedAttributeSize->NumDwarfOffsets;
             break;
 
           default:
             // Indicate we no longer have a fixed byte size for this
             // abbreviation by clearing the FixedAttributeSize optional value
             // so it doesn't have a value.
             FixedAttributeSize.reset();

lib/DebugInfo/DWARF/DWARFFormValue.cpp

switch (Form) {
     case DW_FORM_ref_addr:
       if (U)
         return U->getRefAddrByteSize();
       return None;
 
     case DW_FORM_flag:
     case DW_FORM_data1:
     case DW_FORM_ref1:
+    case DW_FORM_strx1:
+    case DW_FORM_addrx1:
       return 1;
 
     case DW_FORM_data2:
     case DW_FORM_ref2:
+    case DW_FORM_strx2:
+    case DW_FORM_addrx2:
       return 2;
 
     case DW_FORM_data4:
     case DW_FORM_ref4:
+    case DW_FORM_ref_sup4:
+    case DW_FORM_strx4:
+    case DW_FORM_addrx4:
       return 4;
 
     case DW_FORM_strp:
     case DW_FORM_GNU_ref_alt:
     case DW_FORM_GNU_strp_alt:
     case DW_FORM_line_strp:
     case DW_FORM_sec_offset:
     case DW_FORM_strp_sup:
-    case DW_FORM_ref_sup:
       if (U)
         return U->getDwarfOffsetByteSize();
       return None;
 
     case DW_FORM_data8:
     case DW_FORM_ref8:
     case DW_FORM_ref_sig8:
+    case DW_FORM_ref_sup8:
       return 8;
 
     case DW_FORM_flag_present:
       return 0;
 
     case DW_FORM_data16:
       return 16;
 
switch (Form) {
       case DW_FORM_data4:
       case DW_FORM_data8:
       case DW_FORM_flag:
       case DW_FORM_ref1:
       case DW_FORM_ref2:
       case DW_FORM_ref4:
       case DW_FORM_ref8:
       case DW_FORM_ref_sig8:
-      case DW_FORM_ref_sup:
+      case DW_FORM_ref_sup4:
+      case DW_FORM_ref_sup8:
+      case DW_FORM_strx1:
+      case DW_FORM_strx2:
+      case DW_FORM_strx4:
+      case DW_FORM_addrx1:
+      case DW_FORM_addrx2:
+      case DW_FORM_addrx4:
       case DW_FORM_sec_offset:
       case DW_FORM_strp:
       case DW_FORM_strp_sup:
       case DW_FORM_line_strp:
       case DW_FORM_GNU_ref_alt:
       case DW_FORM_GNU_strp_alt:
         if (Optional<uint8_t> FixedSize = ::getFixedByteSize(Form, U)) {
           *OffsetPtr += *FixedSize;
case DW_FORM_block2:
       break;
     case DW_FORM_block4:
       Value.uval = data.getU32(offset_ptr);
       is_block = true;
       break;
     case DW_FORM_data1:
     case DW_FORM_ref1:
     case DW_FORM_flag:
+    case DW_FORM_strx1:
+    case DW_FORM_addrx1:
       Value.uval = data.getU8(offset_ptr);
       break;
     case DW_FORM_data2:
     case DW_FORM_ref2:
+    case DW_FORM_strx2:
+    case DW_FORM_addrx2:
       Value.uval = data.getU16(offset_ptr);
       break;
     case DW_FORM_data4:
-    case DW_FORM_ref4: {
+    case DW_FORM_ref4:
+    case DW_FORM_ref_sup4:
+    case DW_FORM_strx4:
+    case DW_FORM_addrx4: {
       Value.uval = data.getU32(offset_ptr);
       if (!U)
         break;
       RelocAddrMap::const_iterator AI = U->getRelocMap()->find(*offset_ptr-4);
       if (AI != U->getRelocMap()->end())
         Value.uval += AI->second.second;
       break;
     }
     case DW_FORM_data8:
     case DW_FORM_ref8:
+    case DW_FORM_ref_sup8:
       Value.uval = data.getU64(offset_ptr);
       break;
     case DW_FORM_sdata:
       Value.sval = data.getSLEB128(offset_ptr);
       break;
     case DW_FORM_udata:
     case DW_FORM_ref_udata:
       Value.uval = data.getULEB128(offset_ptr);
       break;
     case DW_FORM_string:
       Value.cstr = data.getCStr(offset_ptr);
       break;
     case DW_FORM_indirect:
       Form = static_cast<dwarf::Form>(data.getULEB128(offset_ptr));
       indirect = true;
       break;
     case DW_FORM_strp:
     case DW_FORM_sec_offset:
     case DW_FORM_GNU_ref_alt:
     case DW_FORM_GNU_strp_alt:
     case DW_FORM_line_strp:
-    case DW_FORM_strp_sup:
-    case DW_FORM_ref_sup: {
+    case DW_FORM_strp_sup: {
       if (!U)
         return false;
       RelocAddrMap::const_iterator AI = U->getRelocMap()->find(*offset_ptr);
       uint8_t Size = U->getDwarfOffsetByteSize();
       Value.uval = data.getUnsigned(offset_ptr, Size);
       if (AI != U->getRelocMap()->end())
         Value.uval += AI->second.second;
       break;

lib/ObjectYAML/DWARFEmitter.cpp

for (auto Entry : CU.Entries) {
             writeInteger((uint32_t)writeSize, OS, DI.IsLittleEndian);
             OS.write(reinterpret_cast<char *>(&FormVal->BlockData[0]),
                      FormVal->BlockData.size());
             break;
           }
           case dwarf::DW_FORM_data1:
           case dwarf::DW_FORM_ref1:
           case dwarf::DW_FORM_flag:
+          case dwarf::DW_FORM_strx1:
+          case dwarf::DW_FORM_addrx1:
             writeInteger((uint8_t)FormVal->Value, OS, DI.IsLittleEndian);
             break;
           case dwarf::DW_FORM_data2:
           case dwarf::DW_FORM_ref2:
+          case dwarf::DW_FORM_strx2:
+          case dwarf::DW_FORM_addrx2:
             writeInteger((uint16_t)FormVal->Value, OS, DI.IsLittleEndian);
             break;
           case dwarf::DW_FORM_data4:
           case dwarf::DW_FORM_ref4:
+          case dwarf::DW_FORM_ref_sup4:
+          case dwarf::DW_FORM_strx4:
+          case dwarf::DW_FORM_addrx4:
             writeInteger((uint32_t)FormVal->Value, OS, DI.IsLittleEndian);
             break;
           case dwarf::DW_FORM_data8:
           case dwarf::DW_FORM_ref8:
+          case dwarf::DW_FORM_ref_sup8:
             writeInteger((uint64_t)FormVal->Value, OS, DI.IsLittleEndian);
             break;
           case dwarf::DW_FORM_sdata:
             encodeSLEB128(FormVal->Value, OS);
             break;
           case dwarf::DW_FORM_udata:
           case dwarf::DW_FORM_ref_udata:
             encodeULEB128(FormVal->Value, OS);
for (auto Entry : CU.Entries) {
             ++FormVal;
             break;
           case dwarf::DW_FORM_strp:
           case dwarf::DW_FORM_sec_offset:
           case dwarf::DW_FORM_GNU_ref_alt:
           case dwarf::DW_FORM_GNU_strp_alt:
           case dwarf::DW_FORM_line_strp:
           case dwarf::DW_FORM_strp_sup:
-          case dwarf::DW_FORM_ref_sup:
             // TODO: Handle DWARF32/64
             writeInteger((uint32_t)FormVal->Value, OS, DI.IsLittleEndian);
             break;
           case dwarf::DW_FORM_ref_sig8:
             writeInteger((uint64_t)FormVal->Value, OS, DI.IsLittleEndian);
             break;
           case dwarf::DW_FORM_GNU_addr_index:
           case dwarf::DW_FORM_GNU_str_index:

tools/obj2yaml/dwarf2yaml.cpp

for (auto DIE : CU->dies()) {
               break;
             case dwarf::DW_FORM_data1:
             case dwarf::DW_FORM_flag:
             case dwarf::DW_FORM_data2:
             case dwarf::DW_FORM_data4:
             case dwarf::DW_FORM_data8:
             case dwarf::DW_FORM_sdata:
             case dwarf::DW_FORM_udata:
+            case dwarf::DW_FORM_ref_sup4:
+            case dwarf::DW_FORM_ref_sup8:
               if (auto Val = FormValue.getValue().getAsUnsignedConstant())
                 NewValue.Value = Val.getValue();
               break;
             case dwarf::DW_FORM_string:
               if (auto Val = FormValue.getValue().getAsCString())
                 NewValue.CStr = Val.getValue();
               break;
             case dwarf::DW_FORM_indirect:
               indirect = true;
               if (auto Val = FormValue.getValue().getAsUnsignedConstant()) {
                 NewValue.Value = Val.getValue();
                 NewEntry.Values.push_back(NewValue);
                 Form = static_cast<dwarf::Form>(Val.getValue());
               }
               break;
             case dwarf::DW_FORM_strp:
             case dwarf::DW_FORM_sec_offset:
             case dwarf::DW_FORM_GNU_ref_alt:
             case dwarf::DW_FORM_GNU_strp_alt:
             case dwarf::DW_FORM_line_strp:
             case dwarf::DW_FORM_strp_sup:
-            case dwarf::DW_FORM_ref_sup:
             case dwarf::DW_FORM_GNU_str_index:
               if (auto Val = FormValue.getValue().getAsCStringOffset())
                 NewValue.Value = Val.getValue();
               break;
             case dwarf::DW_FORM_flag_present:
               NewValue.Value = 1;
               break;
             default: