fixup! [BOLT][AArch64] Patch functions targeted by optional relocs

Author: maksfb

bolt/include/bolt/Core/BinaryFunction.h

@@ -1383,11 +1383,6 @@ class BinaryFunction {
   /// Return true if the function should not have associated symbol table entry.
   bool isAnonymous() const { return IsAnonymous; }
 
-  /// Return true if we can allow the execution of the original body of the
-  /// function and its rewritten copy. This means, e.g., that metadata
-  /// associated with the function can be duplicated/cloned.
-  bool canClone() const;
-
   /// If this function was folded, return the function it was folded into.
   BinaryFunction *getFoldedIntoFunction() const { return FoldedIntoFunction; }
 

bolt/lib/Core/BinaryFunction.cpp

@@ -3753,14 +3753,6 @@ void BinaryFunction::postProcessBranches() {
   assert(validateCFG() && "invalid CFG");
 }
 
-bool BinaryFunction::canClone() const {
-  if (opts::Instrument)
-    return false;
-
-  // Check for the presence of metadata that cannot be duplicated.
-  return !hasEHRanges() && !hasSDTMarker() && !hasPseudoProbe() && !hasORC();
-}
-
 MCSymbol *BinaryFunction::addEntryPointAtOffset(uint64_t Offset) {
   assert(Offset && "cannot add primary entry point");
   assert(CurrentState == State::Empty || CurrentState == State::Disassembled);

bolt/lib/Passes/PatchEntries.cpp

@@ -66,8 +66,8 @@ Error PatchEntries::runOnFunctions(BinaryContext &BC) {
       continue;
 
     // Check if we can skip patching the function.
-    if (!opts::ForcePatch && !Function.needsPatch() && Function.canClone() &&
-        Function.getSize() < PatchThreshold)
+    if (!opts::ForcePatch && !Function.hasEHRanges() &&
+        !Function.needsPatch() && Function.getSize() < PatchThreshold)
       continue;
 
     // List of patches for function entries. We either successfully patch