stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8210726: Fix up a few minor nits forgotten by JDK-8210665

Browse Source 
Minor changes to 4 tests to make one-liners

Reviewed-by: cjplummer, iignatyev, sspitsyn
This commit is contained in:
Jean Christophe Beyler 2018-09-17 09:07:40 -07:00
parent f4e1502e03
commit fddc4b8ccb
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp
View File

@ -154,11 +154,9 @@ Java_nsk_jvmti_SetFieldAccessWatch_setfldw005_getReady(JNIEnv *env, jclass cls)
for (i = 0; i < sizeof(fields) / sizeof(field); i++) { for (i = 0; i < sizeof(fields) / sizeof(field); i++) {
if (fields[i].stat == JNI_TRUE) { if (fields[i].stat == JNI_TRUE) {
fields[i].fid = env-> GetStaticFieldID( fields[i].fid = env->GetStaticFieldID(cls, fields[i].name, fields[i].sig);
cls, fields[i].name, fields[i].sig);
} else { } else {
fields[i].fid = env->GetFieldID( fields[i].fid = env->GetFieldID(cls, fields[i].name, fields[i].sig);
cls, fields[i].name, fields[i].sig);
} }
if (fields[i].fid == NULL) { if (fields[i].fid == NULL) {
printf("Unable to set access watch on %s fld%" PRIuPTR ", fieldID=0", printf("Unable to set access watch on %s fld%" PRIuPTR ", fieldID=0",

6
test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp
View File

@ -176,11 +176,9 @@ Java_nsk_jvmti_SetFieldAccessWatch_setfldw006_getReady(JNIEnv *env,
} }
for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) { for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) {
if (watches[i].is_static == JNI_TRUE) { if (watches[i].is_static == JNI_TRUE) {
watches[i].fid = env->GetStaticFieldID( watches[i].fid = env->GetStaticFieldID(cls, watches[i].f_name, watches[i].f_sig);
cls, watches[i].f_name, watches[i].f_sig);
} else { } else {
watches[i].fid = env->GetFieldID( watches[i].fid = env->GetFieldID(cls, watches[i].f_name, watches[i].f_sig);
cls, watches[i].f_name, watches[i].f_sig);
} }
err = jvmti->SetFieldAccessWatch(cls, watches[i].fid); err = jvmti->SetFieldAccessWatch(cls, watches[i].fid);
if (err == JVMTI_ERROR_NONE) { if (err == JVMTI_ERROR_NONE) {

6
test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp
View File

@ -170,11 +170,9 @@ Java_nsk_jvmti_SetFieldModificationWatch_setfmodw006_getReady(JNIEnv *env,
} }
for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) { for (i = 0; i < sizeof(watches)/sizeof(watch_info); i++) {
if (watches[i].is_static == JNI_TRUE) { if (watches[i].is_static == JNI_TRUE) {
watches[i].fid = env->GetStaticFieldID( watches[i].fid = env->GetStaticFieldID(cls, watches[i].f_name, watches[i].f_sig);
cls, watches[i].f_name, watches[i].f_sig);
} else { } else {
watches[i].fid = env->GetFieldID( watches[i].fid = env->GetFieldID(cls, watches[i].f_name, watches[i].f_sig);
cls, watches[i].f_name, watches[i].f_sig);
} }
err = jvmti->SetFieldModificationWatch(cls, watches[i].fid); err = jvmti->SetFieldModificationWatch(cls, watches[i].fid);
if (err == JVMTI_ERROR_NONE) { if (err == JVMTI_ERROR_NONE) {

3
test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp
View File

@ -108,8 +108,7 @@ Java_nsk_jvmti_SetLocalVariable_setlocal002_check(JNIEnv *env, jclass cls, jthre
return result; return result;
} }
mid = env->GetStaticMethodID( mid = env->GetStaticMethodID(cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
if (mid == NULL) { if (mid == NULL) {
printf("Cannot find method \"run\"\n"); printf("Cannot find method \"run\"\n");
return STATUS_FAILED; return STATUS_FAILED;