src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

*** 255,265 ****
    const Register thread = NOT_LP64(rcx) LP64_ONLY(r15_thread);
    NOT_LP64(__ get_thread(thread));
  #if INCLUDE_JVMCI
    // Check if we need to take lock at entry of synchronized method.  This can
    // only occur on method entry so emit it only for vtos with step 0.
!   if ((UseJVMCICompiler || UseAOT) && state == vtos && step == 0) {
      Label L;
      __ cmpb(Address(thread, JavaThread::pending_monitorenter_offset()), 0);
      __ jcc(Assembler::zero, L);
      // Clear flag.
      __ movb(Address(thread, JavaThread::pending_monitorenter_offset()), 0);
--- 255,265 ----
    const Register thread = NOT_LP64(rcx) LP64_ONLY(r15_thread);
    NOT_LP64(__ get_thread(thread));
  #if INCLUDE_JVMCI
    // Check if we need to take lock at entry of synchronized method.  This can
    // only occur on method entry so emit it only for vtos with step 0.
!   if ((EnableJVMCI || UseAOT) && state == vtos && step == 0) {
      Label L;
      __ cmpb(Address(thread, JavaThread::pending_monitorenter_offset()), 0);
      __ jcc(Assembler::zero, L);
      // Clear flag.
      __ movb(Address(thread, JavaThread::pending_monitorenter_offset()), 0);
*** 268,278 ****
      // Take lock.
      lock_method();
      __ bind(L);
    } else {
  #ifdef ASSERT
!     if (UseJVMCICompiler) {
        Label L;
        __ cmpb(Address(r15_thread, JavaThread::pending_monitorenter_offset()), 0);
        __ jccb(Assembler::zero, L);
        __ stop("unexpected pending monitor in deopt entry");
        __ bind(L);
--- 268,278 ----
      // Take lock.
      lock_method();
      __ bind(L);
    } else {
  #ifdef ASSERT
!     if (EnableJVMCI) {
        Label L;
        __ cmpb(Address(r15_thread, JavaThread::pending_monitorenter_offset()), 0);
        __ jccb(Assembler::zero, L);
        __ stop("unexpected pending monitor in deopt entry");
        __ bind(L);