Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > hotspot
changeset 7443:52aeb8fe98ca
Fix two barriers in JNI implementation.
author | Roman Kennke <rkennke@redhat.com> |
---|---|
date | Sat, 13 Dec 2014 00:14:52 +0100 |
parents | 94b7293bdf5b |
children | e94e32873b55 |
files | src/share/vm/prims/jni.cpp |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp Fri Dec 12 18:43:09 2014 +0100 +++ b/src/share/vm/prims/jni.cpp Sat Dec 13 00:14:52 2014 +0100 @@ -3117,7 +3117,7 @@ JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \ } \ oop o = id->holder()->java_mirror(); \ - oopDesc::bs()->resolve_and_maybe_copy_oop(o); \ + o = oopDesc::bs()->resolve_and_maybe_copy_oop(o); \ o-> Fieldname##_field_put (id->offset(), value); \ DTRACE_PROBE(hotspot_jni, SetStatic##Result##Field__return);\ JNI_END @@ -3150,7 +3150,7 @@ JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \ } \ oop o = id->holder()->java_mirror(); \ - oopDesc::bs()->resolve_and_maybe_copy_oop(o); \ + o = oopDesc::bs()->resolve_and_maybe_copy_oop(o); \ o-> Fieldname##_field_put (id->offset(), value); \ ReturnProbe;\ JNI_END