--- old/src/hotspot/share/classfile/classLoader.cpp 2019-12-11 10:12:09.664088379 -0800 +++ new/src/hotspot/share/classfile/classLoader.cpp 2019-12-11 10:12:09.388077991 -0800 @@ -1042,7 +1042,7 @@ assert(fullq_class_name != NULL, "just checking"); // Get package name from fully qualified class name. - ResourceMark rm; + ResourceMark rm(THREAD); const char *cp = package_from_name(fullq_class_name); if (cp != NULL) { PackageEntryTable* pkg_entry_tbl = ClassLoaderData::the_null_class_loader_data()->packages(); --- old/src/hotspot/share/classfile/javaClasses.cpp 2019-12-11 10:12:10.340113819 -0800 +++ new/src/hotspot/share/classfile/javaClasses.cpp 2019-12-11 10:12:10.064103432 -0800 @@ -1317,9 +1317,11 @@ set_mirror_module_field(k, mirror, module, THREAD); - ResourceMark rm; - log_trace(cds, heap, mirror)( - "Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror())); + if (log_is_enabled(Trace, cds, heap, mirror)) { + ResourceMark rm(THREAD); + log_trace(cds, heap, mirror)( + "Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror())); + } return true; } --- old/src/hotspot/share/classfile/systemDictionary.cpp 2019-12-11 10:12:11.040140164 -0800 +++ new/src/hotspot/share/classfile/systemDictionary.cpp 2019-12-11 10:12:10.764129776 -0800 @@ -448,7 +448,7 @@ JavaValue result(T_VOID); LogTarget(Debug, protectiondomain) lt; if (lt.is_enabled()) { - ResourceMark rm; + ResourceMark rm(THREAD); // Print out trace information LogStream ls(lt); ls.print_cr("Checking package access"); @@ -1176,7 +1176,7 @@ Handle class_loader, TRAPS) { assert(!ModuleEntryTable::javabase_moduleEntry()->is_patched(), "Cannot use sharing if java.base is patched"); - ResourceMark rm; + ResourceMark rm(THREAD); int path_index = ik->shared_classpath_index(); ClassLoaderData* loader_data = class_loader_data(class_loader); if (path_index < 0) { @@ -1341,7 +1341,7 @@ // package was loaded. if (class_loader.is_null()) { int path_index = ik->shared_classpath_index(); - ResourceMark rm; + ResourceMark rm(THREAD); ClassLoader::add_package(ik->name()->as_C_string(), path_index, THREAD); } @@ -1365,8 +1365,10 @@ // This class matches with a class saved in an AOT library ik->set_has_passed_fingerprint_check(true); } else { - ResourceMark rm; - log_info(class, fingerprint)("%s : expected = " PTR64_FORMAT " actual = " PTR64_FORMAT, ik->external_name(), aot_fp, cds_fp); + if (log_is_enabled(Info, class, fingerprint)) { + ResourceMark rm(THREAD); + log_info(class, fingerprint)("%s : expected = " PTR64_FORMAT " actual = " PTR64_FORMAT, ik->external_name(), aot_fp, cds_fp); + } } } @@ -1377,7 +1379,7 @@ InstanceKlass* SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) { if (class_loader.is_null()) { - ResourceMark rm; + ResourceMark rm(THREAD); PackageEntry* pkg_entry = NULL; bool search_only_bootloader_append = false; ClassLoaderData *loader_data = class_loader_data(class_loader); --- old/src/hotspot/share/oops/instanceKlass.cpp 2019-12-11 10:12:11.720165755 -0800 +++ new/src/hotspot/share/oops/instanceKlass.cpp 2019-12-11 10:12:11.448155518 -0800 @@ -1319,7 +1319,7 @@ if (array_klasses_acquire() == NULL) { if (or_null) return NULL; - ResourceMark rm; + ResourceMark rm(THREAD); JavaThread *jt = (JavaThread *)THREAD; { // Atomic creation of array_klasses @@ -1368,7 +1368,7 @@ assert(!is_initialized(), "we cannot initialize twice"); LogTarget(Info, class, init) lt; if (lt.is_enabled()) { - ResourceMark rm; + ResourceMark rm(THREAD); LogStream ls(lt); ls.print("%d Initializing ", call_class_initializer_counter++); name()->print_value_on(&ls); @@ -2678,7 +2678,7 @@ if (name->utf8_length() <= 0) { return NULL; } - ResourceMark rm; + ResourceMark rm(THREAD); const char* package_name = ClassLoader::package_from_name((const char*) name->as_C_string()); if (package_name == NULL) { return NULL; @@ -2720,7 +2720,7 @@ // entry table, it is an indication that the package has not // been defined. Consider it defined within the unnamed module. if (_package_entry == NULL) { - ResourceMark rm; + ResourceMark rm(THREAD); if (!ModuleEntryTable::javabase_defined()) { // Before java.base is defined during bootstrapping, define all packages in @@ -2741,7 +2741,7 @@ } if (log_is_enabled(Debug, module)) { - ResourceMark rm; + ResourceMark rm(THREAD); ModuleEntry* m = _package_entry->module(); log_trace(module)("Setting package: class: %s, package: %s, loader: %s, module: %s", external_name(), @@ -2750,7 +2750,7 @@ (m->is_named() ? m->name()->as_C_string() : UNNAMED_MODULE)); } } else { - ResourceMark rm; + ResourceMark rm(THREAD); log_trace(module)("Setting package: class: %s, package: unnamed, loader: %s, module: %s", external_name(), (loader_data != NULL) ? loader_data->loader_name_and_id() : "NULL", --- old/src/hotspot/share/oops/klass.cpp 2019-12-11 10:12:12.424192249 -0800 +++ new/src/hotspot/share/oops/klass.cpp 2019-12-11 10:12:12.148181862 -0800 @@ -552,7 +552,7 @@ assert(is_shared(), "must be set"); JFR_ONLY(RESTORE_ID(this);) if (log_is_enabled(Trace, cds, unshareable)) { - ResourceMark rm; + ResourceMark rm(THREAD); log_trace(cds, unshareable)("restore: %s", external_name()); } @@ -585,7 +585,7 @@ Handle module_handle(THREAD, ((module_entry != NULL) ? module_entry->module() : (oop)NULL)); if (this->has_raw_archived_mirror()) { - ResourceMark rm; + ResourceMark rm(THREAD); log_debug(cds, mirror)("%s has raw archived mirror", external_name()); if (HeapShared::open_archive_heap_region_mapped()) { bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle, --- old/src/hotspot/share/runtime/mutex.cpp 2019-12-11 10:12:13.084217088 -0800 +++ new/src/hotspot/share/runtime/mutex.cpp 2019-12-11 10:12:12.812206852 -0800 @@ -157,18 +157,18 @@ } void Mutex::unlock() { - assert_owner(Thread::current()); + DEBUG_ONLY(assert_owner(Thread::current())); set_owner(NULL); _lock.unlock(); } void Monitor::notify() { - assert_owner(Thread::current()); + DEBUG_ONLY(assert_owner(Thread::current())); _lock.notify(); } void Monitor::notify_all() { - assert_owner(Thread::current()); + DEBUG_ONLY(assert_owner(Thread::current())); _lock.notify_all(); }