AcoSail/llvm-project
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DWARFLinker][DWARFv5] add support for DW_FORM_implicit_const form.

Browse Source 
This patch adds handling of DW_FORM_implicit_const form.

Differential Revision: https://reviews.llvm.org/D146047
This commit is contained in:
Alexey Lapshin 2023-03-13 16:13:41 +01:00
parent 6bc5aa592a
commit ede827f583
4 changed files with 146 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/include/llvm/CodeGen/DIE.h
View File

@ -115,6 +115,11 @@ public:
Data.push_back(DIEAbbrevData(Attribute, Value));
}
/// Adds another set of attribute information to the abbreviation.
void AddAttribute(const DIEAbbrevData &AbbrevData) {
Data.push_back(AbbrevData);
}
/// Used to gather unique data for the abbreviation folding set.
void Profile(FoldingSetNodeID &ID) const;

9
llvm/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
View File

@ -12,6 +12,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/iterator_range.h"
#include "llvm/BinaryFormat/Dwarf.h"
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include <cassert>
#include <cstddef>
#include <cstdint>
@ -19,7 +20,6 @@
namespace llvm {
class DataExtractor;
class DWARFFormValue;
class DWARFUnit;
class raw_ostream;
@ -39,6 +39,13 @@ public:
this->ByteSize.ByteSize = *ByteSize;
}
DWARFFormValue getFormValue() const {
if (Form == dwarf::DW_FORM_implicit_const)
return DWARFFormValue::createFromSValue(Form, getImplicitConstValue());
return DWARFFormValue(Form);
}
dwarf::Attribute Attr;
dwarf::Form Form;

5
llvm/lib/DWARFLinker/DWARFLinker.cpp
View File

@ -928,7 +928,7 @@ void DWARFLinker::assignAbbrev(DIEAbbrev &Abbrev) {
Abbreviations.push_back(
std::make_unique<DIEAbbrev>(Abbrev.getTag(), Abbrev.hasChildren()));
for (const auto &Attr : Abbrev.getData())
Abbreviations.back()->AddAttribute(Attr.getAttribute(), Attr.getForm());
Abbreviations.back()->AddAttribute(Attr);
AbbreviationsSet.InsertNode(Abbreviations.back().get(), InsertToken);
// Assign the unique abbreviation number.
Abbrev.setNumber(Abbreviations.size());
@ -1408,6 +1408,7 @@ unsigned DWARFLinker::DIECloner::cloneAttribute(
case dwarf::DW_FORM_flag_present:
case dwarf::DW_FORM_rnglistx:
case dwarf::DW_FORM_loclistx:
case dwarf::DW_FORM_implicit_const:
return cloneScalarAttribute(Die, InputDIE, File, Unit, AttrSpec, Val,
AttrSize, Info);
default:
@ -1596,7 +1597,7 @@ DIE *DWARFLinker::DIECloner::cloneDIE(const DWARFDie &InputDIE,
continue;
}
DWARFFormValue Val(AttrSpec.Form);
DWARFFormValue Val = AttrSpec.getFormValue();
uint64_t AttrSize = Offset;
Val.extractValue(Data, &Offset, U.getFormParams(), &U);
AttrSize = Offset - AttrSize;

130
llvm/test/tools/llvm-dwarfutil/ELF/X86/dwarf5-attributes.test Normal file
View File

@ -0,0 +1,130 @@
## Test that DWARFv5 DW_FORM_implicit_const is correctly recognized
## and copied into the result.
# RUN: yaml2obj %s -o %t.o
# RUN: llvm-dwarfutil %t.o %t1
# RUN: llvm-dwarfdump -verify %t1 | FileCheck %s --check-prefix VERIFY-CHECK
# RUN: llvm-dwarfdump -a --verbose %t1 | FileCheck %s
#
# RUN: llvm-dwarfutil --no-garbage-collection %t.o %t1
# RUN: llvm-dwarfdump -verify %t1 | FileCheck %s --check-prefix VERIFY-CHECK
# RUN: llvm-dwarfdump -a --verbose %t1 | FileCheck %s
#
# RUN: llvm-dwarfutil --no-garbage-collection --build-accelerator=DWARF %t.o %t1
# RUN: llvm-dwarfdump -verify %t1 | FileCheck %s --check-prefix VERIFY-CHECK
# RUN: llvm-dwarfdump -a --verbose %t1 | FileCheck %s
#VERIFY-CHECK: No errors.
#CHECK: .debug_abbrev
#CHECK: DW_TAG_compile_unit
#CHECK: DW_TAG_subprogram
#CHECK: DW_TAG_base_type
#CHECK: DW_TAG_variable
#CHECK: DW_AT_name
#CHECK: DW_AT_const_value DW_FORM_implicit_const 33
#CHECK: DW_AT_type
#CHECK: DW_TAG_compile_unit
#CHECK: DW_AT_name {{.*}}"CU1"
#CHECK: DW_AT_low_pc
#CHECK: DW_AT_high_pc
#CHECK: DW_TAG_subprogram
#CHECK: DW_AT_name {{.*}}"foo1"
#CHECK: DW_AT_low_pc
#CHECK: DW_AT_high_pc
#CHECK: DW_TAG_variable
#CHECK: DW_AT_name {{.*}}"var1"
#CHECK: DW_AT_const_value [DW_FORM_implicit_const] (33)
#CHECK: DW_AT_type {{.*}}"int"
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_REL
Machine: EM_X86_64
Sections:
- Name: .text
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
Address: 0x1130
Size: 0x60
DWARF:
debug_abbrev:
- Table:
- Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_yes
Attributes:
- Attribute: DW_AT_producer
Form: DW_FORM_string
- Attribute: DW_AT_language
Form: DW_FORM_data2
- Attribute: DW_AT_name
Form: DW_FORM_string
- Attribute: DW_AT_low_pc
Form: DW_FORM_addrx
- Attribute: DW_AT_high_pc
Form: DW_FORM_data8
- Attribute: DW_AT_addr_base
Form: DW_FORM_sec_offset
- Tag: DW_TAG_subprogram
Children: DW_CHILDREN_yes
Attributes:
- Attribute: DW_AT_name
Form: DW_FORM_string
- Attribute: DW_AT_low_pc
Form: DW_FORM_addrx
- Attribute: DW_AT_high_pc
Form: DW_FORM_data8
- Attribute: DW_AT_type
Form: DW_FORM_ref4
- Tag: DW_TAG_base_type
Children: DW_CHILDREN_no
Attributes:
- Attribute: DW_AT_name
Form: DW_FORM_string
- Tag: DW_TAG_variable
Children: DW_CHILDREN_no
Attributes:
- Attribute: DW_AT_name
Form: DW_FORM_string
- Attribute: DW_AT_const_value
Form: DW_FORM_implicit_const
Value: 33
- Attribute: DW_AT_type
Form: DW_FORM_ref4
debug_info:
- Version: 5
UnitType: DW_UT_compile
Entries:
- AbbrCode: 1
Values:
- CStr: by_hand
- Value: 0x04
- CStr: CU1
- Value: 0x0
- Value: 0x10
- Value: 0x8
- AbbrCode: 2
Values:
- CStr: foo1
- Value: 0x0
- Value: 0x10
- Value: 0x3c
- AbbrCode: 0
- AbbrCode: 3
Values:
- CStr: int
- AbbrCode: 4
Values:
- CStr: var1
- Value: 0x00000000
- Value: 0x0000003c
- AbbrCode: 0
debug_addr:
- Version: 5
AddressSize: 0x08
Entries:
- Address: 0x1130
...