Mercurial > hg > truffle

diff src/share/vm/prims/methodHandles.cpp @ 7458:4daebd4cc1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author minqi
date Mon, 24 Dec 2012 11:46:38 -0800
parents 5c0931d15474
children 16885e702c88
line wrap: on
line diff
--- a/src/share/vm/prims/methodHandles.cpp	Thu Dec 20 10:22:19 2012 +0100
+++ b/src/share/vm/prims/methodHandles.cpp	Mon Dec 24 11:46:38 2012 -0800
@@ -1168,8 +1168,8 @@
     // Walk all nmethods depending on this call site.
     MutexLocker mu(Compile_lock, thread);
     Universe::flush_dependents_on(call_site, target);
+    java_lang_invoke_CallSite::set_target(call_site(), target());
   }
-  java_lang_invoke_CallSite::set_target(call_site(), target());
 }
 JVM_END
 
@@ -1180,8 +1180,8 @@
     // Walk all nmethods depending on this call site.
     MutexLocker mu(Compile_lock, thread);
     Universe::flush_dependents_on(call_site, target);
+    java_lang_invoke_CallSite::set_target_volatile(call_site(), target());
   }
-  java_lang_invoke_CallSite::set_target_volatile(call_site(), target());
 }
 JVM_END