src/hotspot/share/classfile/klassFactory.cpp
author iklam
Fri, 29 Mar 2019 08:42:32 -0700
changeset 54340 2221f042556d
parent 53884 1a7b57d02107
child 54927 1512d88b24c6
permissions -rw-r--r--
8221351: Crash in KlassFactory::check_shared_class_file_load_hook Reviewed-by: dholmes, ccheung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     1
/*
53884
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
     2
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     3
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     4
*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     5
* This code is free software; you can redistribute it and/or modify it
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     6
* under the terms of the GNU General Public License version 2 only, as
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     7
* published by the Free Software Foundation.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     8
*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
     9
* This code is distributed in the hope that it will be useful, but WITHOUT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    10
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    11
* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    12
* version 2 for more details (a copy is included in the LICENSE file that
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    13
* accompanied this code).
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    14
*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    15
* You should have received a copy of the GNU General Public License version
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    16
* 2 along with this work; if not, write to the Free Software Foundation,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    17
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    18
*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    19
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    20
* or visit www.oracle.com if you need additional information or have any
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    21
* questions.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    22
*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    23
*/
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    24
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    25
#include "precompiled.hpp"
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    26
#include "classfile/classFileParser.hpp"
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    27
#include "classfile/classFileStream.hpp"
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    28
#include "classfile/classLoader.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    29
#include "classfile/classLoaderData.hpp"
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    30
#include "classfile/classLoaderData.inline.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    31
#include "classfile/klassFactory.hpp"
50039
9fec54fe663d 8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents: 49739
diff changeset
    32
#include "memory/filemap.hpp"
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    33
#include "memory/metaspaceShared.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    34
#include "memory/resourceArea.hpp"
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    35
#include "prims/jvmtiEnvBase.hpp"
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    36
#include "prims/jvmtiRedefineClasses.hpp"
49480
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 47991
diff changeset
    37
#include "runtime/handles.inline.hpp"
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50039
diff changeset
    38
#include "utilities/macros.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50039
diff changeset
    39
#if INCLUDE_JFR
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50039
diff changeset
    40
#include "jfr/support/jfrKlassExtension.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50039
diff changeset
    41
#endif
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50039
diff changeset
    42
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
    43
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    44
// called during initial loading of a shared class
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    45
InstanceKlass* KlassFactory::check_shared_class_file_load_hook(
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    46
                                          InstanceKlass* ik,
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    47
                                          Symbol* class_name,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    48
                                          Handle class_loader,
53884
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    49
                                          Handle protection_domain,
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    50
                                          const ClassFileStream *cfs,
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    51
                                          TRAPS) {
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    52
#if INCLUDE_CDS && INCLUDE_JVMTI
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    53
  assert(ik != NULL, "sanity");
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    54
  assert(ik->is_shared(), "expecting a shared class");
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    55
  if (JvmtiExport::should_post_class_file_load_hook()) {
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    56
    assert(THREAD->is_Java_thread(), "must be JavaThread");
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    57
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    58
    // Post the CFLH
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    59
    JvmtiCachedClassFileData* cached_class_file = NULL;
53884
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    60
    if (cfs == NULL) {
54340
2221f042556d 8221351: Crash in KlassFactory::check_shared_class_file_load_hook
iklam
parents: 53884
diff changeset
    61
      cfs = FileMapInfo::open_stream_for_jvmti(ik, class_loader, CHECK_NULL);
53884
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    62
    }
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    63
    unsigned char* ptr = (unsigned char*)cfs->buffer();
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    64
    unsigned char* end_ptr = ptr + cfs->length();
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    65
    unsigned char* old_ptr = ptr;
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    66
    JvmtiExport::post_class_file_load_hook(class_name,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    67
                                           class_loader,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    68
                                           protection_domain,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    69
                                           &ptr,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    70
                                           &end_ptr,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    71
                                           &cached_class_file);
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    72
    if (old_ptr != ptr) {
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    73
      // JVMTI agent has modified class file data.
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    74
      // Set new class file stream using JVMTI agent modified class file data.
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    75
      ClassLoaderData* loader_data =
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    76
        ClassLoaderData::class_loader_data(class_loader());
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    77
      int path_index = ik->shared_classpath_index();
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    78
      ClassFileStream* stream = new ClassFileStream(ptr,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    79
                                                    end_ptr - ptr,
53884
1a7b57d02107 8218751: Do not store original classfiles inside the CDS archive
iklam
parents: 52692
diff changeset
    80
                                                    cfs->source(),
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    81
                                                    ClassFileStream::verify);
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    82
      ClassFileParser parser(stream,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    83
                             class_name,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    84
                             loader_data,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    85
                             protection_domain,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    86
                             NULL,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    87
                             NULL,
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    88
                             ClassFileParser::BROADCAST, // publicity level
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    89
                             CHECK_NULL);
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    90
      InstanceKlass* new_ik = parser.create_instance_klass(true /* changed_by_loadhook */,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
    91
                                                           CHECK_NULL);
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    92
      if (cached_class_file != NULL) {
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    93
        new_ik->set_cached_class_file(cached_class_file);
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    94
      }
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    95
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    96
      if (class_loader.is_null()) {
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    97
        ResourceMark rm;
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    98
        ClassLoader::add_package(class_name->as_C_string(), path_index, THREAD);
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
    99
      }
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   100
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   101
      return new_ik;
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   102
    }
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   103
  }
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   104
#endif
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   105
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   106
  return NULL;
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   107
}
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   108
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   109
40658
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   110
static ClassFileStream* check_class_file_load_hook(ClassFileStream* stream,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   111
                                                   Symbol* name,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   112
                                                   ClassLoaderData* loader_data,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   113
                                                   Handle protection_domain,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   114
                                                   JvmtiCachedClassFileData** cached_class_file,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   115
                                                   TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   116
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   117
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   118
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   119
  if (JvmtiExport::should_post_class_file_load_hook()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   120
    assert(THREAD->is_Java_thread(), "must be a JavaThread");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   121
    const JavaThread* jt = (JavaThread*)THREAD;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   122
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   123
    Handle class_loader(THREAD, loader_data->class_loader());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   124
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   125
    // Get the cached class file bytes (if any) from the class that
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   126
    // is being redefined or retransformed. We use jvmti_thread_state()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   127
    // instead of JvmtiThreadState::state_for(jt) so we don't allocate
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   128
    // a JvmtiThreadState any earlier than necessary. This will help
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   129
    // avoid the bug described by 7126851.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   130
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   131
    JvmtiThreadState* state = jt->jvmti_thread_state();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   132
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   133
    if (state != NULL) {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   134
      Klass* k = state->get_class_being_redefined();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   135
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   136
      if (k != NULL) {
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   137
        InstanceKlass* class_being_redefined = InstanceKlass::cast(k);
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   138
        *cached_class_file = class_being_redefined->get_cached_class_file();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   139
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   140
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   141
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   142
    unsigned char* ptr = const_cast<unsigned char*>(stream->buffer());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   143
    unsigned char* end_ptr = ptr + stream->length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   144
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   145
    JvmtiExport::post_class_file_load_hook(name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   146
                                           class_loader,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   147
                                           protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   148
                                           &ptr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   149
                                           &end_ptr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   150
                                           cached_class_file);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   151
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   152
    if (ptr != stream->buffer()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   153
      // JVMTI agent has modified class file data.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   154
      // Set new class file stream using JVMTI agent modified class file data.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   155
      stream = new ClassFileStream(ptr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   156
                                   end_ptr - ptr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   157
                                   stream->source(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   158
                                   stream->need_verify());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   159
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   160
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   161
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   162
  return stream;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   163
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   164
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   165
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   166
InstanceKlass* KlassFactory::create_from_stream(ClassFileStream* stream,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   167
                                                Symbol* name,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   168
                                                ClassLoaderData* loader_data,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   169
                                                Handle protection_domain,
51444
3e5d28e6de32 8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents: 50785
diff changeset
   170
                                                const InstanceKlass* unsafe_anonymous_host,
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   171
                                                GrowableArray<Handle>* cp_patches,
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   172
                                                TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   173
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   174
  assert(loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   175
  assert(THREAD->is_Java_thread(), "must be a JavaThread");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   176
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   177
  ResourceMark rm;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   178
  HandleMark hm;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   179
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   180
  JvmtiCachedClassFileData* cached_class_file = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   181
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36386
diff changeset
   182
  ClassFileStream* old_stream = stream;
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36386
diff changeset
   183
50785
d1b24f2ceca5 8200720: Print additional information in thread dump (times, allocated bytes etc.)
ghaug
parents: 50113
diff changeset
   184
  // increment counter
d1b24f2ceca5 8200720: Print additional information in thread dump (times, allocated bytes etc.)
ghaug
parents: 50113
diff changeset
   185
  THREAD->statistical_info().incr_define_class_count();
d1b24f2ceca5 8200720: Print additional information in thread dump (times, allocated bytes etc.)
ghaug
parents: 50113
diff changeset
   186
40658
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   187
  // Skip this processing for VM anonymous classes
51444
3e5d28e6de32 8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents: 50785
diff changeset
   188
  if (unsafe_anonymous_host == NULL) {
40658
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   189
    stream = check_class_file_load_hook(stream,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   190
                                        name,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   191
                                        loader_data,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   192
                                        protection_domain,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   193
                                        &cached_class_file,
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   194
                                        CHECK_NULL);
50dd5daad1e6 8163973: VM Anonymous classes should not call Class File Load Hooks
rprotacio
parents: 40016
diff changeset
   195
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   196
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   197
  ClassFileParser parser(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   198
                         name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   199
                         loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   200
                         protection_domain,
51444
3e5d28e6de32 8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents: 50785
diff changeset
   201
                         unsafe_anonymous_host,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   202
                         cp_patches,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   203
                         ClassFileParser::BROADCAST, // publicity level
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   204
                         CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   205
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   206
  InstanceKlass* result = parser.create_instance_klass(old_stream != stream, CHECK_NULL);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36386
diff changeset
   207
  assert(result == parser.create_instance_klass(old_stream != stream, THREAD), "invariant");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   208
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 42650
diff changeset
   209
  if (result == NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   210
    return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   211
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   212
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   213
  if (cached_class_file != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   214
    // JVMTI: we have an InstanceKlass now, tell it about the cached bytes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   215
    result->set_cached_class_file(cached_class_file);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   216
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   217
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50039
diff changeset
   218
  JFR_ONLY(ON_KLASS_CREATION(result, parser, THREAD);)
36386
d7f5e6df26df 8147442: Event-based tracing to allow for tracing Klass creation
mgronlun
parents: 34666
diff changeset
   219
47103
a993ec29ec75 8186842: Use Java class loaders for creating the CDS archive
ccheung
parents: 46746
diff changeset
   220
#if INCLUDE_CDS
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   221
  if (DumpSharedSpaces) {
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents: 49480
diff changeset
   222
    ClassLoader::record_result(result, stream, THREAD);
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   223
  }
47103
a993ec29ec75 8186842: Use Java class loaders for creating the CDS archive
ccheung
parents: 46746
diff changeset
   224
#endif // INCLUDE_CDS
41182
dbd59c1da636 8078644: CDS needs to support JVMTI CFLH
jiangli
parents: 40923
diff changeset
   225
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   226
  return result;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents:
diff changeset
   227
}