Mercurial > hg > icedtea8-forest > hotspot
changeset 10106:4e4ead43a282 icedtea-3.10.0 icedtea-3.11.0pre00
8209415, PR3666: Fix JVMTI test failure HS202
Summary: Fix test for static method in exception throw handler
Reviewed-by: adinn
author | aph |
---|---|
date | Tue, 13 Nov 2018 11:21:32 -0500 |
parents | e2c0347ef61c |
children | 60eedbcc4288 |
files | src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp |
diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Fri Sep 28 08:48:26 2018 +0800 +++ b/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Tue Nov 13 11:21:32 2018 -0500 @@ -1879,8 +1879,8 @@ Label L_done; __ ldrb(rscratch1, Address(rbcp, 0)); - __ cmpw(r1, Bytecodes::_invokestatic); - __ br(Assembler::EQ, L_done); + __ cmpw(rscratch1, Bytecodes::_invokestatic); + __ br(Assembler::NE, L_done); // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call. // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL. @@ -1916,7 +1916,6 @@ // remove the activation (without doing throws on illegalMonitorExceptions) __ remove_activation(vtos, false, true, false); // restore exception - // restore exception __ get_vm_result(r0, rthread); // In between activations - previous activation type unknown yet @@ -1925,9 +1924,8 @@ // // r0: exception // lr: return address/pc that threw exception - // rsp: expression stack of caller + // esp: expression stack of caller // rfp: fp of caller - // FIXME: There's no point saving LR here because VM calls don't trash it __ stp(r0, lr, Address(__ pre(sp, -2 * wordSize))); // save exception & return address __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address),