8146983: C1: assert(appendix.not_null()) failed for invokehandle bytecode

Reviewed-by: roland
This commit is contained in:
Vladimir Ivanov 2016-01-15 21:56:43 +03:00
parent 281c7eb895
commit 22de0c428d

View file

@ -964,7 +964,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
assert(cache_index >= 0 && cache_index < pool->cache()->length(), "unexpected cache index"); assert(cache_index >= 0 && cache_index < pool->cache()->length(), "unexpected cache index");
ConstantPoolCacheEntry* cpce = pool->cache()->entry_at(cache_index); ConstantPoolCacheEntry* cpce = pool->cache()->entry_at(cache_index);
cpce->set_method_handle(pool, info); cpce->set_method_handle(pool, info);
appendix = info.resolved_appendix(); // just in case somebody already resolved the entry appendix = cpce->appendix_if_resolved(pool); // just in case somebody already resolved the entry
break; break;
} }
case Bytecodes::_invokedynamic: { case Bytecodes::_invokedynamic: {
@ -975,8 +975,6 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
} }
default: fatal("unexpected bytecode for load_appendix_patching_id"); default: fatal("unexpected bytecode for load_appendix_patching_id");
} }
assert(appendix.not_null(), "%s @ %d (%s)",
caller_method->name_and_sig_as_C_string(), bci, Bytecodes::name(bc));
} else { } else {
ShouldNotReachHere(); ShouldNotReachHere();
} }