src/hotspot/share/oops/instanceKlass.cpp

*** 1317,1327 ****
  Klass* InstanceKlass::array_klass_impl(bool or_null, int n, TRAPS) {
    // Need load-acquire for lock-free read
    if (array_klasses_acquire() == NULL) {
      if (or_null) return NULL;
  
!     ResourceMark rm;
      JavaThread *jt = (JavaThread *)THREAD;
      {
        // Atomic creation of array_klasses
        MutexLocker ma(MultiArray_lock, THREAD);
  
--- 1317,1327 ----
  Klass* InstanceKlass::array_klass_impl(bool or_null, int n, TRAPS) {
    // Need load-acquire for lock-free read
    if (array_klasses_acquire() == NULL) {
      if (or_null) return NULL;
  
!     ResourceMark rm(THREAD);
      JavaThread *jt = (JavaThread *)THREAD;
      {
        // Atomic creation of array_klasses
        MutexLocker ma(MultiArray_lock, THREAD);
  
*** 1366,1376 ****
  
    methodHandle h_method(THREAD, class_initializer());
    assert(!is_initialized(), "we cannot initialize twice");
    LogTarget(Info, class, init) lt;
    if (lt.is_enabled()) {
!     ResourceMark rm;
      LogStream ls(lt);
      ls.print("%d Initializing ", call_class_initializer_counter++);
      name()->print_value_on(&ls);
      ls.print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", p2i(this));
    }
--- 1366,1376 ----
  
    methodHandle h_method(THREAD, class_initializer());
    assert(!is_initialized(), "we cannot initialize twice");
    LogTarget(Info, class, init) lt;
    if (lt.is_enabled()) {
!     ResourceMark rm(THREAD);
      LogStream ls(lt);
      ls.print("%d Initializing ", call_class_initializer_counter++);
      name()->print_value_on(&ls);
      ls.print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", p2i(this));
    }
*** 2676,2686 ****
      return NULL;
    } else {
      if (name->utf8_length() <= 0) {
        return NULL;
      }
!     ResourceMark rm;
      const char* package_name = ClassLoader::package_from_name((const char*) name->as_C_string());
      if (package_name == NULL) {
        return NULL;
      }
      Symbol* pkg_name = SymbolTable::new_symbol(package_name);
--- 2676,2686 ----
      return NULL;
    } else {
      if (name->utf8_length() <= 0) {
        return NULL;
      }
!     ResourceMark rm(THREAD);
      const char* package_name = ClassLoader::package_from_name((const char*) name->as_C_string());
      if (package_name == NULL) {
        return NULL;
      }
      Symbol* pkg_name = SymbolTable::new_symbol(package_name);
*** 2718,2728 ****
  
      // If the package name is not found in the loader's package
      // 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;
  
        if (!ModuleEntryTable::javabase_defined()) {
          // Before java.base is defined during bootstrapping, define all packages in
          // the java.base module.  If a non-java.base package is erroneously placed
          // in the java.base module it will be caught later when java.base
--- 2718,2728 ----
  
      // If the package name is not found in the loader's package
      // 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(THREAD);
  
        if (!ModuleEntryTable::javabase_defined()) {
          // Before java.base is defined during bootstrapping, define all packages in
          // the java.base module.  If a non-java.base package is erroneously placed
          // in the java.base module it will be caught later when java.base
*** 2739,2758 ****
        assert(_package_entry != NULL, "Package entry for class %s not found, loader %s",
               name()->as_C_string(), loader_data->loader_name_and_id());
      }
  
      if (log_is_enabled(Debug, module)) {
!       ResourceMark rm;
        ModuleEntry* m = _package_entry->module();
        log_trace(module)("Setting package: class: %s, package: %s, loader: %s, module: %s",
                          external_name(),
                          pkg_name->as_C_string(),
                          loader_data->loader_name_and_id(),
                          (m->is_named() ? m->name()->as_C_string() : UNNAMED_MODULE));
      }
    } else {
!     ResourceMark rm;
      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",
                        UNNAMED_MODULE);
    }
--- 2739,2758 ----
        assert(_package_entry != NULL, "Package entry for class %s not found, loader %s",
               name()->as_C_string(), loader_data->loader_name_and_id());
      }
  
      if (log_is_enabled(Debug, module)) {
!       ResourceMark rm(THREAD);
        ModuleEntry* m = _package_entry->module();
        log_trace(module)("Setting package: class: %s, package: %s, loader: %s, module: %s",
                          external_name(),
                          pkg_name->as_C_string(),
                          loader_data->loader_name_and_id(),
                          (m->is_named() ? m->name()->as_C_string() : UNNAMED_MODULE));
      }
    } else {
!     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",
                        UNNAMED_MODULE);
    }