infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

8169467: GetLocalInstance returns JVMTI_ERROR_TYPE_MISMATCH (rather than JVMTI_ERROR_INVALID_SLOT) on static method

Browse Source 
Add necessary check to GetLocalInstance implementation

Reviewed-by: amenkov, cjplummer
This commit is contained in:
Serguei Spitsyn 2019-11-22 10:07:21 +00:00
parent 7d160282f2
commit 0a1737ca97
3 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotspot/share/prims/jvmtiImpl.cpp
View File

@ -724,13 +724,17 @@ bool VM_GetOrSetLocal::doit_prologue() {
NULL_CHECK(_jvf, false);
Method* method_oop = _jvf->method();
if (method_oop->is_native()) {
if (getting_receiver() && !method_oop->is_static()) {
return true;
} else {
_result = JVMTI_ERROR_OPAQUE_FRAME;
if (getting_receiver()) {
if (method_oop->is_static()) {
_result = JVMTI_ERROR_INVALID_SLOT;
return false;
}
return true;
}
if (method_oop->is_native()) {
_result = JVMTI_ERROR_OPAQUE_FRAME;
return false;
}
if (!check_slot_type_no_lvt(_jvf)) {

4
test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -203,9 +203,11 @@ public class getlocal003 {
public double meth01() {
float f = 6.0f;
double d = 7.0;
instMeth();
return d + f;
}
native void instMeth();
native static void getMeth();
native static void checkLoc(Thread thr);
native static int getRes();

54
test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp
View File

@ -230,9 +230,45 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
return JNI_OK;
}
JNIEXPORT void JNICALL
Java_nsk_jvmti_unit_GetLocalVariable_getlocal003_instMeth(JNIEnv *env, jobject inst) {
jvmtiError err;
jobject obj = NULL;
printf("\n Native instMeth: started\n");
// Test GetLocalInstance with native instance method instMeth() frame
err = jvmti->GetLocalInstance(NULL, 0, &obj);
printf(" Native instMeth: GetLocalInstance: %s (%d)\n", TranslateError(err), err);
if (err != JVMTI_ERROR_NONE) {
printf("FAIL: GetLocalInstance failed to get instance for native instance method frame\n");
result = STATUS_FAILED;
}
if (env->IsSameObject(inst, obj) == JNI_FALSE) {
printf("FAIL: GetLocalInstance returned unexpected instance for native instance method frame\n");
result = STATUS_FAILED;
}
// Test GetLocalInstance with java instance method meth01() frame
err = jvmti->GetLocalInstance(NULL, 1, &obj);
printf(" Native instMeth: GetLocalInstance: %s (%d)\n", TranslateError(err), err);
if (err != JVMTI_ERROR_NONE) {
printf("FAIL: GetLocalInstance failed to get instance for java instance method frame\n");
result = STATUS_FAILED;
}
if (env->IsSameObject(inst, obj) == JNI_FALSE) {
printf("FAIL: GetLocalInstance returned unexpected instance for java instance method frame\n");
result = STATUS_FAILED;
}
printf(" Native instMeth: finished\n\n");
}
JNIEXPORT void JNICALL
Java_nsk_jvmti_unit_GetLocalVariable_getlocal003_getMeth(JNIEnv *env, jclass cls) {
jvmtiError err;
jobject obj = NULL;
printf("\n Native getMeth: started\n");
if (jvmti == NULL) {
printf("JVMTI client was not properly loaded!\n");
@ -261,6 +297,24 @@ Java_nsk_jvmti_unit_GetLocalVariable_getlocal003_getMeth(JNIEnv *env, jclass cls
TranslateError(err), err);
result = STATUS_FAILED;
}
// Test GetLocalInstance with native static method getMeth() frame
err = jvmti->GetLocalInstance(NULL, 0, &obj);
printf(" Native getMeth: GetLocalInstance: %s (%d)\n", TranslateError(err), err);
if (err != JVMTI_ERROR_INVALID_SLOT) {
printf("FAIL: GetLocalInstance failed to return JVMTI_ERROR_INVALID_SLOT for native static method frame\n");
result = STATUS_FAILED;
}
// Test GetLocalInstance with java static method run() frame
err = jvmti->GetLocalInstance(NULL, 1, &obj);
printf(" Native getMeth: GetLocalInstance: %s (%d)\n", TranslateError(err), err);
if (err != JVMTI_ERROR_INVALID_SLOT) {
printf("FAIL: GetLocalInstance failed to return JVMTI_ERROR_INVALID_SLOT for java static method frame\n");
result = STATUS_FAILED;
}
printf(" Native getMeth: finished\n\n");
fflush(stdout);
}