Merge pull request #6330 from eclipse/revert-6326-jniRelo

Revert "Update JNI Target relocation record to have offset to the reloLocation."
eclipse · Feb 3, 2022 · e02c8de · e02c8de
2 parents 9484ecf + 6a10ccb
commit e02c8de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 72 deletions.
diff --git a/compiler/x/codegen/X86BinaryEncoding.cpp b/compiler/x/codegen/X86BinaryEncoding.cpp
@@ -1094,27 +1094,10 @@ TR::X86ImmSymInstruction::addMetaDataForCodeAddress(uint8_t *cursor)
                   int rType = methodSym->getMethodKind()-1;  //method kinds are 1-based
                   TR_ASSERT(reloTypes[rType], "There shouldn't be direct JNI interface calls!");
 
-                  uint8_t *startOfInstruction = self()->getBinaryEncoding();
-                  uint8_t *startOfImmediate = cursor;
-                  intptr_t diff = reinterpret_cast<intptr_t>(startOfImmediate) - reinterpret_cast<intptr_t>(startOfInstruction);
-                  TR_ASSERT_FATAL(diff > 0, "Address of immediate %p less than address of instruction %p\n",
-                                  startOfImmediate, startOfInstruction);
-
-                  TR_RelocationRecordInformation *info =
-                     reinterpret_cast<TR_RelocationRecordInformation *>(
-                        comp->trMemory()->allocateHeapMemory(sizeof(TR_RelocationRecordInformation)));
-                  info->data1 = static_cast<uintptr_t>(diff);
-                  info->data2 = reinterpret_cast<uintptr_t>(getNode()->getSymbolReference());
-                  int16_t inlinedSiteIndex = getNode() ? getNode()->getInlinedSiteIndex() : -1;
-                  info->data3 = static_cast<uintptr_t>(inlinedSiteIndex);
-
-                  cg()->addExternalRelocation(
-                     new (cg()->trHeapMemory()) TR::ExternalRelocation(
-                                                   startOfInstruction,
-                                                   reinterpret_cast<uint8_t *>(info),
-                                                   static_cast<TR_ExternalRelocationTargetKind>(reloTypes[rType]),
-                                                   cg()),
-                     __FILE__, __LINE__, getNode());
+                  cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(cursor, (uint8_t *)getNode()->getSymbolReference(),
+                        getNode() ? (uint8_t *)(intptr_t)getNode()->getInlinedSiteIndex() : (uint8_t *)-1,
+                        (TR_ExternalRelocationTargetKind) reloTypes [rType], cg()),
+                        __FILE__, __LINE__, getNode());
                   }
                else if (resolvedMethod)
                   {
@@ -2784,46 +2767,13 @@ TR::AMD64RegImm64Instruction::addMetaDataForCodeAddress(uint8_t *cursor)
                                          __FILE__, __LINE__, getNode());
                   }
                break;
-            case TR_StaticRamMethodConst:
-            case TR_VirtualRamMethodConst:
-            case TR_SpecialRamMethodConst:
-               cg()->addExternalRelocation(
-                  new (cg()->trHeapMemory()) TR::ExternalRelocation(
-                                                cursor,
-                                                (uint8_t *) getNode()->getSymbolReference(),
-                                                getNode()
-                                                   ? (uint8_t *)(intptr_t)getNode()->getInlinedSiteIndex()
-                                                   : (uint8_t *)-1,
-                                                (TR_ExternalRelocationTargetKind) _reloKind,
-                                                cg()),
-                     __FILE__,__LINE__, getNode());
-               break;
             case TR_JNIStaticTargetAddress:
             case TR_JNISpecialTargetAddress:
             case TR_JNIVirtualTargetAddress:
-               {
-               uint8_t *startOfInstruction = self()->getBinaryEncoding();
-               uint8_t *startOfImmediate = cursor;
-               intptr_t diff = reinterpret_cast<intptr_t>(startOfImmediate) - reinterpret_cast<intptr_t>(startOfInstruction);
-               TR_ASSERT_FATAL(diff > 0, "Address of immediate %p less than address of instruction %p\n",
-                               startOfImmediate, startOfInstruction);
-
-               TR_RelocationRecordInformation *info =
-                  reinterpret_cast<TR_RelocationRecordInformation *>(
-                     comp->trMemory()->allocateHeapMemory(sizeof(TR_RelocationRecordInformation)));
-               info->data1 = static_cast<uintptr_t>(diff);
-               info->data2 = reinterpret_cast<uintptr_t>(getNode()->getSymbolReference());
-               int16_t inlinedSiteIndex = getNode() ? getNode()->getInlinedSiteIndex() : -1;
-               info->data3 = static_cast<uintptr_t>(inlinedSiteIndex);
-
-               cg()->addExternalRelocation(
-                  new (cg()->trHeapMemory()) TR::ExternalRelocation(
-                                                startOfInstruction,
-                                                reinterpret_cast<uint8_t *>(info),
-                                                static_cast<TR_ExternalRelocationTargetKind>(_reloKind),
-                                                cg()),
-                     __FILE__,__LINE__, getNode());
-               }
+            case TR_StaticRamMethodConst:
+            case TR_VirtualRamMethodConst:
+            case TR_SpecialRamMethodConst:
+               cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(cursor, (uint8_t *) getNode()->getSymbolReference(), getNode() ? (uint8_t *)(intptr_t)getNode()->getInlinedSiteIndex() : (uint8_t *)-1,  (TR_ExternalRelocationTargetKind) _reloKind, cg()),  __FILE__,__LINE__, getNode());
                break;
             }
          }

diff --git a/compiler/z/codegen/ConstantDataSnippet.cpp b/compiler/z/codegen/ConstantDataSnippet.cpp
@@ -135,20 +135,10 @@ TR::S390ConstantDataSnippet::addMetaDataForCodeAddress(uint8_t *cursor)
       case TR_JNIVirtualTargetAddress:
          {
          AOTcgDiag3(comp, "add relocation (%d) cursor=%x symbolReference=%x\n", reloType, cursor, getSymbolReference());
-
-         TR_RelocationRecordInformation *info = new (comp->trHeapMemory()) TR_RelocationRecordInformation();
-         info->data1 = 0;
-         info->data2 = reinterpret_cast<uintptr_t>(getNode()->getSymbolReference());
-         int16_t inlinedSiteIndex = getNode() ? getNode()->getInlinedSiteIndex() : -1;
-         info->data3 = static_cast<uintptr_t>(inlinedSiteIndex);
-
-         cg()->addExternalRelocation(
-            new (cg()->trHeapMemory()) TR::ExternalRelocation(
-               cursor,
-               reinterpret_cast<uint8_t *>(info),
-               static_cast<TR_ExternalRelocationTargetKind>(reloType),
-               cg()),
-            __FILE__, __LINE__, getNode());
+         cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(cursor, (uint8_t *)getNode()->getSymbolReference(),
+                  getNode() ? (uint8_t *)(intptr_t)getNode()->getInlinedSiteIndex() : (uint8_t *)-1,
+                        (TR_ExternalRelocationTargetKind) reloType, cg()),
+                        __FILE__, __LINE__, getNode());
          }
          break;