Merge commit 'f22c9ddb36dc' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit c16562f7b7a9 · 2024-10-29T11:12:48.000-07:00
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/RedirectionManager.h b/llvm/include/llvm/ExecutionEngine/Orc/RedirectionManager.h
@@ -32,8 +32,8 @@ class RedirectionManager {
 
   /// Change the redirection destination of given symbol to new destination
   /// symbol.
-  virtual Error redirect(JITDylib &JD, SymbolStringPtr Symbol,
-                         ExecutorSymbolDef NewDest) {
+  Error redirect(JITDylib &JD, SymbolStringPtr Symbol,
+                 ExecutorSymbolDef NewDest) {
     return redirect(JD, {{Symbol, NewDest}});
   }
 

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ class RedirectionManager {`
`32`	`32`
`33`	`33`	`/// Change the redirection destination of given symbol to new destination`
`34`	`34`	`/// symbol.`
`35`		`- virtual Error redirect(JITDylib &JD, SymbolStringPtr Symbol,`
`36`		`- ExecutorSymbolDef NewDest) {`
	`35`	`+ Error redirect(JITDylib &JD, SymbolStringPtr Symbol,`
	`36`	`+ ExecutorSymbolDef NewDest) {`
`37`	`37`	`return redirect(JD, {{Symbol, NewDest}});`
`38`	`38`	`}`
`39`	`39`