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

Don't create empty basic blocks. Fix CFI bug.

Browse Source 
Summary:
Some basic blocks were created empty because they only contained
alignment nop's. Ignore such nop's before basic block gets created.

Fixed intermittent aborts related to CFI update.

(cherry picked from FBD2844465)
This commit is contained in:
Maksim Panchenko
2016-01-19 00:20:06 -08:00
parent 4a44d187c6
commit bbb745efa9
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bolt/BinaryFunction.cpp
View File

@@ -542,6 +542,13 @@ bool BinaryFunction::buildCFG() {
InsertBB = addBasicBlock(LI->first, LI->second,
/* DeriveAlignment = */ IsLastInstrNop);
}
// Ignore nops. We use nops to derive alignment of the next basic block.
// It will not always work, as some blocks are naturally aligned, but
// it's just part of heuristic for block alignment.
if (MIA->isNoop(InstrInfo.second)) {
IsLastInstrNop = true;
continue;
}
if (!InsertBB) {
// It must be a fallthrough or unreachable code. Create a new block unless
// we see an unconditional branch following a conditional one.
@@ -561,13 +568,6 @@ bool BinaryFunction::buildCFG() {
// Add associated CFI pseudos in the first offset (0)
addCFIPlaceholders(0, InsertBB);
}
// Ignore nops. We use nops to derive alignment of the next basic block.
// It will not always work, as some blocks are naturally aligned, but
// it's just part of heuristic for block alignment.
if (MIA->isNoop(InstrInfo.second)) {
IsLastInstrNop = true;
continue;
}
IsLastInstrNop = false;
InsertBB->addInstruction(InstrInfo.second);
@@ -930,16 +930,18 @@ bool BinaryFunction::fixCFIState() {
}
}
auto Pos = BB->begin();
while (MCCFIInstruction *CFI = getCFIFor(*Pos++)) {
while (Pos != BB->end() && BC.MIA->isCFI(*Pos)) {
auto CFI = getCFIFor(*Pos);
if (CFI->getOperation() == MCCFIInstruction::OpRememberState)
++StackOffset;
if (CFI->getOperation() == MCCFIInstruction::OpRestoreState)
--StackOffset;
++Pos;
}
if (StackOffset != 0) {
errs() << " FLO-WARNING: not possible to remember/recover state"
<< "without corrupting CFI state stack in function "
<< " without corrupting CFI state stack in function "
<< getName() << "\n";
return false;
}

14
bolt/RewriteInstance.cpp
View File

@@ -690,7 +690,7 @@ void RewriteInstance::disassembleFunctions() {
errs() << "FLO-INFO: " << ProfiledFunctions.size() << " functions out of "
<< NumSimpleFunctions
<< " simple functions ("
<< format("%.f",
<< format("%.1f",
ProfiledFunctions.size() /
(float) NumSimpleFunctions * 100.0)
<< "%) have non-empty execution profile.\n";
@@ -775,17 +775,19 @@ void RewriteInstance::runOptimizationPasses() {
// Post-processing passes.
// Update exception handling information.
Function.updateEHRanges();
if (opts::PrintAll || opts::PrintEHRanges)
Function.print(errs(), "after updating EH ranges");
// Fix the CFI state.
if (!Function.fixCFIState()) {
errs() << "FLO-WARNING: unable to fix CFI state for function "
<< Function.getName() << ". Skipping.\n";
Function.setSimple(false);
continue;
}
// Update exception handling information.
Function.updateEHRanges();
if (opts::PrintAll || opts::PrintEHRanges)
Function.print(errs(), "after updating EH ranges");
}
}