From d1d0b61b485798cca63c571a93cfff945859066d Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Tue, 17 Feb 2015 12:53:16 +0000
Subject: [PATCH] OrcJIT: Appease msc18 not to be confused on
executeCompileCallback<OrcX86_64>.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229494 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/ExecutionEngine/Orc/OrcTargetSupport.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp b/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp
index 44d01219607..e71fc65ce24 100644
--- a/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp
+++ b/lib/ExecutionEngine/Orc/OrcTargetSupport.cpp
@@ -52,8 +52,9 @@ const char* OrcX86_64::ResolverBlockName = "orc_resolver_block";
void OrcX86_64::insertResolverBlock(
Module &M, JITCompileCallbackManagerBase<OrcX86_64> &JCBM) {
- uint64_t CallbackAddr = static_cast<uint64_t>(
- reinterpret_cast<uintptr_t>(executeCompileCallback<OrcX86_64>));
+ auto CallbackPtr = executeCompileCallback<OrcX86_64>;
+ uint64_t CallbackAddr =
+ static_cast<uint64_t>(reinterpret_cast<uintptr_t>(CallbackPtr));
std::ostringstream AsmStream;
Triple TT(M.getTargetTriple());
--
2.34.1