Mercurial > hg > truffle

diff src/share/vm/code/compiledIC.cpp @ 13451:02f27ecb4f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 Dec 2013 00:00:24 +0100
parents cefad50507d8 df832bd8edb9
children 5c71dcf0915d
line wrap: on
line diff
--- a/src/share/vm/code/compiledIC.cpp	Tue Dec 17 22:37:03 2013 +0100
+++ b/src/share/vm/code/compiledIC.cpp	Wed Dec 18 00:00:24 2013 +0100
@@ -427,7 +427,7 @@
                                            TRAPS) {
   nmethod* method_code = method->code();
   address entry = NULL;
-  if (method_code != NULL) {
+  if (method_code != NULL && method_code->is_in_use()) {
     // Call to compiled code
     if (static_bound || is_optimized) {
       entry      = method_code->verified_entry_point();
@@ -554,7 +554,7 @@
 void CompiledStaticCall::compute_entry(methodHandle m, StaticCallInfo& info) {
   nmethod* m_code = m->code();
   info._callee = m;
-  if (m_code != NULL) {
+  if (m_code != NULL && m_code->is_in_use()) {
     info._to_interpreter = false;
     info._entry  = m_code->verified_entry_point();
   } else {