Rollup merge of #140534 - erickt:llvm-21, r=cuviper

matthiaskrgr · web-flow · commit 9ff74555518b · 2025-05-03T08:45:02.000+02:00
PassWrapper: adapt for llvm/llvm-project@f137c3d592e96330e450a8fd63ef… …7e8877fc1908 In LLVM 21 PR llvm/llvm-project#130940 `TargetRegistry::createTargetMachine` was changed to take a `const Triple&` and has deprecated the old `StringRef` method. ``@rustbot`` label llvm-main
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
@@ -512,8 +512,13 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
 #endif
   }
 
+#if LLVM_VERSION_GE(21, 0)
+  TargetMachine *TM = TheTarget->createTargetMachine(Trip, CPU, Feature,
+                                                     Options, RM, CM, OptLevel);
+#else
   TargetMachine *TM = TheTarget->createTargetMachine(
       Trip.getTriple(), CPU, Feature, Options, RM, CM, OptLevel);
+#endif
   return wrap(TM);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -512,8 +512,13 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(`
`512`	`512`	`#endif`
`513`	`513`	`}`
`514`	`514`
	`515`	`+#if LLVM_VERSION_GE(21, 0)`
	`516`	`+ TargetMachine *TM = TheTarget->createTargetMachine(Trip, CPU, Feature,`
	`517`	`+ Options, RM, CM, OptLevel);`
	`518`	`+#else`
`515`	`519`	`TargetMachine *TM = TheTarget->createTargetMachine(`
`516`	`520`	`Trip.getTriple(), CPU, Feature, Options, RM, CM, OptLevel);`
	`521`	`+#endif`
`517`	`522`	`return wrap(TM);`
`518`	`523`	`}`
`519`	`524`