src/share/vm/classfile/javaClasses.cpp

rev 8833 : 8064811: Use THEAD instead of CHECK_NULL in return statements
Summary: Backport from JDK9
Reviewed-by: dholmes, coffeys
rev 8910 : full patch for jfr

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2018, 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, 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.
*** 1045,1055 ****
    }
  }
  
  // Read thread status value from threadStatus field in java.lang.Thread java class.
  java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) {
!   assert(Thread::current()->is_Watcher_thread() || Thread::current()->is_VM_thread() ||
           JavaThread::current()->thread_state() == _thread_in_vm,
           "Java Thread is not running in vm");
    // The threadStatus is only present starting in 1.5
    if (_thread_status_offset > 0) {
      return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset);
--- 1045,1055 ----
    }
  }
  
  // Read thread status value from threadStatus field in java.lang.Thread java class.
  java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) {
!   assert((EnableJFR && Threads_lock->owned_by_self()) || Thread::current()->is_Watcher_thread() || Thread::current()->is_VM_thread() ||
           JavaThread::current()->thread_state() == _thread_in_vm,
           "Java Thread is not running in vm");
    // The threadStatus is only present starting in 1.5
    if (_thread_status_offset > 0) {
      return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset);