Addressing reviewers (2)

Author: paschalis-mpeis

bolt/include/bolt/Core/MCPlusBuilder.h

@@ -2044,7 +2044,11 @@ class MCPlusBuilder {
   /// Returns a function body that contains only a return instruction. An
   /// example usage is a workaround for the '__bolt_fini_trampoline' of
   // Instrumentation.
-  virtual InstructionListType createDummyReturn(MCContext *Ctx) const;
+  virtual InstructionListType createDummyReturnFunction(MCContext *Ctx) const {
+    InstructionListType Insts(1);
+    createReturn(Insts[0]);
+    return Insts;
+  }
 
   /// This method takes an indirect call instruction and splits it up into an
   /// equivalent set of instructions that use direct calls for target

bolt/lib/Core/MCPlusBuilder.cpp

@@ -147,12 +147,6 @@ bool MCPlusBuilder::isTailCall(const MCInst &Inst) const {
   return false;
 }
 
-InstructionListType MCPlusBuilder::createDummyReturn(MCContext *Ctx) const {
-  InstructionListType Insts(1);
-  createReturn(Insts[0]);
-  return Insts;
-}
-
 std::optional<MCLandingPad> MCPlusBuilder::getEHInfo(const MCInst &Inst) const {
   if (!isCall(Inst))
     return std::nullopt;

bolt/lib/Passes/Instrumentation.cpp

@@ -754,7 +754,7 @@ void Instrumentation::createAuxiliaryFunctions(BinaryContext &BC) {
       // with unknown symbol in runtime library. E.g. for static PIE
       // executable
       createSimpleFunction("__bolt_fini_trampoline",
-                           BC.MIB->createDummyReturn(BC.Ctx.get()));
+                           BC.MIB->createDummyReturnFunction(BC.Ctx.get()));
     }
   }
 }