Mercurial > hg > graal-jvmci-8
changeset 18942:96ec4e5d3292
fixed regression caused by GPU removal
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sun, 25 Jan 2015 20:58:50 +0100 |
parents | c943ba97b2a7 |
children | 2e726a84c8f3 |
files | src/share/vm/runtime/javaCalls.cpp |
diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/javaCalls.cpp Sat Jan 24 00:45:12 2015 +0100 +++ b/src/share/vm/runtime/javaCalls.cpp Sun Jan 25 20:58:50 2015 +0100 @@ -339,19 +339,26 @@ CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops();) - // Verify the arguments +#ifdef GRAAL + nmethod* nm = args->alternative_target(); + if (nm == NULL) { +#endif +// Verify the arguments if (CheckJNICalls) { args->verify(method, result->get_type(), thread); } else debug_only(args->verify(method, result->get_type(), thread)); +#ifdef GRAAL + } +#else // Ignore call if method is empty if (method->is_empty_method()) { assert(result->get_type() == T_VOID, "an empty method must return a void value"); return; } - +#endif #ifdef ASSERT { InstanceKlass* holder = method->method_holder(); @@ -408,7 +415,6 @@ } #ifdef GRAAL - nmethod* nm = args->alternative_target(); if (nm != NULL) { if (nm->is_alive()) { ((JavaThread*) THREAD)->set_graal_alternate_call_target(nm->verified_entry_point());