From 74a96b4c98434e328eeca0afc85dc7053133a7d2 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Tue, 11 May 2021 14:45:14 -0700 Subject: [PATCH] [JITLink][x86-64] Add an x86_64 PointerSize constexpr. This can be used in place of magic '8' values in generic x86-64 utilities. --- llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h | 5 ++++- llvm/lib/ExecutionEngine/JITLink/x86_64.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h b/llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h index 7d5c82e..d818234 100644 --- a/llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h +++ b/llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h @@ -336,8 +336,11 @@ inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E, return Error::success(); } +/// x86_64 pointer size. +constexpr uint64_t PointerSize = 8; + /// x86-64 null pointer content. -extern const char NullPointerContent[8]; +extern const char NullPointerContent[PointerSize]; /// x86-64 pointer jump stub content. /// diff --git a/llvm/lib/ExecutionEngine/JITLink/x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/x86_64.cpp index 50a57b2..c951ed6 100644 --- a/llvm/lib/ExecutionEngine/JITLink/x86_64.cpp +++ b/llvm/lib/ExecutionEngine/JITLink/x86_64.cpp @@ -53,8 +53,8 @@ const char *getEdgeKindName(Edge::Kind K) { } } -const char NullPointerContent[8] = {0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00}; +const char NullPointerContent[PointerSize] = {0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; const char PointerJumpStubContent[6] = { static_cast(0xFFu), 0x25, 0x00, 0x00, 0x00, 0x00}; -- 2.7.4