[𝘀𝗽𝗿] initial version
Created using spr 1.3.4
diff --git a/bolt/include/bolt/Core/BinaryFunction.h b/bolt/include/bolt/Core/BinaryFunction.h
index 26d2d01..540a976 100644
--- a/bolt/include/bolt/Core/BinaryFunction.h
+++ b/bolt/include/bolt/Core/BinaryFunction.h
@@ -361,6 +361,9 @@
/// True if another function body was merged into this one.
bool HasFunctionsFoldedInto{false};
+ /// True if the function has internal calls.
+ bool HasInternalCalls{false};
+
/// Name for the section this function code should reside in.
std::string CodeSectionName;
@@ -1334,6 +1337,9 @@
/// Return true if other functions were folded into this one.
bool hasFunctionsFoldedInto() const { return HasFunctionsFoldedInto; }
+ /// Return true if the function has internal calls.
+ bool hasInternalCalls() const { return HasInternalCalls; }
+
/// If this function was folded, return the function it was folded into.
BinaryFunction *getFoldedIntoFunction() const { return FoldedIntoFunction; }
diff --git a/bolt/lib/Core/BinaryFunction.cpp b/bolt/lib/Core/BinaryFunction.cpp
index 1fa96df..fff53dd 100644
--- a/bolt/lib/Core/BinaryFunction.cpp
+++ b/bolt/lib/Core/BinaryFunction.cpp
@@ -1281,6 +1281,7 @@
// Recursive call.
TargetSymbol = getSymbol();
} else {
+ HasInternalCalls = true;
if (BC.isX86()) {
// Dangerous old-style x86 PIC code. We may need to freeze this
// function, so preserve the function as is for now.
diff --git a/bolt/lib/Passes/ValidateInternalCalls.cpp b/bolt/lib/Passes/ValidateInternalCalls.cpp
index 88df2e5..24f9bfd 100644
--- a/bolt/lib/Passes/ValidateInternalCalls.cpp
+++ b/bolt/lib/Passes/ValidateInternalCalls.cpp
@@ -309,15 +309,10 @@
std::set<BinaryFunction *> NeedsValidation;
for (auto &BFI : BC.getBinaryFunctions()) {
BinaryFunction &Function = BFI.second;
- for (BinaryBasicBlock &BB : Function) {
- for (MCInst &Inst : BB) {
- if (getInternalCallTarget(Function, Inst)) {
- NeedsValidation.insert(&Function);
- Function.setSimple(false);
- break;
- }
- }
- }
+ if (!Function.hasInternalCalls())
+ continue;
+ NeedsValidation.insert(&Function);
+ Function.setSimple(false);
}
// Skip validation for non-relocation mode
