Define TR_jitLookupDynamic[Public]InterfaceMethod JIT helpers

These new JIT helpers are OpenJ9-specific but unfortunately they still need to be declared here. The definition of TR_jitLookupDynamicPublicInterfaceMethod uses TR_newArray+2 instead of TR_jitLookupDynamicInterfaceMethod+1 because the latter causes s390m4check.pl to complain that there is a "line longer than 71 characters". It's difficult to add this comment inline next to the definition itself because Helpers.inc is included directly into all of the following file types: - C++ header - CPP-preprocessed assembly - m4-preprocessed assembly
eclipse · Oct 13, 2021 · 31a422d · 31a422d
1 parent 8021d57
commit 31a422d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/compiler/il/Aliases.cpp b/compiler/il/Aliases.cpp
@@ -197,6 +197,8 @@ OMR::SymbolReference::getUseonlyAliasesBV(TR::SymbolReferenceTable * symRefTab)
             case TR_newValueNoZeroInit:
             case TR_newArray:
             case TR_multiANewArray:
+            case TR_jitLookupDynamicInterfaceMethod:
+            case TR_jitLookupDynamicPublicInterfaceMethod:
             default:
                return &symRefTab->aliasBuilder.defaultMethodUseAliases();
             }
@@ -374,6 +376,8 @@ OMR::SymbolReference::getUseDefAliasesBV(bool isDirectCall, bool includeGCSafePo
             case TR_jitProfileLongValue:
             case TR_jitProfileBigDecimalValue:
             case TR_jitProfileParseBuffer:
+            case TR_jitLookupDynamicInterfaceMethod:
+            case TR_jitLookupDynamicPublicInterfaceMethod:
 
                return 0;
 

diff --git a/compiler/ras/Debug.cpp b/compiler/ras/Debug.cpp
@@ -3725,6 +3725,8 @@ TR_Debug::getRuntimeHelperName(int32_t index)
          case TR_volatileReadDouble:        return "jitVolatileReadDouble";
          case TR_volatileWriteDouble:       return "jitVolatileWriteDouble";
          case TR_referenceArrayCopy:        return "jitReferenceArrayCopy";
+         case TR_jitLookupDynamicInterfaceMethod: return "jitLookupDynamicInterfaceMethod";
+         case TR_jitLookupDynamicPublicInterfaceMethod: return "jitLookupDynamicPublicInterfaceMethod";
          }
       }
 #ifdef TR_TARGET_X86

diff --git a/compiler/runtime/Helpers.inc b/compiler/runtime/Helpers.inc
@@ -101,7 +101,9 @@ SETVAL(TR_acmpeqHelper,TR_acmpHelper)
 SETVAL(TR_acmpneHelper,TR_acmpeqHelper+1)
 SETVAL(TR_newValue,TR_acmpneHelper+1)
 SETVAL(TR_newArray,TR_newValue+1)
-SETVAL(TR_stackOverflow,TR_newArray+1)
+SETVAL(TR_jitLookupDynamicInterfaceMethod,TR_newArray+1)
+SETVAL(TR_jitLookupDynamicPublicInterfaceMethod,TR_newArray+2)
+SETVAL(TR_stackOverflow,TR_jitLookupDynamicPublicInterfaceMethod+1)
 SETVAL(TR_newInstanceImplAccessCheck, TR_stackOverflow+1)
 SETVAL(TR_jitReportInstanceFieldRead, TR_stackOverflow+2)
 SETVAL(TR_jitReportInstanceFieldWrite, TR_stackOverflow+3)