archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8259482: jni_Set/GetField_probe are the same as their _nh versions

Browse source 
Reviewed-by: hseigel, sspitsyn, dholmes
This commit is contained in:
Coleen Phillimore 2021-01-11 12:27:30 +00:00
parent 01b2804ef7
commit 23801da94b
3 changed files with 4 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/hotspot/share/prims/jvmtiExport.cpp
View file

@ -1872,19 +1872,6 @@ void JvmtiExport::notice_unwind_due_to_exception(JavaThread *thread, Method* met
oop JvmtiExport::jni_GetField_probe(JavaThread *thread, jobject jobj, oop obj,
Klass* klass, jfieldID fieldID, bool is_static) {
if (*((int *)get_field_access_count_addr()) > 0 && thread->has_last_Java_frame()) {
// At least one field access watch is set so we have more work
// to do. This wrapper is used by entry points that allow us
// to create handles in post_field_access_by_jni().
post_field_access_by_jni(thread, obj, klass, fieldID, is_static);
// event posting can block so refetch oop if we were passed a jobj
if (jobj != NULL) return JNIHandles::resolve_non_null(jobj);
}
return obj;
}
oop JvmtiExport::jni_GetField_probe_nh(JavaThread *thread, jobject jobj, oop obj,
Klass* klass, jfieldID fieldID, bool is_static) {
if (*((int *)get_field_access_count_addr()) > 0 && thread->has_last_Java_frame()) {
// At least one field access watch is set so we have more work to do.
post_field_access_by_jni(thread, obj, klass, fieldID, is_static);
@ -1962,20 +1949,6 @@ void JvmtiExport::post_field_access(JavaThread *thread, Method* method,
oop JvmtiExport::jni_SetField_probe(JavaThread *thread, jobject jobj, oop obj,
Klass* klass, jfieldID fieldID, bool is_static,
char sig_type, jvalue *value) {
if (*((int *)get_field_modification_count_addr()) > 0 && thread->has_last_Java_frame()) {
// At least one field modification watch is set so we have more work
// to do. This wrapper is used by entry points that allow us
// to create handles in post_field_modification_by_jni().
post_field_modification_by_jni(thread, obj, klass, fieldID, is_static, sig_type, value);
// event posting can block so refetch oop if we were passed a jobj
if (jobj != NULL) return JNIHandles::resolve_non_null(jobj);
}
return obj;
}
oop JvmtiExport::jni_SetField_probe_nh(JavaThread *thread, jobject jobj, oop obj,
Klass* klass, jfieldID fieldID, bool is_static,
char sig_type, jvalue *value) {
if (*((int *)get_field_modification_count_addr()) > 0 && thread->has_last_Java_frame()) {
// At least one field modification watch is set so we have more work to do.
post_field_modification_by_jni(thread, obj, klass, fieldID, is_static, sig_type, value);