Merge commit '35f5caea5115' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 12aca77841ed · 2024-03-13T10:16:42.000-07:00
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp
@@ -87,7 +87,7 @@ static void registerJITLoaderVTuneUnregisterImpl(
   for (auto &Method : UM) {
     JITEventWrapper::Wrapper->iJIT_NotifyEvent(
         iJVM_EVENT_TYPE_METHOD_UNLOAD_START,
-        const_cast<unsigned long *>(&Method.first));
+        const_cast<uint64_t *>(&Method.first));
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ static void registerJITLoaderVTuneUnregisterImpl(`
`87`	`87`	`for (auto &Method : UM) {`
`88`	`88`	`JITEventWrapper::Wrapper->iJIT_NotifyEvent(`
`89`	`89`	`iJVM_EVENT_TYPE_METHOD_UNLOAD_START,`
`90`		`- const_cast<unsigned long *>(&Method.first));`
	`90`	`+ const_cast<uint64_t *>(&Method.first));`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`