intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-14 03:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

WasmObjectWrier: Simplify fragment walk in .init_array

Browse Source 
and reduce the reliance on the FT_Align/FT_Data layout,
which will be changed by #149030
This commit is contained in:
Fangrui Song
2025-07-19 13:24:24 -07:00
parent 6eef978e1e
commit 52f56edccf
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/lib/MC/WasmObjectWriter.cpp
View File

@@ -1858,23 +1858,9 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
auto IT = WS.begin();
if (IT == WS.end())
continue;
const MCFragment &EmptyFrag = *IT;
if (EmptyFrag.getKind() != MCFragment::FT_Data)
report_fatal_error(".init_array section should be aligned");
const MCFragment *nextFrag = EmptyFrag.getNext();
while (nextFrag != nullptr) {
const MCFragment &AlignFrag = *nextFrag;
if (AlignFrag.getKind() != MCFragment::FT_Align)
report_fatal_error(".init_array section should be aligned");
if (cast<MCAlignFragment>(AlignFrag).getAlignment() !=
Align(is64Bit() ? 8 : 4))
report_fatal_error(
".init_array section should be aligned for pointers");
const MCFragment &Frag = *AlignFrag.getNext();
nextFrag = Frag.getNext();
if (Frag.hasInstructions() || Frag.getKind() != MCFragment::FT_Data)
for (auto *Frag = &*IT; Frag; Frag = Frag->getNext()) {
if (Frag->hasInstructions() || (Frag->getKind() != MCFragment::FT_Align &&
Frag->getKind() != MCFragment::FT_Data))
report_fatal_error("only data supported in .init_array section");
uint16_t Priority = UINT16_MAX;
@@ -1886,9 +1872,8 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
if (WS.getName().substr(PrefixLength + 1).getAsInteger(10, Priority))
report_fatal_error("invalid .init_array section priority");
}
const auto &DataFrag = Frag;
assert(llvm::all_of(DataFrag.getContents(), [](char C) { return !C; }));
for (const MCFixup &Fixup : DataFrag.getFixups()) {
assert(llvm::all_of(Frag->getContents(), [](char C) { return !C; }));
for (const MCFixup &Fixup : Frag->getFixups()) {
assert(Fixup.getKind() ==
MCFixup::getDataKindForSize(is64Bit() ? 8 : 4));
const MCExpr *Expr = Fixup.getValue();