Revert shimming.

llvm/include/llvm/Support/Yk.h

@@ -13,6 +13,5 @@ extern bool YkPatchCtrlPoint;
 extern bool YkPatchIdempotent;
 extern bool YkOutlineUntraceable;
 extern bool YkModuleClone;
-extern bool YkShimCallees;
 
 #endif

llvm/lib/CodeGen/TargetPassConfig.cpp

@@ -60,7 +60,7 @@
 #include "llvm/Transforms/Yk/MarkTraceableOptNone.h"
 #include "llvm/Transforms/Yk/NoCallsInEntryBlocks.h"
 #include "llvm/Transforms/Yk/BasicBlockTracer.h"
-#include "llvm/Transforms/Yk/ShimCallees.h"
+#include "llvm/Transforms/Yk/ModuleClone.h"
 #include <cassert>
 #include <optional>
 #include <string>
@@ -1204,10 +1204,6 @@ bool TargetPassConfig::addISelPasses() {
     addPass(createYkBasicBlockTracerPass());
   }
 
-  if (YkShimCallees) {
-    addPass(createYkShimCalleesPass());
-  }
-
   addISelPrepare();
   return addCoreISelPasses();
 }

llvm/lib/Support/Yk.cpp

@@ -162,19 +162,6 @@ struct CreateYkModuleCloneParser {
 } // namespace
 static ManagedStatic<cl::opt<bool, true>, CreateYkModuleCloneParser> YkModuleCloneParser;
 
-bool YkShimCallees;
-namespace {
-struct CreateYkShimCalleesParser {
-  static void *call() {
-    return new cl::opt<bool, true>(
-        "yk-shim-callees",
-        cl::desc("Enables shimming in traceable AOT code for Yk JIT"),
-        cl::NotHidden, cl::location(YkShimCallees));
-  }
-};
-} // namespace
-static ManagedStatic<cl::opt<bool, true>, CreateYkShimCalleesParser> YkShimCalleesParser;
-
 void llvm::initYkOptions() {
   *YkExtendedLLVMBBAddrMapSectionParser;
   *YkStackMapOffsetFixParser;
@@ -187,5 +174,4 @@ void llvm::initYkOptions() {
   *YkPatchIdempotentParser;
   *YkOutlineUntraceableParser;
   *YkModuleCloneParser;
-  *YkShimCalleesParser;
 }

llvm/lib/Transforms/Yk/CMakeLists.txt

@@ -12,7 +12,6 @@ add_llvm_component_library(LLVMYkPasses
   BasicBlockTracer.cpp
   ModuleClone.cpp
   MarkTraceableOptNone.cpp
-  ShimCallees.cpp
 
   DEPENDS
   intrinsics_gen