[llvm] 7ac7837 - [JITLink][AArch64] Rename PointerToGOT and fix typo.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2022-07-09T08:09:23-07:00
New Revision: 7ac783708037669dd9fef06d9d8ec9aac31ca949

URL: https://github.com/llvm/llvm-project/commit/7ac783708037669dd9fef06d9d8ec9aac31ca949
DIFF: https://github.com/llvm/llvm-project/commit/7ac783708037669dd9fef06d9d8ec9aac31ca949.diff

LOG: [JITLink][AArch64] Rename PointerToGOT and fix typo.

PointerToGOT lowering was accidentally changed from Delta32 to Delta64 in
db3722580335c. This patch moves it back to Delta32 and renames the generic
aarch64 edge to Delta32ToGOT to avoid the ambiguity.

No test case yet -- I haven't figured out how to write a succinct test case
(this typically appears in CIEs in eh-frames).

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/JITLink/aarch64.h
    llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
    llvm/lib/ExecutionEngine/JITLink/aarch64.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/JITLink/aarch64.h b/llvm/include/llvm/ExecutionEngine/JITLink/aarch64.h
index 7262601a7a5fd..f2c3fba7bcde9 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/aarch64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/aarch64.h
@@ -35,7 +35,7 @@ enum EdgeKind_aarch64 : Edge::Kind {
   TLVPageOffset12,
   TLSDescPage21,
   TLSDescPageOffset12,
-  PointerToGOT,
+  Delta32ToGOT,
   PairedAddend,
   LDRLiteral19,
   Delta32,
@@ -230,7 +230,7 @@ inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E) {
   case TLSDescPageOffset12:
   case GOTPage21:
   case GOTPageOffset12:
-  case PointerToGOT: {
+  case Delta32ToGOT: {
     return make_error<JITLinkError>(
         "In graph " + G.getName() + ", section " + B.getSection().getName() +
         "GOT/TLV edge kinds not lowered: " + getEdgeKindName(E.getKind()));
@@ -277,8 +277,8 @@ class GOTTableManager : public TableManager<GOTTableManager> {
              "RawInstr isn't a 64-bit LDR immediate");
       break;
     }
-    case aarch64::PointerToGOT: {
-      KindToSet = aarch64::Delta64;
+    case aarch64::Delta32ToGOT: {
+      KindToSet = aarch64::Delta32;
       break;
     }
     default:

diff  --git a/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp b/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
index dd50314d3ed75..04194318498fd 100644
--- a/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
@@ -425,7 +425,7 @@ class MachOLinkGraphBuilder_arm64 : public MachOLinkGraphBuilder {
           else
             return TargetSymbolOrErr.takeError();
 
-          Kind = aarch64::PointerToGOT;
+          Kind = aarch64::Delta32ToGOT;
           break;
         case MachODelta32:
         case MachODelta64: {

diff  --git a/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp b/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
index e486bef9fe667..9ecc71dfbb540 100644
--- a/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
@@ -52,8 +52,8 @@ const char *getEdgeKindName(Edge::Kind R) {
     return "TLSDescPage21";
   case TLSDescPageOffset12:
     return "TLSDescPageOffset12";
-  case PointerToGOT:
-    return "PointerToGOT";
+  case Delta32ToGOT:
+    return "Delta32ToGOT";
   case PairedAddend:
     return "PairedAddend";
   case LDRLiteral19: