Use LLVMAddAnalysisPasses instead of Rust's wrapper

src/librustc_codegen_llvm/back/lto.rs

@@ -541,7 +541,7 @@ pub(crate) fn run_pass_manager(cgcx: &CodegenContext<LlvmCodegenBackend>,
  debug!("running the pass manager");
  unsafe {
  let pm = llvm::LLVMCreatePassManager();
- llvm::LLVMRustAddAnalysisPasses(module.module_llvm.tm, pm, module.module_llvm.llmod());
+ llvm::LLVMAddAnalysisPasses(module.module_llvm.tm, pm);
 
  if config.verify_llvm_ir {
  let pass = llvm::LLVMRustFindAndCreatePass("verify\0".as_ptr().cast());

src/librustc_codegen_llvm/back/write.rs

@@ -384,8 +384,8 @@ pub(crate) unsafe fn optimize(cgcx: &CodegenContext<LlvmCodegenBackend>,
  // we'll get errors in LLVM.
  let using_thin_buffers = config.bitcode_needed();
  if !config.no_prepopulate_passes {
- llvm::LLVMRustAddAnalysisPasses(tm, fpm, llmod);
- llvm::LLVMRustAddAnalysisPasses(tm, mpm, llmod);
+ llvm::LLVMAddAnalysisPasses(tm, fpm);
+ llvm::LLVMAddAnalysisPasses(tm, mpm);
  let opt_level = to_llvm_opt_settings(opt_level).0;
  let prepare_for_thin_lto = cgcx.lto == Lto::Thin || cgcx.lto == Lto::ThinLocal ||
  (cgcx.lto != Lto::Fat && cgcx.opts.cg.linker_plugin_lto.enabled());
@@ -509,7 +509,7 @@ pub(crate) unsafe fn codegen(cgcx: &CodegenContext<LlvmCodegenBackend>,
  where F: FnOnce(&'ll mut PassManager<'ll>) -> R,
  {
  let cpm = llvm::LLVMCreatePassManager();
- llvm::LLVMRustAddAnalysisPasses(tm, cpm, llmod);
+ llvm::LLVMAddAnalysisPasses(tm, cpm);
  llvm::LLVMRustAddLibraryInfo(cpm, llmod, no_builtins);
  f(cpm)
  }

src/librustc_codegen_llvm/llvm/ffi.rs

@@ -1341,6 +1341,8 @@ extern "C" {
 
  pub fn LLVMInitializePasses();
 
+ pub fn LLVMAddAnalysisPasses(T: &'a TargetMachine, PM: &PassManager<'a>);
+
  pub fn LLVMPassManagerBuilderCreate() -> &'static mut PassManagerBuilder;
  pub fn LLVMPassManagerBuilderDispose(PMB: &'static mut PassManagerBuilder);
  pub fn LLVMPassManagerBuilderSetSizeLevel(PMB: &PassManagerBuilder, Value: Bool);
@@ -1703,7 +1705,6 @@ extern "C" {
  EmitStackSizeSection: bool)
  -> Option<&'static mut TargetMachine>;
  pub fn LLVMRustDisposeTargetMachine(T: &'static mut TargetMachine);
- pub fn LLVMRustAddAnalysisPasses(T: &'a TargetMachine, PM: &PassManager<'a>, M: &'a Module);
  pub fn LLVMRustAddBuilderLibraryInfo(PMB: &'a PassManagerBuilder,
  M: &'a Module,
  DisableSimplifyLibCalls: bool);

src/rustllvm/PassWrapper.cpp

@@ -445,17 +445,6 @@ extern "C" void LLVMRustDisposeTargetMachine(LLVMTargetMachineRef TM) {
  delete unwrap(TM);
 }
 
-// Unfortunately, LLVM doesn't expose a C API to add the corresponding analysis
-// passes for a target to a pass manager. We export that functionality through
-// this function.
-extern "C" void LLVMRustAddAnalysisPasses(LLVMTargetMachineRef TM,
- LLVMPassManagerRef PMR,
- LLVMModuleRef M) {
- PassManagerBase *PM = unwrap(PMR);
- PM->add(
- createTargetTransformInfoWrapperPass(unwrap(TM)->getTargetIRAnalysis()));
-}
-
 extern "C" void LLVMRustConfigurePassManagerBuilder(
  LLVMPassManagerBuilderRef PMBR, LLVMRustCodeGenOptLevel OptLevel,
  bool MergeFunctions, bool SLPVectorize, bool LoopVectorize, bool PrepareForThinLTO,