[𝘀𝗽𝗿] initial version
Created using spr 1.3.4
diff --git a/bolt/lib/Core/BinaryFunction.cpp b/bolt/lib/Core/BinaryFunction.cpp
index ff5eb5c..161733d 100644
--- a/bolt/lib/Core/BinaryFunction.cpp
+++ b/bolt/lib/Core/BinaryFunction.cpp
@@ -1754,8 +1754,7 @@
// In non-relocation mode there's potentially an external undetectable
// reference to the entry point and hence we cannot move this entry
// point. Optimizing without moving could be difficult.
- // In aggregation, register any known entry points for CFG construction.
- if (!BC.HasRelocations && !opts::AggregateOnly)
+ if (!BC.HasRelocations)
setSimple(false);
const uint32_t Offset = KV.first;
@@ -2084,7 +2083,7 @@
Error BinaryFunction::buildCFG(MCPlusBuilder::AllocatorIdTy AllocatorId) {
auto &MIB = BC.MIB;
- if (!isSimple()) {
+ if (!isSimple() && !opts::AggregateOnly) {
assert(!BC.HasRelocations &&
"cannot process file with non-simple function in relocs mode");
return createNonFatalBOLTError("");
diff --git a/bolt/lib/Profile/DataAggregator.cpp b/bolt/lib/Profile/DataAggregator.cpp
index d20626b..dc0f910 100644
--- a/bolt/lib/Profile/DataAggregator.cpp
+++ b/bolt/lib/Profile/DataAggregator.cpp
@@ -871,7 +871,7 @@
BinaryContext &BC = BF.getBinaryContext();
- if (!BF.isSimple())
+ if (BF.empty())
return std::nullopt;
assert(BF.hasCFG() && "can only record traces in CFG state");
diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp
index 70a9f08..ae3e0b9 100644
--- a/bolt/lib/Rewrite/RewriteInstance.cpp
+++ b/bolt/lib/Rewrite/RewriteInstance.cpp
@@ -3438,7 +3438,8 @@
};
ParallelUtilities::PredicateTy SkipPredicate = [&](const BinaryFunction &BF) {
- return !shouldDisassemble(BF) || !BF.isSimple();
+ // Construct CFG for non-simple functions in aggregation mode.
+ return !(shouldDisassemble(BF) && (BF.isSimple() || opts::AggregateOnly));
};
ParallelUtilities::runOnEachFunctionWithUniqueAllocId(
