Mercurial > hg > release > icedtea7-forest-2.6 > hotspot
changeset 6682:9599175faddb
8209415, PR3669: Fix JVMTI test failure HS202
Summary: Fix test for static method in exception throw handler
Reviewed-by: adinn
| author | aph |
|---|---|
| date | Mon, 18 Feb 2019 02:26:43 +0000 |
| parents | f796e9ab0bfd |
| children | cb39f2849d75 |
| files | src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp |
| diffstat | 1 files changed, 3 insertions(+), 4 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 Mon Feb 18 02:26:43 2019 +0000 @@ -1882,8 +1882,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. @@ -1925,9 +1925,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),