Skip to content

LLD cherry-picks #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 27, 2019
+178 −97
Merged

LLD cherry-picks #26

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83ba3ea
Cleanup: llvm::bsearch -> llvm::partition_point after r364719
MaskRay Jun 30, 2019
2ca0371
[LLD][ELF] - Minor simplification. NFC.
Jul 15, 2019
e90a08d
[DWARF][RISCV] Add support for RISC-V relocations needed for debug info
asb Jul 18, 2019
b9e5812
[MachO] Update LLD to use 64-bit offsets with DataExtractor (3/5)
igorkudrin Aug 6, 2019
fe690a8
[LLD] Move duplicated dwarf parsing code to the Common library. NFC.
mstorsjo Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[MachO] Update LLD to use 64-bit offsets with DataExtractor (3/5) 
Differential Revision: https://reviews.llvm.org/D65639

llvm-svn: 368032
(cherry picked from commit 5978c92)
(cherry picked from commit 0fba2cc25a68a3eb3ef625f9c6cc3664318c5033)
  • Loading branch information
@igorkudrin @compnerd
igorkudrin authored and compnerd committed Oct 26, 2019
commit b9e581235e4866228994e3a1e3c97b5e1ad6ba7d
12 changes: 6 additions & 6 deletions lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
View file
Original file line number Diff line number Diff line change
@@ -832,10 +832,10 @@ dataExtractorFromSection(const NormalizedFile &normalizedFile,

// FIXME: Cribbed from llvm-dwp -- should share "lightweight CU DIE
// inspection" code if possible.
static uint32_t getCUAbbrevOffset(llvm::DataExtractor abbrevData,
static uint64_t getCUAbbrevOffset(llvm::DataExtractor abbrevData,
uint64_t abbrCode) {
uint64_t curCode;
uint32_t offset = 0;
uint64_t offset = 0;
while ((curCode = abbrevData.getULEB128(&offset)) != abbrCode) {
// Tag
abbrevData.getULEB128(&offset);
@@ -853,13 +853,13 @@ static uint32_t getCUAbbrevOffset(llvm::DataExtractor abbrevData,
static Expected<const char *>
getIndexedString(const NormalizedFile &normalizedFile,
llvm::dwarf::Form form, llvm::DataExtractor infoData,
uint32_t &infoOffset, const Section &stringsSection) {
uint64_t &infoOffset, const Section &stringsSection) {
if (form == llvm::dwarf::DW_FORM_string)
return infoData.getCStr(&infoOffset);
if (form != llvm::dwarf::DW_FORM_strp)
return llvm::make_error<GenericError>(
"string field encoded without DW_FORM_strp");
uint32_t stringOffset = infoData.getU32(&infoOffset);
uint64_t stringOffset = infoData.getU32(&infoOffset);
llvm::DataExtractor stringsData =
dataExtractorFromSection(normalizedFile, stringsSection);
return stringsData.getCStr(&stringOffset);
@@ -875,7 +875,7 @@ readCompUnit(const NormalizedFile &normalizedFile,
StringRef path) {
// FIXME: Cribbed from llvm-dwp -- should share "lightweight CU DIE
// inspection" code if possible.
uint32_t offset = 0;
uint64_t offset = 0;
llvm::dwarf::DwarfFormat Format = llvm::dwarf::DwarfFormat::DWARF32;
auto infoData = dataExtractorFromSection(normalizedFile, info);
uint32_t length = infoData.getU32(&offset);
@@ -897,7 +897,7 @@ readCompUnit(const NormalizedFile &normalizedFile,

uint32_t abbrCode = infoData.getULEB128(&offset);
auto abbrevData = dataExtractorFromSection(normalizedFile, abbrev);
uint32_t abbrevOffset = getCUAbbrevOffset(abbrevData, abbrCode);
uint64_t abbrevOffset = getCUAbbrevOffset(abbrevData, abbrCode);
uint64_t tag = abbrevData.getULEB128(&abbrevOffset);
if (tag != llvm::dwarf::DW_TAG_compile_unit)
return llvm::make_error<GenericError>("top level DIE is not a compile unit");