Skip to content

Ensure that object file section IDs are correct #1603

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

Closed
wants to merge 1 commit into from
Closed

Ensure that object file section IDs are correct #1603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/asm/output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,14 @@ static uint32_t getSectIDIfAny(Section *sect) {
if (!sect)
return UINT32_MAX;

if (auto search = sectionMap.find(sect->name); search != sectionMap.end())
return static_cast<uint32_t>(sectionMap.size() - search->second - 1);
// Search in `sectionList` instead of `sectionMap`, since section fragments share the
// same name but have different IDs
if (auto search =
std::find_if(RANGE(sectionList), [&sect](Section const &s) { return &s == sect; });
search != sectionList.end())
return static_cast<uint32_t>(
sectionList.size() - std::distance(sectionList.begin(), search) - 1
);

fatalerror("Unknown section '%s'\n", sect->name.c_str());
}
Expand Down
Loading