Mercurial > hg > truffle
changeset 15164:62e218478931
Fix regression when accessing a Graal installed code object.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Apr 2014 18:20:00 +0200 |
parents | e5265dc8762f |
children | cf49b4e72de5 |
files | src/share/vm/code/nmethod.cpp src/share/vm/graal/graalEnv.cpp |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Tue Apr 15 15:31:01 2014 +0200 +++ b/src/share/vm/code/nmethod.cpp Wed Apr 16 18:20:00 2014 +0200 @@ -1738,7 +1738,7 @@ #ifdef GRAAL // Follow Graal method if (_graal_installed_code != NULL) { - if (HotSpotNmethod::isDefault(_graal_installed_code)) { + if (_graal_installed_code->is_a(HotSpotNmethod::klass()) && HotSpotNmethod::isDefault(_graal_installed_code)) { if (!is_alive->do_object_b(_graal_installed_code)) { _graal_installed_code = NULL; }
--- a/src/share/vm/graal/graalEnv.cpp Tue Apr 15 15:31:01 2014 +0200 +++ b/src/share/vm/graal/graalEnv.cpp Wed Apr 16 18:20:00 2014 +0200 @@ -515,7 +515,7 @@ // (Put nm into the task handle *before* publishing to the Java heap.) if (task != NULL) task->set_code(nm); - if (HotSpotNmethod::isDefault(installed_code())) { + if (installed_code->is_a(HotSpotNmethod::klass()) && HotSpotNmethod::isDefault(installed_code())) { if (entry_bci == InvocationEntryBci) { if (TieredCompilation) { // If there is an old version we're done with it