Skip to content
Permalink
Browse files
8254190: [s390] interpreter misses exception check after calling moni…
…torenter

Reviewed-by: shade, rrich
  • Loading branch information
TheRealMDoerr committed Oct 8, 2020
1 parent 5351ba6 commit ced46b19f70382d50a45fb54a58bcb9f742fb008
Showing with 2 additions and 5 deletions.
  1. +2 −5 src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -969,8 +969,7 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {

if (UseHeavyMonitors) {
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
monitor, /*check_for_exceptions=*/false);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), monitor);
return;
}

@@ -1061,9 +1060,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
// None of the above fast optimizations worked so we have to get into the
// slow case of monitor enter.
bind(slow_case);

call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
monitor, /*check_for_exceptions=*/false);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter), monitor);

// }

1 comment on commit ced46b1

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on ced46b1 Oct 8, 2020

Please sign in to comment.