[llvm] 74a96b4 - [JITLink][x86-64] Add an x86_64 PointerSize constexpr.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2021-05-11T15:26:15-07:00
New Revision: 74a96b4c98434e328eeca0afc85dc7053133a7d2

URL: https://github.com/llvm/llvm-project/commit/74a96b4c98434e328eeca0afc85dc7053133a7d2
DIFF: https://github.com/llvm/llvm-project/commit/74a96b4c98434e328eeca0afc85dc7053133a7d2.diff

LOG: [JITLink][x86-64] Add an x86_64 PointerSize constexpr.

This can be used in place of magic '8' values in generic x86-64 utilities.

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h
    llvm/lib/ExecutionEngine/JITLink/x86_64.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h b/llvm/include/llvm/ExecutionEngine/JITLink/x86_64.h
index 7d5c82ef68996..d818234b29467 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 50a57b2b3f203..c951ed6d95beb 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<char>(0xFFu), 0x25, 0x00, 0x00, 0x00, 0x00};