1.1 --- a/src/share/vm/runtime/mutex.cpp Thu Jan 30 00:21:06 2020 +0000
1.2 +++ b/src/share/vm/runtime/mutex.cpp Tue Feb 04 11:16:27 2020 +0800
1.3 @@ -1,6 +1,6 @@
1.4
1.5 /*
1.6 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 * This code is free software; you can redistribute it and/or modify it
1.11 @@ -1373,10 +1373,8 @@
1.12 debug_only(if (rank() != Mutex::special) \
1.13 thread->check_for_valid_safepoint_state(false);)
1.14 }
1.15 - if (thread->is_Watcher_thread()) {
1.16 - assert(!WatcherThread::watcher_thread()->has_crash_protection(),
1.17 - "locking not allowed when crash protection is set");
1.18 - }
1.19 + assert(!os::ThreadCrashProtection::is_crash_protected(thread),
1.20 + "locking not allowed when crash protection is set");
1.21 }
1.22
1.23 void Monitor::check_block_state(Thread *thread) {
