src/share/vm/classfile/systemDictionary.cpp

*** 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.
*** 227,245 ****
    assert(!THREAD->is_Compiler_thread(),
           err_msg("can not load classes with compiler thread: class=%s, classloader=%s",
                   class_name->as_C_string(),
                   class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
    if (FieldType::is_array(class_name)) {
!     return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
    } else if (FieldType::is_obj(class_name)) {
      ResourceMark rm(THREAD);
      // Ignore wrapping L and ;.
      TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
                                     class_name->utf8_length() - 2, CHECK_NULL);
!     return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
    } else {
!     return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
    }
  }
  
  Klass* SystemDictionary::resolve_or_null(Symbol* class_name, TRAPS) {
    return resolve_or_null(class_name, Handle(), Handle(), THREAD);
--- 227,245 ----
    assert(!THREAD->is_Compiler_thread(),
           err_msg("can not load classes with compiler thread: class=%s, classloader=%s",
                   class_name->as_C_string(),
                   class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
    if (FieldType::is_array(class_name)) {
!     return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
    } else if (FieldType::is_obj(class_name)) {
      ResourceMark rm(THREAD);
      // Ignore wrapping L and ;.
      TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
                                     class_name->utf8_length() - 2, CHECK_NULL);
!     return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
    } else {
!     return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
    }
  }
  
  Klass* SystemDictionary::resolve_or_null(Symbol* class_name, TRAPS) {
    return resolve_or_null(class_name, Handle(), Handle(), THREAD);