src/hotspot/share/runtime/mutexLocker.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 187,197 ****
    if (lock->owned_by_self()) return;
    fatal("must own lock %s", lock->name());
  }
  
  void assert_locked_or_safepoint_or_handshake(const Mutex* lock, const JavaThread* thread) {
!   if (Thread::current()->is_VM_thread() && thread->is_vmthread_processing_handshake()) return;
    assert_locked_or_safepoint(lock);
  }
  #endif
  
  #define def(var, type, pri, vm_block, safepoint_check_allowed ) {      \
--- 187,197 ----
    if (lock->owned_by_self()) return;
    fatal("must own lock %s", lock->name());
  }
  
  void assert_locked_or_safepoint_or_handshake(const Mutex* lock, const JavaThread* thread) {
!   if (Thread::current() == thread->get_active_handshaker()) return;
    assert_locked_or_safepoint(lock);
  }
  #endif
  
  #define def(var, type, pri, vm_block, safepoint_check_allowed ) {      \