Skip to content

Commit 2d49126

Browse files
committed
Update debugAgentRun to work with JDK11
1 parent 4dd9cd0 commit 2d49126

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

runtime/jcl/common/jithelpers.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,8 @@ Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject m
477477
jmethodID java_util_HashSet_size = (*env)->GetMethodID(env, java_util_HashSet, "size", "()I");
478478
jmethodID java_util_HashSet_toArray = (*env)->GetMethodID(env, java_util_HashSet, "toArray", "()[Ljava/lang/Object;");
479479

480-
jclass sun_reflect_MethodAccessor = (*env)->FindClass(env, "sun/reflect/MethodAccessor");
481-
jmethodID sun_reflect_MethodAccessor_invoke = (*env)->GetMethodID(env, sun_reflect_MethodAccessor, "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;");
480+
jclass jdk_internal_reflect_MethodAccessor = (*env)->FindClass(env, "jdk/internal/reflect/MethodAccessor");
481+
jmethodID jdk_internal_reflect_MethodAccessor_invoke = (*env)->GetMethodID(env, jdk_internal_reflect_MethodAccessor, "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;");
482482

483483
jclass java_lang_reflect_InvocationTargetException = (*env)->FindClass(env, "java/lang/reflect/InvocationTargetException");
484484

@@ -497,7 +497,7 @@ Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject m
497497
jitConfig->debugAgentRevertToInterpreter(vmThread, (J9JITExceptionTable*)jitMethod);
498498

499499
fprintf(stderr, "Rerunning test\n");
500-
(*env)->CallObjectMethod(env, ma, sun_reflect_MethodAccessor_invoke, obj, args);
500+
(*env)->CallObjectMethod(env, ma, jdk_internal_reflect_MethodAccessor_invoke, obj, args);
501501
if ((*env)->ExceptionCheck(env)) {
502502
(*env)->ExceptionClear(env);
503503
fprintf(stderr, "Caught exception after invoking test\n");
@@ -518,7 +518,7 @@ Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject m
518518
jitConfig->debugAgentRecompile(vmThread, (J9JITExceptionTable*)jitMethod, lastOptIndex, lastOptSubIndex, 0);
519519

520520
fprintf(stderr, "Rerunning test\n");
521-
(*env)->CallObjectMethod(env, ma, sun_reflect_MethodAccessor_invoke, obj, args);
521+
(*env)->CallObjectMethod(env, ma, jdk_internal_reflect_MethodAccessor_invoke, obj, args);
522522
if ((*env)->ExceptionCheck(env)) {
523523
(*env)->ExceptionClear(env);
524524
fprintf(stderr, "Caught exception after invoking test with lastOptIndex = %ld\n", lastOptIndex);
@@ -528,7 +528,7 @@ Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject m
528528
jitConfig->debugAgentRecompile(vmThread, (J9JITExceptionTable*)jitMethod, lastOptIndex, lastOptSubIndex, 1);
529529

530530
fprintf(stderr, "Rerunning test expecting it to pass\n");
531-
(*env)->CallObjectMethod(env, ma, sun_reflect_MethodAccessor_invoke, obj, args);
531+
(*env)->CallObjectMethod(env, ma, jdk_internal_reflect_MethodAccessor_invoke, obj, args);
532532
if ((*env)->ExceptionCheck(env)) {
533533
(*env)->ExceptionClear(env);
534534
fprintf(stderr, "Test failed\n");
@@ -540,7 +540,7 @@ Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject m
540540
jitConfig->debugAgentRecompile(vmThread, (J9JITExceptionTable*)jitMethod, lastOptIndex + 1, lastOptSubIndex, 1);
541541

542542
fprintf(stderr, "Rerunning test expecting it to fail\n");
543-
(*env)->CallObjectMethod(env, ma, sun_reflect_MethodAccessor_invoke, obj, args);
543+
(*env)->CallObjectMethod(env, ma, jdk_internal_reflect_MethodAccessor_invoke, obj, args);
544544
if ((*env)->ExceptionCheck(env)) {
545545
(*env)->ExceptionClear(env);
546546
fprintf(stderr, "Test failed\n");
@@ -558,7 +558,7 @@ Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject m
558558

559559
(*env)->DeleteLocalRef(env, java_lang_Long);
560560
(*env)->DeleteLocalRef(env, java_util_HashSet);
561-
(*env)->DeleteLocalRef(env, sun_reflect_MethodAccessor);
561+
(*env)->DeleteLocalRef(env, jdk_internal_reflect_MethodAccessor);
562562
(*env)->DeleteLocalRef(env, java_lang_reflect_InvocationTargetException);
563563
(*env)->DeleteLocalRef(env, jitMethodSet);
564564
(*env)->DeleteLocalRef(env, jitMethodArray);

0 commit comments

Comments
 (0)