[mlir:ExecutionEngine] Update use of getAddress now that lookup returns ExecutorAddr

River707 · River707 · commit 8bb5b657fec6 · 2022-05-05T14:24:32.000-07:00
This was changed in 16dcbb5
diff --git a/mlir/lib/ExecutionEngine/ExecutionEngine.cpp b/mlir/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -360,11 +360,9 @@ Expected<void *> ExecutionEngine::lookup(StringRef name) const {
     return makeStringError(os.str());
   }
 
-  auto rawFPtr = expectedSymbol->getAddress();
-  auto *fptr = reinterpret_cast<void *>(rawFPtr);
-  if (!fptr)
-    return makeStringError("looked up function is null");
-  return fptr;
+  if (void *fptr = expectedSymbol->toPtr<void *>())
+    return fptr;
+  return makeStringError("looked up function is null");
 }
 
 Error ExecutionEngine::invokePacked(StringRef name,

Original file line number	Diff line number	Diff line change
`@@ -360,11 +360,9 @@ Expected<void *> ExecutionEngine::lookup(StringRef name) const {`
`360`	`360`	`return makeStringError(os.str());`
`361`	`361`	`}`
`362`	`362`
`363`		`- auto rawFPtr = expectedSymbol->getAddress();`
`364`		`- auto fptr = reinterpret_cast<void >(rawFPtr);`
`365`		`- if (!fptr)`
`366`		`- return makeStringError("looked up function is null");`
`367`		`- return fptr;`
	`363`	`+ if (void fptr = expectedSymbol->toPtr<void >())`
	`364`	`+ return fptr;`
	`365`	`+ return makeStringError("looked up function is null");`
`368`	`366`	`}`
`369`	`367`
`370`	`368`	`Error ExecutionEngine::invokePacked(StringRef name,`