1.1 --- a/src/share/vm/prims/methodHandles.cpp Mon Oct 24 07:53:17 2011 -0700
1.2 +++ b/src/share/vm/prims/methodHandles.cpp Tue Oct 25 00:55:10 2011 -0700
1.3 @@ -3079,26 +3079,26 @@
1.4 JVM_END
1.5
1.6 JVM_ENTRY(void, MHN_setCallSiteTargetNormal(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) {
1.7 - oop call_site = JNIHandles::resolve_non_null(call_site_jh);
1.8 - oop target = JNIHandles::resolve(target_jh);
1.9 + Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh));
1.10 + Handle target (THREAD, JNIHandles::resolve(target_jh));
1.11 {
1.12 // Walk all nmethods depending on this call site.
1.13 MutexLocker mu(Compile_lock, thread);
1.14 Universe::flush_dependents_on(call_site, target);
1.15 }
1.16 - java_lang_invoke_CallSite::set_target(call_site, target);
1.17 + java_lang_invoke_CallSite::set_target(call_site(), target());
1.18 }
1.19 JVM_END
1.20
1.21 JVM_ENTRY(void, MHN_setCallSiteTargetVolatile(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) {
1.22 - oop call_site = JNIHandles::resolve_non_null(call_site_jh);
1.23 - oop target = JNIHandles::resolve(target_jh);
1.24 + Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh));
1.25 + Handle target (THREAD, JNIHandles::resolve(target_jh));
1.26 {
1.27 // Walk all nmethods depending on this call site.
1.28 MutexLocker mu(Compile_lock, thread);
1.29 Universe::flush_dependents_on(call_site, target);
1.30 }
1.31 - java_lang_invoke_CallSite::set_target_volatile(call_site, target);
1.32 + java_lang_invoke_CallSite::set_target_volatile(call_site(), target());
1.33 }
1.34 JVM_END
1.35
