Revert "[CMake/Bazel] Support usage of opt driver as a library (#79205)"

This reverts commit 32f7922.

Doesn't build, see
#79205 (comment)

Author: nico

llvm/tools/opt/CMakeLists.txt

@@ -29,24 +29,12 @@ set(LLVM_LINK_COMPONENTS
   Passes
   )
 
-# We don't want to link this into libLLVM
-add_llvm_library(LLVMOptDriver
-  STATIC
+add_llvm_tool(opt
   NewPMDriver.cpp
-  optdriver.cpp
-  PARTIAL_SOURCES_INTENDED
-  DEPENDS
-  intrinsics_gen
-)
+  opt.cpp
 
-add_llvm_tool(opt
-  PARTIAL_SOURCES_INTENDED
-  opt.cpp 
   DEPENDS
   intrinsics_gen
   SUPPORT_PLUGINS
-
   )
-target_link_libraries(opt PRIVATE LLVMOptDriver)
-
 export_executable_symbols_for_plugins(opt)

llvm/tools/opt/NewPMDriver.cpp

@@ -328,9 +328,8 @@ bool llvm::runPassPipeline(
     StringRef Arg0, Module &M, TargetMachine *TM, TargetLibraryInfoImpl *TLII,
     ToolOutputFile *Out, ToolOutputFile *ThinLTOLinkOut,
     ToolOutputFile *OptRemarkFile, StringRef PassPipeline,
-    ArrayRef<PassPlugin> PassPlugins,
-    ArrayRef<std::function<void(llvm::PassBuilder &)>> PassBuilderCallbacks,
-    OutputKind OK, VerifierKind VK, bool ShouldPreserveAssemblyUseListOrder,
+    ArrayRef<PassPlugin> PassPlugins, OutputKind OK, VerifierKind VK,
+    bool ShouldPreserveAssemblyUseListOrder,
     bool ShouldPreserveBitcodeUseListOrder, bool EmitSummaryIndex,
     bool EmitModuleHash, bool EnableDebugify, bool VerifyDIPreserve,
     bool UnifiedLTO) {
@@ -429,10 +428,6 @@ bool llvm::runPassPipeline(
   for (auto &PassPlugin : PassPlugins)
     PassPlugin.registerPassBuilderCallbacks(PB);
 
-  // Load any explicitly specified plugins.
-  for (auto &PassCallback : PassBuilderCallbacks)
-    PassCallback(PB);
-
 #define HANDLE_EXTENSION(Ext)                                                  \
   get##Ext##PluginInfo().RegisterPassBuilderCallbacks(PB);
 #include "llvm/Support/Extension.def"

llvm/tools/opt/NewPMDriver.h

@@ -23,7 +23,6 @@
 #include "llvm/Support/CommandLine.h"
 
 namespace llvm {
-class PassBuilder;
 class StringRef;
 class Module;
 class PassPlugin;
@@ -65,17 +64,16 @@ void printPasses(raw_ostream &OS);
 ///
 /// ThinLTOLinkOut is only used when OK is OK_OutputThinLTOBitcode, and can be
 /// nullptr.
-bool runPassPipeline(
-    StringRef Arg0, Module &M, TargetMachine *TM, TargetLibraryInfoImpl *TLII,
-    ToolOutputFile *Out, ToolOutputFile *ThinLinkOut,
-    ToolOutputFile *OptRemarkFile, StringRef PassPipeline,
-    ArrayRef<PassPlugin> PassPlugins,
-    ArrayRef<std::function<void(llvm::PassBuilder &)>> PassBuilderCallbacks,
-    opt_tool::OutputKind OK, opt_tool::VerifierKind VK,
-    bool ShouldPreserveAssemblyUseListOrder,
-    bool ShouldPreserveBitcodeUseListOrder, bool EmitSummaryIndex,
-    bool EmitModuleHash, bool EnableDebugify, bool VerifyDIPreserve,
-    bool UnifiedLTO = false);
+bool runPassPipeline(StringRef Arg0, Module &M, TargetMachine *TM,
+                     TargetLibraryInfoImpl *TLII, ToolOutputFile *Out,
+                     ToolOutputFile *ThinLinkOut, ToolOutputFile *OptRemarkFile,
+                     StringRef PassPipeline, ArrayRef<PassPlugin> PassPlugins,
+                     opt_tool::OutputKind OK, opt_tool::VerifierKind VK,
+                     bool ShouldPreserveAssemblyUseListOrder,
+                     bool ShouldPreserveBitcodeUseListOrder,
+                     bool EmitSummaryIndex, bool EmitModuleHash,
+                     bool EnableDebugify, bool VerifyDIPreserve,
+                     bool UnifiedLTO = false);
 } // namespace llvm
 
 #endif