Rollup merge of #123102 - durin42:llvm-19-pass-ptr, r=workingjubilee

matthiaskrgr · web-flow · commit fc51dbd379ec · 2024-03-27T05:21:17.000+01:00
RustWrapper: update call for llvm/llvm-project@44d037cc258dcf179d2c48… …c93996bb406ecd0fae Easy change. `@rustbot` label: +llvm-main
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -1992,7 +1992,11 @@ extern "C" void LLVMRustContextConfigureDiagnosticHandler(
         }
       }
       if (DiagnosticHandlerCallback) {
+#if LLVM_VERSION_GE(19, 0)
+        DiagnosticHandlerCallback(&DI, DiagnosticHandlerContext);
+#else
         DiagnosticHandlerCallback(DI, DiagnosticHandlerContext);
+#endif
         return true;
       }
       return false;

Original file line number	Diff line number	Diff line change
`@@ -1992,7 +1992,11 @@ extern "C" void LLVMRustContextConfigureDiagnosticHandler(`
`1992`	`1992`	`}`
`1993`	`1993`	`}`
`1994`	`1994`	`if (DiagnosticHandlerCallback) {`
	`1995`	`+#if LLVM_VERSION_GE(19, 0)`
	`1996`	`+ DiagnosticHandlerCallback(&DI, DiagnosticHandlerContext);`
	`1997`	`+#else`
`1995`	`1998`	`DiagnosticHandlerCallback(DI, DiagnosticHandlerContext);`
	`1999`	`+#endif`
`1996`	`2000`	`return true;`
`1997`	`2001`	`}`
`1998`	`2002`	`return false;`