Skip to content

Commit a9d4fef

Browse files
babsinghfengxue-IS
babsingh
and
fengxue-IS
committed
Update native dependencies to use MethodHandleHelper
The names of the following Java native methods are updated in native code since they are moved from the MethodHandle to MethodHandleHelper class: - getCPTypeAt - getCPMethodTypeAt - getCPMethodHandleAt - getCPClassNameAt - getCPConstantDynamicAt The names of the following Java methods, which are invoked from native code, are updated since they are moved from the MethodHandle to MethodHandleHelper class: - sendResolveMethodHandle - resolveInvokeDynamic - resolveConstantDynamic - constructorPlaceHolder The above MethodHandleHelper Java methods will be used in both OpenJ9 and OpenJDK JSR292 implementations. Related: #7352 Co-authored-by: Jack Lu <Jack.S.Lu@ibm.com> Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
1 parent b301f8d commit a9d4fef

10 files changed

+42
-44
lines changed

‎runtime/jcl/common/java_dyn_methodhandle.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
/*
4343
* Note that the following native methods are implemented in sun_reflect_ConstantPool.c because
4444
* they effectively extend the ConstantPool API and require functionality from that module:
45-
* Java_java_lang_invoke_MethodHandle_getCPTypeAt
46-
* Java_java_lang_invoke_MethodHandle_getCPMethodTypeAt
47-
* Java_java_lang_invoke_MethodHandle_getCPMethodHandleAt
48-
* Java_java_lang_invoke_MethodHandle_getCPConstantDynamicAt
45+
* Java_java_lang_invoke_MethodHandleHelper_getCPTypeAt
46+
* Java_java_lang_invoke_MethodHandleHelper_getCPMethodTypeAt
47+
* Java_java_lang_invoke_MethodHandleHelper_getCPMethodHandleAt
48+
* Java_java_lang_invoke_MethodHandleHelper_getCPConstantDynamicAt
4949
*/
5050

5151
static VMINLINE UDATA lookupImpl(J9VMThread *currentThread, J9Class *lookupClass, J9UTF8 *name, J9UTF8 *signature, J9Class *senderClass, UDATA options, BOOLEAN *foundDefaultConflicts);

‎runtime/jcl/common/sun_reflect_ConstantPool.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ Java_sun_reflect_ConstantPool_getFieldAtIfLoaded0(JNIEnv *env, jobject unusedObj
481481
* @throws IllegalArgumentException if cpIndex has wrong type
482482
*/
483483
jobject JNICALL
484-
Java_java_lang_invoke_MethodHandle_getCPClassNameAt(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex)
484+
Java_java_lang_invoke_MethodHandleHelper_getCPClassNameAt(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex)
485485
{
486486
jobject classNameObject = NULL;
487487
J9VMThread *vmThread = (J9VMThread *) env;
@@ -668,7 +668,7 @@ Java_sun_reflect_ConstantPool_getUTF8At0(JNIEnv *env, jobject unusedObject, jobj
668668
* Return the result of J9_CP_TYPE(J9Class->romClass->cpShapeDescription, index)
669669
*/
670670
jint JNICALL
671-
Java_java_lang_invoke_MethodHandle_getCPTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
671+
Java_java_lang_invoke_MethodHandleHelper_getCPTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
672672
{
673673
UDATA cpType = J9CPTYPE_UNUSED;
674674
J9VMThread *vmThread = (J9VMThread *) env;
@@ -701,7 +701,7 @@ Java_java_lang_invoke_MethodHandle_getCPTypeAt(JNIEnv *env, jclass unusedClass,
701701
* equivalent for MethodType.
702702
*/
703703
jobject JNICALL
704-
Java_java_lang_invoke_MethodHandle_getCPMethodTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
704+
Java_java_lang_invoke_MethodHandleHelper_getCPMethodTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
705705
{
706706
jobject returnValue = NULL;
707707
J9VMThread *vmThread = (J9VMThread *) env;
@@ -736,7 +736,7 @@ Java_java_lang_invoke_MethodHandle_getCPMethodTypeAt(JNIEnv *env, jclass unusedC
736736
* equivalent for MethodHandle.
737737
*/
738738
jobject JNICALL
739-
Java_java_lang_invoke_MethodHandle_getCPMethodHandleAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
739+
Java_java_lang_invoke_MethodHandleHelper_getCPMethodHandleAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
740740
{
741741
jobject returnValue = NULL;
742742
J9VMThread *vmThread = (J9VMThread *) env;
@@ -770,7 +770,7 @@ Java_java_lang_invoke_MethodHandle_getCPMethodHandleAt(JNIEnv *env, jclass unuse
770770
}
771771

772772
jobject JNICALL
773-
Java_java_lang_invoke_MethodHandle_getCPConstantDynamicAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
773+
Java_java_lang_invoke_MethodHandleHelper_getCPConstantDynamicAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex)
774774
{
775775
jobject returnValue = NULL;
776776
J9VMThread *vmThread = (J9VMThread *) env;

‎runtime/jcl/exports.cmake

+5-5
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,10 @@ omr_add_exports(jclse
362362
Java_java_lang_Thread_suspendImpl
363363
Java_java_lang_Thread_yield
364364
Java_java_lang_invoke_InterfaceHandle_registerNatives
365-
Java_java_lang_invoke_MethodHandle_getCPClassNameAt
366-
Java_java_lang_invoke_MethodHandle_getCPMethodHandleAt
367-
Java_java_lang_invoke_MethodHandle_getCPMethodTypeAt
368-
Java_java_lang_invoke_MethodHandle_getCPTypeAt
365+
Java_java_lang_invoke_MethodHandleHelper_getCPClassNameAt
366+
Java_java_lang_invoke_MethodHandleHelper_getCPMethodHandleAt
367+
Java_java_lang_invoke_MethodHandleHelper_getCPMethodTypeAt
368+
Java_java_lang_invoke_MethodHandleHelper_getCPTypeAt
369369
Java_java_lang_invoke_MethodHandle_invoke
370370
Java_java_lang_invoke_MethodHandle_invokeExact
371371
Java_java_lang_invoke_MethodHandle_requestCustomThunkFromJit
@@ -574,7 +574,7 @@ if(NOT JAVA_SPEC_VERSION LESS 11)
574574
omr_add_exports(jclse
575575
Java_java_lang_Class_getNestHostImpl
576576
Java_java_lang_Class_getNestMembersImpl
577-
Java_java_lang_invoke_MethodHandle_getCPConstantDynamicAt
577+
Java_java_lang_invoke_MethodHandleHelper_getCPConstantDynamicAt
578578
)
579579
endif()
580580

‎runtime/jcl/uma/se11_exports.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2018, 2018 IBM Corp. and others
2+
Copyright (c) 2018, 2020 IBM Corp. and others
33
44
This program and the accompanying materials are made available under
55
the terms of the Eclipse Public License 2.0 which accompanies this
@@ -22,5 +22,5 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
2222
<exports group="se11">
2323
<export name="Java_java_lang_Class_getNestHostImpl"/>
2424
<export name="Java_java_lang_Class_getNestMembersImpl"/>
25-
<export name="Java_java_lang_invoke_MethodHandle_getCPConstantDynamicAt"/>
25+
<export name="Java_java_lang_invoke_MethodHandleHelper_getCPConstantDynamicAt"/>
2626
</exports>

‎runtime/jcl/uma/se7_exports.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2007, 2019 IBM Corp. and others
2+
Copyright (c) 2007, 2020 IBM Corp. and others
33
44
This program and the accompanying materials are made available under
55
the terms of the Eclipse Public License 2.0 which accompanies this
@@ -54,10 +54,10 @@
5454
<export name="Java_java_lang_invoke_MethodHandle_vmRefFieldOffset" />
5555
<export name="Java_java_lang_invoke_MethodHandle_invoke" />
5656
<export name="Java_java_lang_invoke_MethodHandle_invokeExact" />
57-
<export name="Java_java_lang_invoke_MethodHandle_getCPTypeAt" />
58-
<export name="Java_java_lang_invoke_MethodHandle_getCPMethodTypeAt" />
59-
<export name="Java_java_lang_invoke_MethodHandle_getCPMethodHandleAt" />
60-
<export name="Java_java_lang_invoke_MethodHandle_getCPClassNameAt" />
57+
<export name="Java_java_lang_invoke_MethodHandleHelper_getCPTypeAt" />
58+
<export name="Java_java_lang_invoke_MethodHandleHelper_getCPMethodTypeAt" />
59+
<export name="Java_java_lang_invoke_MethodHandleHelper_getCPMethodHandleAt" />
60+
<export name="Java_java_lang_invoke_MethodHandleHelper_getCPClassNameAt" />
6161
<export name="Java_java_lang_invoke_ThunkTuple_registerNatives" />
6262
<export name="Java_java_lang_invoke_InterfaceHandle_registerNatives" />
6363
<export name="Java_java_lang_invoke_MethodType_makeTenured" />

‎runtime/oti/jclprots.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1009,11 +1009,11 @@ jfloat JNICALL Java_sun_reflect_ConstantPool_getFloatAt0(JNIEnv *env, jobject un
10091009
jdouble JNICALL Java_sun_reflect_ConstantPool_getDoubleAt0(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
10101010
jobject JNICALL Java_sun_reflect_ConstantPool_getStringAt0(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
10111011
jobject JNICALL Java_sun_reflect_ConstantPool_getUTF8At0(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
1012-
jint JNICALL Java_java_lang_invoke_MethodHandle_getCPTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1013-
jobject JNICALL Java_java_lang_invoke_MethodHandle_getCPMethodTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1014-
jobject JNICALL Java_java_lang_invoke_MethodHandle_getCPMethodHandleAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1015-
jobject JNICALL Java_java_lang_invoke_MethodHandle_getCPClassNameAt(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
1016-
jobject JNICALL Java_java_lang_invoke_MethodHandle_getCPConstantDynamicAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1012+
jint JNICALL Java_java_lang_invoke_MethodHandleHelper_getCPTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1013+
jobject JNICALL Java_java_lang_invoke_MethodHandleHelper_getCPMethodTypeAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1014+
jobject JNICALL Java_java_lang_invoke_MethodHandleHelper_getCPMethodHandleAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
1015+
jobject JNICALL Java_java_lang_invoke_MethodHandleHelper_getCPClassNameAt(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
1016+
jobject JNICALL Java_java_lang_invoke_MethodHandleHelper_getCPConstantDynamicAt(JNIEnv *env, jclass unusedClass, jobject constantPoolOop, jint cpIndex);
10171017
jint JNICALL Java_jdk_internal_reflect_ConstantPool_getClassRefIndexAt0(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
10181018
jint JNICALL Java_jdk_internal_reflect_ConstantPool_getNameAndTypeRefIndexAt0(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);
10191019
jobject JNICALL Java_jdk_internal_reflect_ConstantPool_getNameAndTypeRefInfoAt0(JNIEnv *env, jobject unusedObject, jobject constantPoolOop, jint cpIndex);

‎runtime/oti/vmconstantpool.xml

+7-9
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
133133
<classref name="java/lang/invoke/MethodType" flags="opt_methodHandleCommon"/>
134134
<classref name="java/lang/invoke/MethodHandle" flags="opt_methodHandleCommon"/>
135135
<classref name="java/lang/invoke/WrongMethodTypeException" flags="opt_methodHandleCommon"/>
136+
<classref name="java/lang/invoke/MethodHandleHelper" flags="opt_methodHandleCommon"/>
136137

137138
<!-- Class references needed to support OpenJDK MethodHandles. -->
138139
<classref name="java/lang/invoke/MemberName" flags="opt_openjdkMethodhandle"/>
139140
<classref name="java/lang/invoke/MethodTypeHelper" flags="opt_openjdkMethodhandle"/>
140141
<classref name="java/lang/invoke/MethodTypeForm" flags="opt_openjdkMethodhandle"/>
141142
<classref name="java/lang/invoke/LambdaForm" flags="opt_openjdkMethodhandle"/>
142-
<classref name="java/lang/invoke/MethodHandleHelper" flags="opt_openjdkMethodhandle"/>
143143

144144
<!--
145145
NOTE: the resolution code in jclcinit.c only looks at the J9ROMClassRef->runtimeFlags to determine
@@ -390,11 +390,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
390390
<staticmethodref class="java/lang/J9VMInternals" name="newInstanceImpl" signature="(Ljava/lang/Class;)Ljava/lang/Object;" flags="jit_newInstancePrototype"/>
391391
<staticmethodref class="java/lang/J9VMInternals" name="formatNoSuchMethod" signature="(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/String;"/>
392392
<staticmethodref class="java/lang/invoke/MethodType" name="vmResolveFromMethodDescriptorString" signature="(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/lang/Class;)Ljava/lang/invoke/MethodType;" flags="opt_methodHandle"/>
393-
<staticmethodref class="java/lang/invoke/MethodHandle" name="sendResolveMethodHandle" signature="(ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandle"/>
394-
<staticmethodref class="java/lang/invoke/MethodHandle" name="resolveInvokeDynamic" signature="(JLjava/lang/String;Ljava/lang/String;J)Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandle"/>
395-
<staticmethodref class="java/lang/invoke/MethodHandle" name="resolveConstantDynamic" signature="(JLjava/lang/String;Ljava/lang/String;J)Ljava/lang/Object;" versions="11-" flag="opt_methodHandle"/>
396393
<staticmethodref class="java/lang/invoke/MethodHandle" name="invokeWithArgumentsHelper" signature="(Ljava/lang/invoke/MethodHandle;[Ljava/lang/Object;)Ljava/lang/Object;" flags="opt_methodHandle"/>
397-
<staticmethodref class="java/lang/invoke/MethodHandle" name="constructorPlaceHolder" signature="(Ljava/lang/Object;)Ljava/lang/Object;" flags="opt_methodHandle"/>
398394
<specialmethodref class="java/lang/invoke/MethodHandle" name="forGenericInvoke" signature="(Ljava/lang/invoke/MethodType;Z)Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandle"/>
399395
<specialmethodref class="java/lang/invoke/MethodHandle" name="returnFilterPlaceHolder" signature="()Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandle"/>
400396
<specialmethodref class="java/lang/invoke/MethodHandle" name="foldHandlePlaceHolder" signature="()Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandle"/>
@@ -411,13 +407,15 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
411407
<staticmethodref class="java/lang/J9VMInternals" name="initializationAlreadyFailed" signature="(Ljava/lang/Class;)V"/>
412408
<staticmethodref class="java/lang/J9VMInternals" name="recordInitializationFailure" signature="(Ljava/lang/Class;Ljava/lang/Throwable;)V"/>
413409

410+
<!-- Static method references needed to support OpenJ9 and OpenJDK MethodHandles. -->
411+
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="sendResolveMethodHandle" signature="(ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandleCommon"/>
412+
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="resolveInvokeDynamic" signature="(JLjava/lang/String;Ljava/lang/String;J)Ljava/lang/invoke/MethodHandle;" flags="opt_methodHandleCommon"/>
413+
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="resolveConstantDynamic" signature="(JLjava/lang/String;Ljava/lang/String;J)Ljava/lang/Object;" versions="11-" flag="opt_methodHandleCommon"/>
414+
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="constructorPlaceHolder" signature="(Ljava/lang/Object;)Ljava/lang/Object;" flags="opt_methodHandleCommon"/>
415+
414416
<!-- Static method references needed to support OpenJDK MethodHandles. -->
415417
<staticmethodref class="java/lang/invoke/MethodTypeHelper" name="vmResolveFromMethodDescriptorString" signature="(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/lang/Class;)Ljava/lang/invoke/MethodType;" flags="opt_openjdkMethodhandle"/>
416-
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="sendResolveMethodHandle" signature="(ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/invoke/MethodHandle;" flags="opt_openjdkMethodhandle"/>
417418
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="resolveMethodHandle" signature="(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;" flags="opt_openjdkMethodhandle"/>
418-
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="resolveInvokeDynamic" signature="(JLjava/lang/String;Ljava/lang/String;J)Ljava/lang/Object;" flags="opt_openjdkMethodhandle"/>
419-
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="resolveConstantDynamic" signature="(JLjava/lang/String;Ljava/lang/String;J)Ljava/lang/Object;" versions="11-" flag="opt_openjdkMethodhandle"/>
420-
<staticmethodref class="java/lang/invoke/MethodHandleHelper" name="constructorPlaceHolder" signature="(Ljava/lang/Object;)Ljava/lang/Object;" flags="opt_openjdkMethodhandle"/>
421419

422420
<!-- Security manager check -->
423421
<staticfieldref class="java/lang/System" name="security" signature="Ljava/lang/SecurityManager;"/>

‎runtime/vm/FastJNI_java_lang_invoke_MethodHandle.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2001, 2014 IBM Corp. and others
2+
* Copyright (c) 2001, 2020 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -34,7 +34,7 @@ extern "C" {
3434
* See the JNI version in sun_reflect_ConstantPool.c
3535
*/
3636
jint JNICALL
37-
Fast_java_lang_invoke_MethodHandle_getCPTypeAt(J9VMThread *vmThread, j9object_t constantPoolOop, jint cpIndex)
37+
Fast_java_lang_invoke_MethodHandleHelper_getCPTypeAt(J9VMThread *vmThread, j9object_t constantPoolOop, jint cpIndex)
3838
{
3939
UDATA cpType = J9CPTYPE_UNUSED;
4040

@@ -55,7 +55,7 @@ Fast_java_lang_invoke_MethodHandle_getCPTypeAt(J9VMThread *vmThread, j9object_t
5555
}
5656

5757
J9_FAST_JNI_METHOD_TABLE(java_lang_invoke_MethodHandle)
58-
J9_FAST_JNI_METHOD("getCPTypeAt", "(Ljava/lang/Class;I)I", Fast_java_lang_invoke_MethodHandle_getCPTypeAt,
58+
J9_FAST_JNI_METHOD("getCPTypeAt", "(Ljava/lang/Class;I)I", Fast_java_lang_invoke_MethodHandleHelper_getCPTypeAt,
5959
J9_FAST_JNI_RETAIN_VM_ACCESS | J9_FAST_JNI_DO_NOT_WRAP_OBJECTS | J9_FAST_JNI_DO_NOT_PASS_RECEIVER)
6060
J9_FAST_JNI_METHOD_TABLE_END
6161

‎runtime/vm/MHInterpreter.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ VM_MHInterpreter::dispatchLoop(j9object_t methodHandle)
402402
}
403403
restoreMethodTypeFrame(frame, spPriorToFrameBuild);
404404
}
405-
insertPlaceHolderFrame(slotCount, newObject, J9VMJAVALANGINVOKEMETHODHANDLE_CONSTRUCTORPLACEHOLDER_METHOD(_vm));
405+
insertPlaceHolderFrame(slotCount, newObject, J9VMJAVALANGINVOKEMETHODHANDLEHELPER_CONSTRUCTORPLACEHOLDER_METHOD(_vm));
406406
goto runMethod;
407407
}
408408
case J9_METHOD_HANDLE_KIND_GET_FIELD: {
@@ -676,7 +676,7 @@ VM_MHInterpreter::impdep1()
676676
/* NOTE: bp calculation assumes that there is only ever a single argument on the stack */
677677
UDATA *bp = _currentThread->arg0EA - (sizeof(J9SFStackFrame)/sizeof(UDATA*));
678678
J9SFStackFrame *frame = (J9SFStackFrame*)(bp);
679-
if (J9VMJAVALANGINVOKEMETHODHANDLE_CONSTRUCTORPLACEHOLDER_METHOD(_vm) == _currentThread->literals) {
679+
if (J9VMJAVALANGINVOKEMETHODHANDLEHELPER_CONSTRUCTORPLACEHOLDER_METHOD(_vm) == _currentThread->literals) {
680680
/* restore frame for constructor: leave objectRef on stack & increment PC */
681681
_currentThread->sp = _currentThread->arg0EA;
682682
_currentThread->literals = frame->savedCP;

‎runtime/vm/callin.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2012, 2019 IBM Corp. and others
2+
* Copyright (c) 2012, 2020 IBM Corp. and others
33
*
44
* This program and the accompanying materials are made available under
55
* the terms of the Eclipse Public License 2.0 which accompanies this
@@ -915,7 +915,7 @@ sendResolveMethodHandle(J9VMThread *currentThread, UDATA cpIndex, J9ConstantPool
915915
*--currentThread->sp = (UDATA)sigString;
916916
*--currentThread->sp = (UDATA)clazz->classLoader->classLoaderObject;
917917
currentThread->returnValue = J9_BCLOOP_RUN_METHOD;
918-
currentThread->returnValue2 = (UDATA)J9VMJAVALANGINVOKEMETHODHANDLE_SENDRESOLVEMETHODHANDLE_METHOD(vm);
918+
currentThread->returnValue2 = (UDATA)J9VMJAVALANGINVOKEMETHODHANDLEHELPER_SENDRESOLVEMETHODHANDLE_METHOD(vm);
919919
c_cInterpreter(currentThread);
920920
}
921921
}
@@ -980,7 +980,7 @@ sendResolveConstantDynamic(J9VMThread *currentThread, J9ConstantPool *ramCP, UDA
980980
currentThread->sp -= 2;
981981
*(U_64*)currentThread->sp = (U_64)(UDATA)bsmData;
982982
currentThread->returnValue = J9_BCLOOP_RUN_METHOD;
983-
currentThread->returnValue2 = (UDATA)J9VMJAVALANGINVOKEMETHODHANDLE_RESOLVECONSTANTDYNAMIC_METHOD(vm);
983+
currentThread->returnValue2 = (UDATA)J9VMJAVALANGINVOKEMETHODHANDLEHELPER_RESOLVECONSTANTDYNAMIC_METHOD(vm);
984984
c_cInterpreter(currentThread);
985985
}
986986
}
@@ -1025,7 +1025,7 @@ sendResolveInvokeDynamic(J9VMThread *currentThread, J9ConstantPool *ramCP, UDATA
10251025
currentThread->sp -= 2;
10261026
*(U_64*)currentThread->sp = (U_64)(UDATA)bsmData;
10271027
currentThread->returnValue = J9_BCLOOP_RUN_METHOD;
1028-
currentThread->returnValue2 = (UDATA)J9VMJAVALANGINVOKEMETHODHANDLE_RESOLVEINVOKEDYNAMIC_METHOD(vm);
1028+
currentThread->returnValue2 = (UDATA)J9VMJAVALANGINVOKEMETHODHANDLEHELPER_RESOLVEINVOKEDYNAMIC_METHOD(vm);
10291029
c_cInterpreter(currentThread);
10301030
}
10311031
}

0 commit comments

Comments
 (0)