intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 20:53:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Another EH fix for cold fragments of functions that we fail to write.

Browse Source 
Summary:
In a prev diff I disabled inclusion of FDEs for cold fragments that
we fail to write. The side effect of it was that we failed to
write FDE for the next function with a cold fragment since it
had the same assigned address that we had put in FailedAddresses.

The correct fix is to assign zero address to failed cold fragments
and ignore them when we write .eh_frame_hdr.

(cherry picked from FBD4156740)
This commit is contained in:
Maksim Panchenko
2016-11-09 11:19:02 -08:00
parent 355dbd769e
commit 055dfe48e7
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bolt/RewriteInstance.cpp
View File

@@ -1574,23 +1574,30 @@ void RewriteInstance::emitFunctions() {
"cannot find section for cold part");
// Cold fragments are aligned at 16 bytes.
NextAvailableAddress = RoundUpToAlignment(NextAvailableAddress, 16);
DEBUG(dbgs() << "BOLT: mapping 0x"
<< Twine::utohexstr(SMII->second.AllocAddress) << " to 0x"
<< Twine::utohexstr(NextAvailableAddress) << " with size "
<< Twine::utohexstr(SMII->second.Size) << '\n');
if (TooLarge) {
// The corresponding FDE will refer to address 0.
Function.cold().setAddress(0);
Function.cold().setImageAddress(0);
Function.cold().setImageSize(0);
Function.cold().setFileOffset(0);
} else {
Function.cold().setAddress(NextAvailableAddress);
Function.cold().setImageAddress(SMII->second.AllocAddress);
Function.cold().setImageSize(SMII->second.Size);
Function.cold().setFileOffset(getFileOffsetFor(NextAvailableAddress));
}
DEBUG(dbgs() << "BOLT: mapping cold fragment 0x"
<< Twine::utohexstr(Function.cold().getImageAddress())
<< " to 0x"
<< Twine::utohexstr(Function.cold().getAddress())
<< " with size "
<< Twine::utohexstr(Function.cold().getImageSize()) << '\n');
OLT.mapSectionAddress(ObjectsHandle,
SMII->second.SectionID,
NextAvailableAddress);
Function.cold().setAddress(NextAvailableAddress);
Function.cold().setImageAddress(SMII->second.AllocAddress);
Function.cold().setImageSize(TooLarge ? 0 : SMII->second.Size);
Function.cold().setFileOffset(getFileOffsetFor(NextAvailableAddress));
Function.cold().getAddress());
NextAvailableAddress += Function.cold().getImageSize();
if (TooLarge) {
FailedAddresses.emplace_back(Function.cold().getAddress());
}
}
// Add the new text section aggregating all existing code sections.