summaryrefslogtreecommitdiffstats
path: root/lib/ExecutionEngine
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-01-09 11:20:35 +0000
committerPavel Labath <labath@google.com>2017-01-09 11:20:35 +0000
commit1148d63bde1815bc85a1aa991755da84ee1cd3b4 (patch)
tree924c968a8c25ab1e2ec88c9e0013d17966f1073e /lib/ExecutionEngine
parent0f4cbb99e96180de2c70fdf9184e9faca9db5e49 (diff)
Fix MSVC build failure introduced in r291431
MSVC does not like to reinterpret_cast to a uint64_t. Use a different cast instead. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291435 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
-rw-r--r--lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
index 953d4cbe90ee..8f6b1849169a 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -917,12 +917,11 @@ bool RuntimeDyldELF::resolveAArch64ShortBranch(
return false;
const auto &SymInfo = Loc->second;
- Address = reinterpret_cast<uint64_t>(
- Sections[SymInfo.getSectionID()].getLoadAddressWithOffset(
+ Address =
+ uint64_t(Sections[SymInfo.getSectionID()].getLoadAddressWithOffset(
SymInfo.getOffset()));
} else {
- Address =
- reinterpret_cast<uint64_t>(Sections[Value.SectionID].getLoadAddress());
+ Address = uint64_t(Sections[Value.SectionID].getLoadAddress());
}
uint64_t Offset = RelI->getOffset();
uint64_t SourceAddress = Sections[SectionID].getLoadAddressWithOffset(Offset);