src/share/vm/oops/klass.cpp

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

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.

@@ -195,11 +195,10 @@
   af.set_flags(0);
   set_access_flags(af);
   set_subklass(NULL);
   set_next_sibling(NULL);
   set_next_link(NULL);
-  TRACE_INIT_ID(this);
 
   set_prototype_header(markOopDesc::prototype());
   set_biased_lock_revocation_count(0);
   set_last_biased_lock_bulk_revocation_time(0);
 

@@ -522,10 +521,11 @@
 void Klass::oops_do(OopClosure* cl) {
   cl->do_oop(&_java_mirror);
 }
 
 void Klass::remove_unshareable_info() {
+  TRACE_REMOVE_ID(this);
   assert (DumpSharedSpaces, "only called for DumpSharedSpaces");
 
   set_subklass(NULL);
   set_next_sibling(NULL);
   // Clear the java mirror

@@ -535,11 +535,11 @@
   // Null out class_loader_data because we don't share that yet.
   set_class_loader_data(NULL);
 }
 
 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
-  TRACE_INIT_ID(this);
+  TRACE_RESTORE_ID(this);
   // If an exception happened during CDS restore, some of these fields may already be
   // set.  We leave the class on the CLD list, even if incomplete so that we don't
   // modify the CLD list outside a safepoint.
   if (class_loader_data() == NULL) {
     // Restore class_loader_data