--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Oct 23 19:22:28 2013 +0000
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Thu Oct 24 16:23:07 2013 -0700
@@ -2980,9 +2980,7 @@
ConstantPoolCacheEntry::verify_tos_state_shift();
// load return address
{
- const address table_addr = (is_invokeinterface || is_invokedynamic) ?
- (address)Interpreter::return_5_addrs_by_index_table() :
- (address)Interpreter::return_3_addrs_by_index_table();
+ const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
ExternalAddress table(table_addr);
__ lea(rscratch1, table);
__ movptr(flags, Address(rscratch1, flags, Address::times_ptr));