[MCJIT][test] Use new pass manager API

llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Analysis
   Core
   ExecutionEngine
-  IPO
-  InstCombine
   MC
   MCJIT
+  Passes
   RuntimeDyld
   ScalarOpts
   Support
   Target
   nativecodegen
   )
 
 set(MCJITTestsSources

llvm/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp

 //
 //===----------------------------------------------------------------------===//
 
 #include "MCJITTestAPICommon.h"
 #include "llvm-c/Analysis.h"
 #include "llvm-c/Core.h"
 #include "llvm-c/ExecutionEngine.h"
 #include "llvm-c/Target.h"
-#include "llvm-c/Transforms/PassManagerBuilder.h"
-#include "llvm-c/Transforms/Scalar.h"
+#include "llvm-c/Transforms/PassBuilder.h"
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Host.h"
 #include "gtest/gtest.h"
 
 using namespace llvm;
 
 static bool didCallAllocateCodeSection;
protected:
 
   void buildMCJITEngine() {
     ASSERT_EQ(
       0, LLVMCreateMCJITCompilerForModule(&Engine, Module, &Options,
                                           sizeof(Options), &Error));
   }
   
   void buildAndRunPasses() {
-    LLVMPassManagerRef pass = LLVMCreatePassManager();
-    LLVMAddInstructionCombiningPass(pass);
-    LLVMRunPassManager(pass, Module);
-    LLVMDisposePassManager(pass);
+    LLVMPassBuilderOptionsRef Options = LLVMCreatePassBuilderOptions();
+    if (LLVMErrorRef E =
+            LLVMRunPasses(Module, "instcombine", nullptr, Options)) {
+        char *Msg = LLVMGetErrorMessage(E);
+        LLVMConsumeError(E);
+        LLVMDisposePassBuilderOptions(Options);
+        FAIL() << "Failed to run passes: " << Msg;
     }
-  
-  void buildAndRunOptPasses() {
-    LLVMPassManagerBuilderRef passBuilder;
-    
-    passBuilder = LLVMPassManagerBuilderCreate();
-    LLVMPassManagerBuilderSetOptLevel(passBuilder, 2);
-    LLVMPassManagerBuilderSetSizeLevel(passBuilder, 0);
-    
-    LLVMPassManagerRef functionPasses =
-      LLVMCreateFunctionPassManagerForModule(Module);
-    LLVMPassManagerRef modulePasses =
-      LLVMCreatePassManager();
-    
-    LLVMPassManagerBuilderPopulateFunctionPassManager(passBuilder,
-                                                      functionPasses);
-    LLVMPassManagerBuilderPopulateModulePassManager(passBuilder, modulePasses);
-    
-    LLVMPassManagerBuilderDispose(passBuilder);
-    
-    LLVMInitializeFunctionPassManager(functionPasses);
-    for (LLVMValueRef value = LLVMGetFirstFunction(Module);
-         value; value = LLVMGetNextFunction(value))
-      LLVMRunFunctionPassManager(functionPasses, value);
-    LLVMFinalizeFunctionPassManager(functionPasses);
-    
-    LLVMRunPassManager(modulePasses, Module);
-    
-    LLVMDisposePassManager(functionPasses);
-    LLVMDisposePassManager(modulePasses);
+    LLVMDisposePassBuilderOptions(Options);
+  }
+  void buildAndRunOptPasses() {
+    LLVMPassBuilderOptionsRef Options = LLVMCreatePassBuilderOptions();
+    if (LLVMErrorRef E =
+            LLVMRunPasses(Module, "default<O2>", nullptr, Options)) {
+        char *Msg = LLVMGetErrorMessage(E);
+        LLVMConsumeError(E);
+        LLVMDisposePassBuilderOptions(Options);
+        FAIL() << "Failed to run passes: " << Msg;
+    }
+    LLVMDisposePassBuilderOptions(Options);
   }
   
   LLVMModuleRef Module;
   LLVMValueRef Function;
   LLVMValueRef Function2;
   LLVMMCJITCompilerOptions Options;
   LLVMExecutionEngineRef Engine;
   char *Error;

llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn

 import("//third-party/unittest/unittest.gni")
 
 unittest("MCJITTests") {
   deps = [
     "//llvm/lib/Analysis",
     "//llvm/lib/ExecutionEngine",
     "//llvm/lib/ExecutionEngine/MCJIT",
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/IR",
     "//llvm/lib/MC",
+    "//llvm/lib/Passes",
     "//llvm/lib/Support",
     "//llvm/lib/Target",
     "//llvm/lib/Target:NativeTarget",
-    "//llvm/lib/Transforms/IPO",
-    "//llvm/lib/Transforms/InstCombine",
-    "//llvm/lib/Transforms/Scalar",
   ]
   sources = [
     "MCJITCAPITest.cpp",
     "MCJITMemoryManagerTest.cpp",
     "MCJITMultipleModuleTest.cpp",
     "MCJITObjectCacheTest.cpp",
     "MCJITTest.cpp",
   ]
 
   if (host_os == "win") {
     sources += [ "MCJITTests.def" ]
   }
 }