Mercurial > hg > truffle
diff src/cpu/x86/vm/templateTable_x86_32.cpp @ 13010:bd3237e0e18d
8026328: Setting a breakpoint on invokedynamic crashes the JVM
Reviewed-by: jrose, roland
author | twisti |
---|---|
date | Thu, 24 Oct 2013 16:23:07 -0700 |
parents | d13d7aba8c12 |
children | 42790b7e4d48 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp Wed Oct 23 19:22:28 2013 +0000 +++ b/src/cpu/x86/vm/templateTable_x86_32.cpp Thu Oct 24 16:23:07 2013 -0700 @@ -2925,9 +2925,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); __ movptr(flags, ArrayAddress(table, Address(noreg, flags, Address::times_ptr))); }