Mercurial > hg > truffle
comparison src/share/vm/graal/graalEnv.cpp @ 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 | cd22c8dbda4f |
children | 6eda3b299460 |
comparison
equal
deleted
inserted
replaced
15163:e5265dc8762f | 15164:62e218478931 |
---|---|
513 | 513 |
514 // Record successful registration. | 514 // Record successful registration. |
515 // (Put nm into the task handle *before* publishing to the Java heap.) | 515 // (Put nm into the task handle *before* publishing to the Java heap.) |
516 if (task != NULL) task->set_code(nm); | 516 if (task != NULL) task->set_code(nm); |
517 | 517 |
518 if (HotSpotNmethod::isDefault(installed_code())) { | 518 if (installed_code->is_a(HotSpotNmethod::klass()) && HotSpotNmethod::isDefault(installed_code())) { |
519 if (entry_bci == InvocationEntryBci) { | 519 if (entry_bci == InvocationEntryBci) { |
520 if (TieredCompilation) { | 520 if (TieredCompilation) { |
521 // If there is an old version we're done with it | 521 // If there is an old version we're done with it |
522 nmethod* old = method->code(); | 522 nmethod* old = method->code(); |
523 if (TraceMethodReplacement && old != NULL) { | 523 if (TraceMethodReplacement && old != NULL) { |