hotspot/src/share/vm/classfile/classFileParser.cpp
author bobv
Fri, 24 Feb 2017 12:41:26 -0500
changeset 46289 1904e7ec236e
parent 43177 2158f6c730aa
parent 46271 979ebd346ecf
child 46301 57f01b1bd33c
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
     2
 * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
5547
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 5426
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 5426
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 5426
diff changeset
    21
 * questions.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    24
#include "precompiled.hpp"
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
    25
#include "aot/aotLoader.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    26
#include "classfile/classFileParser.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    27
#include "classfile/classFileStream.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    28
#include "classfile/classLoader.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    29
#include "classfile/classLoaderData.inline.hpp"
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
    30
#include "classfile/defaultMethods.hpp"
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
    31
#include "classfile/dictionary.hpp"
29081
c61eb4914428 8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents: 28817
diff changeset
    32
#include "classfile/javaClasses.inline.hpp"
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
    33
#include "classfile/moduleEntry.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    34
#include "classfile/symbolTable.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    35
#include "classfile/systemDictionary.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    36
#include "classfile/verificationType.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    37
#include "classfile/verifier.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    38
#include "classfile/vmSymbols.hpp"
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 30136
diff changeset
    39
#include "gc/shared/gcLocker.hpp"
35917
463d67f86eaa 8079408: Reimplement TraceClassLoading, TraceClassUnloading, and TraceClassLoaderData with Unified Logging.
mockner
parents: 35911
diff changeset
    40
#include "logging/log.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    41
#include "memory/allocation.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    42
#include "memory/metadataFactory.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    43
#include "memory/oopFactory.hpp"
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
    44
#include "memory/resourceArea.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    45
#include "memory/universe.inline.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    46
#include "oops/annotations.hpp"
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
    47
#include "oops/fieldStreams.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    48
#include "oops/instanceKlass.hpp"
8725
8c1e3dd5fe1b 7017732: move static fields into Class to prepare for perm gen removal
never
parents: 8676
diff changeset
    49
#include "oops/instanceMirrorKlass.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    50
#include "oops/klass.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    51
#include "oops/klassVtable.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    52
#include "oops/metadata.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    53
#include "oops/method.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    54
#include "oops/oop.inline.hpp"
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
    55
#include "oops/symbol.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    56
#include "prims/jvm.h"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    57
#include "prims/jvmtiExport.hpp"
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
    58
#include "prims/jvmtiThreadState.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    59
#include "runtime/javaCalls.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    60
#include "runtime/perfData.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    61
#include "runtime/reflection.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    62
#include "runtime/signature.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    63
#include "runtime/timer.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    64
#include "services/classLoadingService.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    65
#include "services/threadService.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    66
#include "trace/traceMacros.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    67
#include "utilities/array.hpp"
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 30136
diff changeset
    68
#include "utilities/exceptions.hpp"
15194
a35093d73168 8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents: 15185
diff changeset
    69
#include "utilities/globalDefinitions.hpp"
27683
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    70
#include "utilities/macros.hpp"
26135
82b516c550f7 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 25507
diff changeset
    71
#include "utilities/ostream.hpp"
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
    72
#include "utilities/resourceHash.hpp"
27683
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    73
#if INCLUDE_CDS
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    74
#include "classfile/systemDictionaryShared.hpp"
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    75
#endif
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    76
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
    77
// We generally try to create the oops directly when parsing, rather than
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
    78
// allocating temporary data structures and copying the bytes twice. A
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
    79
// temporary area is only needed when parsing utf8 entries in the constant
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
    80
// pool and when parsing line number tables.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    81
489c9b5090e2 Initial load
duke
parents:
diff changeset
    82
// We add assert in debug mode when class format is not checked.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    83
489c9b5090e2 Initial load
duke
parents:
diff changeset
    84
#define JAVA_CLASSFILE_MAGIC              0xCAFEBABE
489c9b5090e2 Initial load
duke
parents:
diff changeset
    85
#define JAVA_MIN_SUPPORTED_VERSION        45
35941
be5a3f551026 8148785: Update class file version to 53 for JDK-9
hseigel
parents: 35917
diff changeset
    86
#define JAVA_MAX_SUPPORTED_VERSION        53
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    87
#define JAVA_MAX_SUPPORTED_MINOR_VERSION  0
489c9b5090e2 Initial load
duke
parents:
diff changeset
    88
489c9b5090e2 Initial load
duke
parents:
diff changeset
    89
// Used for two backward compatibility reasons:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
// - to check for new additions to the class file format in JDK1.5
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
// - to check for bug fixes in the format checker in JDK1.5
489c9b5090e2 Initial load
duke
parents:
diff changeset
    92
#define JAVA_1_5_VERSION                  49
489c9b5090e2 Initial load
duke
parents:
diff changeset
    93
489c9b5090e2 Initial load
duke
parents:
diff changeset
    94
// Used for backward compatibility reasons:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    95
// - to check for javac bug fixes that happened after 1.5
602
92e03692ddd6 6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents: 383
diff changeset
    96
// - also used as the max version when running in jdk6
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    97
#define JAVA_6_VERSION                    50
489c9b5090e2 Initial load
duke
parents:
diff changeset
    98
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
    99
// Used for backward compatibility reasons:
33799
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
   100
// - to disallow argument and require ACC_STATIC for <clinit> methods
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   101
#define JAVA_7_VERSION                    51
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   102
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   103
// Extension method support.
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   104
#define JAVA_8_VERSION                    52
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   105
35941
be5a3f551026 8148785: Update class file version to 53 for JDK-9
hseigel
parents: 35917
diff changeset
   106
#define JAVA_9_VERSION                    53
be5a3f551026 8148785: Update class file version to 53 for JDK-9
hseigel
parents: 35917
diff changeset
   107
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   108
void ClassFileParser::parse_constant_pool_entries(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   109
                                                  ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   110
                                                  const int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   111
                                                  TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   112
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   113
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   114
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   115
  // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize
489c9b5090e2 Initial load
duke
parents:
diff changeset
   116
  // this function (_current can be allocated in a register, with scalar
489c9b5090e2 Initial load
duke
parents:
diff changeset
   117
  // replacement of aggregates). The _current pointer is copied back to
489c9b5090e2 Initial load
duke
parents:
diff changeset
   118
  // stream() when this function returns. DON'T call another method within
489c9b5090e2 Initial load
duke
parents:
diff changeset
   119
  // this method that uses stream().
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   120
  const ClassFileStream cfs1 = *stream;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   121
  const ClassFileStream* const cfs = &cfs1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   122
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   123
  assert(cfs->allocated_on_stack(), "should be local");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   124
  debug_only(const u1* const old_current = stream->current();)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
  // Used for batching symbol allocations.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   127
  const char* names[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   128
  int lengths[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
  int indices[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
  unsigned int hashValues[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
  int names_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
489c9b5090e2 Initial load
duke
parents:
diff changeset
   133
  // parsing  Index 0 is unused
489c9b5090e2 Initial load
duke
parents:
diff changeset
   134
  for (int index = 1; index < length; index++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   135
    // Each of the following case guarantees one more byte in the stream
489c9b5090e2 Initial load
duke
parents:
diff changeset
   136
    // for the following tag or the access_flags following constant pool,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   137
    // so we don't need bounds-check for reading tag.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   138
    const u1 tag = cfs->get_u1_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   139
    switch (tag) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   140
      case JVM_CONSTANT_Class : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   141
        cfs->guarantee_more(3, CHECK);  // name_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   142
        const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   143
        cp->klass_index_at_put(index, name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   144
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   145
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   146
      case JVM_CONSTANT_Fieldref: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   147
        cfs->guarantee_more(5, CHECK);  // class_index, name_and_type_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   148
        const u2 class_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   149
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   150
        cp->field_at_put(index, class_index, name_and_type_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   152
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   153
      case JVM_CONSTANT_Methodref: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   154
        cfs->guarantee_more(5, CHECK);  // class_index, name_and_type_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   155
        const u2 class_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   156
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   157
        cp->method_at_put(index, class_index, name_and_type_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   158
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   159
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   160
      case JVM_CONSTANT_InterfaceMethodref: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   161
        cfs->guarantee_more(5, CHECK);  // class_index, name_and_type_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   162
        const u2 class_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   163
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   164
        cp->interface_method_at_put(index, class_index, name_and_type_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   165
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   166
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   167
      case JVM_CONSTANT_String : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   168
        cfs->guarantee_more(3, CHECK);  // string_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   169
        const u2 string_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   170
        cp->string_index_at_put(index, string_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   171
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   172
      }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   173
      case JVM_CONSTANT_MethodHandle :
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   174
      case JVM_CONSTANT_MethodType: {
8675
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   175
        if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   176
          classfile_parse_error(
8675
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   177
            "Class file version does not support constant tag %u in class file %s",
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   178
            tag, CHECK);
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   179
        }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   180
        if (tag == JVM_CONSTANT_MethodHandle) {
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   181
          cfs->guarantee_more(4, CHECK);  // ref_kind, method_index, tag/access_flags
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   182
          const u1 ref_kind = cfs->get_u1_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   183
          const u2 method_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   184
          cp->method_handle_index_at_put(index, ref_kind, method_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   185
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   186
        else if (tag == JVM_CONSTANT_MethodType) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   187
          cfs->guarantee_more(3, CHECK);  // signature_index, tag/access_flags
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   188
          const u2 signature_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   189
          cp->method_type_index_at_put(index, signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   190
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   191
        else {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   192
          ShouldNotReachHere();
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   193
        }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   194
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   195
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   196
      case JVM_CONSTANT_InvokeDynamic : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   197
        if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   198
          classfile_parse_error(
8675
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   199
              "Class file version does not support constant tag %u in class file %s",
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   200
              tag, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   201
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   202
        cfs->guarantee_more(5, CHECK);  // bsm_index, nt, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   203
        const u2 bootstrap_specifier_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   204
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   205
        if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   206
          _max_bootstrap_specifier_index = (int) bootstrap_specifier_index;  // collect for later
6062
bab93afe9df7 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 5888
diff changeset
   207
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   208
        cp->invoke_dynamic_at_put(index, bootstrap_specifier_index, name_and_type_index);
6062
bab93afe9df7 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 5888
diff changeset
   209
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   210
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   211
      case JVM_CONSTANT_Integer: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   212
        cfs->guarantee_more(5, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   213
        const u4 bytes = cfs->get_u4_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   214
        cp->int_at_put(index, (jint)bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   215
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   216
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   217
      case JVM_CONSTANT_Float: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   218
        cfs->guarantee_more(5, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   219
        const u4 bytes = cfs->get_u4_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   220
        cp->float_at_put(index, *(jfloat*)&bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   221
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   222
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   223
      case JVM_CONSTANT_Long: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   224
        // A mangled type might cause you to overrun allocated memory
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   225
        guarantee_property(index + 1 < length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   226
                           "Invalid constant pool entry %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   227
                           index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   228
                           CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   229
        cfs->guarantee_more(9, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   230
        const u8 bytes = cfs->get_u8_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   231
        cp->long_at_put(index, bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   232
        index++;   // Skip entry following eigth-byte constant, see JVM book p. 98
489c9b5090e2 Initial load
duke
parents:
diff changeset
   233
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   234
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   235
      case JVM_CONSTANT_Double: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   236
        // A mangled type might cause you to overrun allocated memory
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
        guarantee_property(index+1 < length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
                           "Invalid constant pool entry %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   239
                           index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   240
                           CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   241
        cfs->guarantee_more(9, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   242
        const u8 bytes = cfs->get_u8_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   243
        cp->double_at_put(index, *(jdouble*)&bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
        index++;   // Skip entry following eigth-byte constant, see JVM book p. 98
489c9b5090e2 Initial load
duke
parents:
diff changeset
   245
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   246
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   247
      case JVM_CONSTANT_NameAndType: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   248
        cfs->guarantee_more(5, CHECK);  // name_index, signature_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   249
        const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   250
        const u2 signature_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   251
        cp->name_and_type_at_put(index, name_index, signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   252
        break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   253
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   254
      case JVM_CONSTANT_Utf8 : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   255
        cfs->guarantee_more(2, CHECK);  // utf8_length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   256
        u2  utf8_length = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   257
        const u1* utf8_buffer = cfs->get_u1_buffer();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   258
        assert(utf8_buffer != NULL, "null utf8 buffer");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   259
        // Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   260
        cfs->guarantee_more(utf8_length+1, CHECK);  // utf8 string, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   261
        cfs->skip_u1_fast(utf8_length);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   262
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   263
        // Before storing the symbol, make sure it's legal
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   264
        if (_need_verify) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   265
          verify_legal_utf8(utf8_buffer, utf8_length, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   266
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   267
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   268
        if (has_cp_patch_at(index)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   269
          Handle patch = clear_cp_patch_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   270
          guarantee_property(java_lang_String::is_instance(patch()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   271
                             "Illegal utf8 patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   272
                             index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   273
                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   274
          const char* const str = java_lang_String::as_utf8_string(patch());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   275
          // (could use java_lang_String::as_symbol instead, but might as well batch them)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   276
          utf8_buffer = (const u1*) str;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   277
          utf8_length = (int) strlen(str);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   278
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   279
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   280
        unsigned int hash;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   281
        Symbol* const result = SymbolTable::lookup_only((const char*)utf8_buffer,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   282
                                                        utf8_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   283
                                                        hash);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   284
        if (result == NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   285
          names[names_count] = (const char*)utf8_buffer;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   286
          lengths[names_count] = utf8_length;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   287
          indices[names_count] = index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   288
          hashValues[names_count++] = hash;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   289
          if (names_count == SymbolTable::symbol_alloc_batch_size) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   290
            SymbolTable::new_symbols(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   291
                                     cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   292
                                     names_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   293
                                     names,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   294
                                     lengths,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   295
                                     indices,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   296
                                     hashValues,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   297
                                     CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   298
            names_count = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   299
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   300
        } else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   301
          cp->symbol_at_put(index, result);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   302
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   303
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   304
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   305
      default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   306
        classfile_parse_error("Unknown constant tag %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   307
                              tag,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   308
                              CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   309
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   310
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   311
    } // end of switch(tag)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   312
  } // end of for
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   313
489c9b5090e2 Initial load
duke
parents:
diff changeset
   314
  // Allocate the remaining symbols
489c9b5090e2 Initial load
duke
parents:
diff changeset
   315
  if (names_count > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   316
    SymbolTable::new_symbols(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   317
                             cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   318
                             names_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   319
                             names,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   320
                             lengths,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   321
                             indices,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   322
                             hashValues,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   323
                             CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   324
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   325
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   326
  // Copy _current pointer of local copy back to stream.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   327
  assert(stream->current() == old_current, "non-exclusive use of stream");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   328
  stream->set_current(cfs1.current());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   329
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   330
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   331
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   332
static inline bool valid_cp_range(int index, int length) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   333
  return (index > 0 && index < length);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   334
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   335
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   336
static inline Symbol* check_symbol_at(const ConstantPool* cp, int index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   337
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   338
  if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8()) {
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
   339
    return cp->symbol_at(index);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   340
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   341
  return NULL;
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
   342
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
   343
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
   344
#ifdef ASSERT
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   345
PRAGMA_DIAG_PUSH
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   346
PRAGMA_FORMAT_NONLITERAL_IGNORED
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   347
void ClassFileParser::report_assert_property_failure(const char* msg, TRAPS) const {
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   348
  ResourceMark rm(THREAD);
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32824
diff changeset
   349
  fatal(msg, _class_name->as_C_string());
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   350
}
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   351
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   352
void ClassFileParser::report_assert_property_failure(const char* msg,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   353
                                                     int index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   354
                                                     TRAPS) const {
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   355
  ResourceMark rm(THREAD);
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32824
diff changeset
   356
  fatal(msg, index, _class_name->as_C_string());
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   357
}
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   358
PRAGMA_DIAG_POP
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
   359
#endif
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   360
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   361
void ClassFileParser::parse_constant_pool(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   362
                                          ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   363
                                          const int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   364
                                          TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   365
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   366
  assert(stream != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   367
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
  // parsing constant pool entries
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   369
  parse_constant_pool_entries(stream, cp, length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   370
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
  int index = 1;  // declared outside of loops for portability
489c9b5090e2 Initial load
duke
parents:
diff changeset
   372
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   373
  // first verification pass - validate cross references
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   374
  // and fixup class and string constants
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   375
  for (index = 1; index < length; index++) {          // Index 0 is unused
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   376
    const jbyte tag = cp->tag_at(index).value();
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
   377
    switch (tag) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   378
      case JVM_CONSTANT_Class: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   379
        ShouldNotReachHere();     // Only JVM_CONSTANT_ClassIndex should be present
489c9b5090e2 Initial load
duke
parents:
diff changeset
   380
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   381
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   382
      case JVM_CONSTANT_Fieldref:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   383
        // fall through
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   384
      case JVM_CONSTANT_Methodref:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   385
        // fall through
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   386
      case JVM_CONSTANT_InterfaceMethodref: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   387
        if (!_need_verify) break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   388
        const int klass_ref_index = cp->klass_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   389
        const int name_and_type_ref_index = cp->name_and_type_ref_index_at(index);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   390
        check_property(valid_klass_reference_at(klass_ref_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   391
                       "Invalid constant pool index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   392
                       klass_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   393
        check_property(valid_cp_range(name_and_type_ref_index, length) &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   394
          cp->tag_at(name_and_type_ref_index).is_name_and_type(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   395
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   396
          name_and_type_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   397
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   398
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   399
      case JVM_CONSTANT_String: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   400
        ShouldNotReachHere();     // Only JVM_CONSTANT_StringIndex should be present
489c9b5090e2 Initial load
duke
parents:
diff changeset
   401
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   402
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   403
      case JVM_CONSTANT_Integer:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   404
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   405
      case JVM_CONSTANT_Float:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   406
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   407
      case JVM_CONSTANT_Long:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   408
      case JVM_CONSTANT_Double: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   409
        index++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   410
        check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
   411
          (index < length && cp->tag_at(index).is_invalid()),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   412
          "Improper constant pool long/double index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   413
          index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   414
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   415
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   416
      case JVM_CONSTANT_NameAndType: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   417
        if (!_need_verify) break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   418
        const int name_ref_index = cp->name_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   419
        const int signature_ref_index = cp->signature_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   420
        check_property(valid_symbol_at(name_ref_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   421
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   422
          name_ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   423
        check_property(valid_symbol_at(signature_ref_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   424
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   425
          signature_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   426
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   427
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   428
      case JVM_CONSTANT_Utf8:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   429
        break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   430
      case JVM_CONSTANT_UnresolvedClass:         // fall-through
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   431
      case JVM_CONSTANT_UnresolvedClassInError: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   432
        ShouldNotReachHere();     // Only JVM_CONSTANT_ClassIndex should be present
489c9b5090e2 Initial load
duke
parents:
diff changeset
   433
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   434
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   435
      case JVM_CONSTANT_ClassIndex: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   436
        const int class_index = cp->klass_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   437
        check_property(valid_symbol_at(class_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   438
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   439
          class_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   440
        cp->unresolved_klass_at_put(index, cp->symbol_at(class_index));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   441
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   442
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   443
      case JVM_CONSTANT_StringIndex: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   444
        const int string_index = cp->string_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   445
        check_property(valid_symbol_at(string_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   446
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   447
          string_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   448
        Symbol* const sym = cp->symbol_at(string_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   449
        cp->unresolved_string_at_put(index, sym);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   450
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   451
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   452
      case JVM_CONSTANT_MethodHandle: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   453
        const int ref_index = cp->method_handle_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   454
        check_property(valid_cp_range(ref_index, length),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   455
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   456
          ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   457
        const constantTag tag = cp->tag_at(ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   458
        const int ref_kind = cp->method_handle_ref_kind_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   459
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   460
        switch (ref_kind) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   461
          case JVM_REF_getField:
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   462
          case JVM_REF_getStatic:
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   463
          case JVM_REF_putField:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   464
          case JVM_REF_putStatic: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   465
            check_property(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   466
              tag.is_field(),
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   467
              "Invalid constant pool index %u in class file %s (not a field)",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   468
              ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   469
            break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   470
          }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   471
          case JVM_REF_invokeVirtual:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   472
          case JVM_REF_newInvokeSpecial: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   473
            check_property(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   474
              tag.is_method(),
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   475
              "Invalid constant pool index %u in class file %s (not a method)",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   476
              ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   477
            break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   478
          }
17024
49cbeca23983 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 16692
diff changeset
   479
          case JVM_REF_invokeStatic:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   480
          case JVM_REF_invokeSpecial: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   481
            check_property(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   482
              tag.is_method() ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   483
              ((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   484
              "Invalid constant pool index %u in class file %s (not a method)",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   485
              ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   486
            break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   487
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   488
          case JVM_REF_invokeInterface: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   489
            check_property(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   490
              tag.is_interface_method(),
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   491
              "Invalid constant pool index %u in class file %s (not an interface method)",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   492
              ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   493
            break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   494
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   495
          default: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   496
            classfile_parse_error(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   497
              "Bad method handle kind at constant pool index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   498
              index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   499
          }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   500
        } // switch(refkind)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   501
        // Keep the ref_index unchanged.  It will be indirected at link-time.
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   502
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   503
      } // case MethodHandle
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   504
      case JVM_CONSTANT_MethodType: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   505
        const int ref_index = cp->method_type_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   506
        check_property(valid_symbol_at(ref_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   507
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   508
          ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   509
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   510
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   511
      case JVM_CONSTANT_InvokeDynamic: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   512
        const int name_and_type_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   513
          cp->invoke_dynamic_name_and_type_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   514
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   515
        check_property(valid_cp_range(name_and_type_ref_index, length) &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   516
          cp->tag_at(name_and_type_ref_index).is_name_and_type(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   517
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   518
          name_and_type_ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   519
        // bootstrap specifier index must be checked later,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   520
        // when BootstrapMethods attr is available
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   521
        break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   522
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   523
      default: {
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32824
diff changeset
   524
        fatal("bad constant pool tag value %u", cp->tag_at(index).value());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   525
        ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   526
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   527
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   528
    } // switch(tag)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   529
  } // end of for
489c9b5090e2 Initial load
duke
parents:
diff changeset
   530
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   531
  if (_cp_patches != NULL) {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   532
    // need to treat this_class specially...
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   533
    int this_class_index;
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   534
    {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   535
      stream->guarantee_more(8, CHECK);  // flags, this_class, super_class, infs_len
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   536
      const u1* const mark = stream->current();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   537
      stream->skip_u2_fast(1); // skip flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   538
      this_class_index = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   539
      stream->set_current(mark);  // revert to mark
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   540
    }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   541
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   542
    for (index = 1; index < length; index++) {          // Index 0 is unused
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   543
      if (has_cp_patch_at(index)) {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   544
        guarantee_property(index != this_class_index,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   545
          "Illegal constant pool patch to self at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   546
          index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   547
        patch_constant_pool(cp, index, cp_patch_at(index), CHECK);
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   548
      }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   549
    }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   550
  }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   551
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   552
  if (!_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   553
    return;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   554
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   555
489c9b5090e2 Initial load
duke
parents:
diff changeset
   556
  // second verification pass - checks the strings are of the right format.
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   557
  // but not yet to the other entries
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   558
  for (index = 1; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   559
    const jbyte tag = cp->tag_at(index).value();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   560
    switch (tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   561
      case JVM_CONSTANT_UnresolvedClass: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   562
        const Symbol* const class_name = cp->klass_name_at(index);
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   563
        // check the name, even if _cp_patches will overwrite it
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   564
        verify_legal_class_name(class_name, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   565
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   566
      }
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   567
      case JVM_CONSTANT_NameAndType: {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   568
        if (_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   569
          const int sig_index = cp->signature_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   570
          const int name_index = cp->name_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   571
          const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   572
          const Symbol* const sig = cp->symbol_at(sig_index);
35218
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   573
          guarantee_property(sig->utf8_length() != 0,
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   574
            "Illegal zero length constant pool entry at %d in class %s",
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   575
            sig_index, CHECK);
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   576
          guarantee_property(name->utf8_length() != 0,
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   577
            "Illegal zero length constant pool entry at %d in class %s",
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   578
            name_index, CHECK);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   579
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   580
          if (sig->byte_at(0) == JVM_SIGNATURE_FUNC) {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   581
            // Format check method name and signature
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   582
            verify_legal_method_name(name, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   583
            verify_legal_method_signature(name, sig, CHECK);
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   584
          } else {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   585
            // Format check field name and signature
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   586
            verify_legal_field_name(name, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   587
            verify_legal_field_signature(name, sig, CHECK);
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   588
          }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   589
        }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   590
        break;
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   591
      }
9117
30d757743e56 7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents: 9116
diff changeset
   592
      case JVM_CONSTANT_InvokeDynamic:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   593
      case JVM_CONSTANT_Fieldref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   594
      case JVM_CONSTANT_Methodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   595
      case JVM_CONSTANT_InterfaceMethodref: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   596
        const int name_and_type_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   597
          cp->name_and_type_ref_index_at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   598
        // already verified to be utf8
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   599
        const int name_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   600
          cp->name_ref_index_at(name_and_type_ref_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   601
        // already verified to be utf8
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   602
        const int signature_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   603
          cp->signature_ref_index_at(name_and_type_ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   604
        const Symbol* const name = cp->symbol_at(name_ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   605
        const Symbol* const signature = cp->symbol_at(signature_ref_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   606
        if (tag == JVM_CONSTANT_Fieldref) {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   607
          if (_need_verify) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   608
            // Field name and signature are verified above, when iterating NameAndType_info.
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   609
            // Need only to be sure signature is non-zero length and the right type.
35218
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   610
            if (signature->utf8_length() == 0 ||
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   611
                signature->byte_at(0) == JVM_SIGNATURE_FUNC) {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   612
              throwIllegalSignature("Field", name, signature, CHECK);
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   613
            }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   614
          }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   615
        } else {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   616
          if (_need_verify) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   617
            // Method name and signature are verified above, when iterating NameAndType_info.
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   618
            // Need only to be sure signature is non-zero length and the right type.
35218
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   619
            if (signature->utf8_length() == 0 ||
00aa934a1a20 8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents: 35071
diff changeset
   620
                signature->byte_at(0) != JVM_SIGNATURE_FUNC) {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   621
              throwIllegalSignature("Method", name, signature, CHECK);
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   622
            }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   623
          }
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   624
          // 4509014: If a class method name begins with '<', it must be "<init>"
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   625
          const unsigned int name_len = name->utf8_length();
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   626
          if (tag == JVM_CONSTANT_Methodref &&
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   627
              name_len != 0 &&
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   628
              name->byte_at(0) == '<' &&
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   629
              name != vmSymbols::object_initializer_name()) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   630
            classfile_parse_error(
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   631
              "Bad method name at constant pool index %u in class file %s",
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   632
              name_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   633
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   634
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   635
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   636
      }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   637
      case JVM_CONSTANT_MethodHandle: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   638
        const int ref_index = cp->method_handle_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   639
        const int ref_kind = cp->method_handle_ref_kind_at(index);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   640
        switch (ref_kind) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   641
          case JVM_REF_invokeVirtual:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   642
          case JVM_REF_invokeStatic:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   643
          case JVM_REF_invokeSpecial:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   644
          case JVM_REF_newInvokeSpecial: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   645
            const int name_and_type_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   646
              cp->name_and_type_ref_index_at(ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   647
            const int name_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   648
              cp->name_ref_index_at(name_and_type_ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   649
            const Symbol* const name = cp->symbol_at(name_ref_index);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   650
            if (ref_kind == JVM_REF_newInvokeSpecial) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   651
              if (name != vmSymbols::object_initializer_name()) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   652
                classfile_parse_error(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   653
                  "Bad constructor name at constant pool index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   654
                    name_ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   655
              }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   656
            } else {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   657
              if (name == vmSymbols::object_initializer_name()) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   658
                classfile_parse_error(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   659
                  "Bad method name at constant pool index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   660
                  name_ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   661
              }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   662
            }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   663
            break;
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   664
          }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   665
          // Other ref_kinds are already fully checked in previous pass.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   666
        } // switch(ref_kind)
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   667
        break;
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   668
      }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   669
      case JVM_CONSTANT_MethodType: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   670
        const Symbol* const no_name = vmSymbols::type_name(); // place holder
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   671
        const Symbol* const signature = cp->method_type_signature_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   672
        verify_legal_method_signature(no_name, signature, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   673
        break;
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   674
      }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   675
      case JVM_CONSTANT_Utf8: {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   676
        assert(cp->symbol_at(index)->refcount() != 0, "count corrupted");
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   677
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   678
    }  // switch(tag)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   679
  }  // end of for
489c9b5090e2 Initial load
duke
parents:
diff changeset
   680
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   681
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   682
void ClassFileParser::patch_constant_pool(ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   683
                                          int index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   684
                                          Handle patch,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   685
                                          TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   686
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   687
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   688
  BasicType patch_type = T_VOID;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
   689
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   690
  switch (cp->tag_at(index).value()) {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   691
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   692
    case JVM_CONSTANT_UnresolvedClass: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   693
      // Patching a class means pre-resolving it.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   694
      // The name in the constant pool is ignored.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   695
      if (java_lang_Class::is_instance(patch())) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   696
        guarantee_property(!java_lang_Class::is_primitive(patch()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   697
                           "Illegal class patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   698
                           index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   699
        cp->klass_at_put(index, java_lang_Class::as_Klass(patch()));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   700
      } else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   701
        guarantee_property(java_lang_String::is_instance(patch()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   702
                           "Illegal class patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   703
                           index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   704
        Symbol* const name = java_lang_String::as_symbol(patch(), CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   705
        cp->unresolved_klass_at_put(index, name);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   706
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   707
      break;
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   708
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   709
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   710
    case JVM_CONSTANT_String: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   711
      // skip this patch and don't clear it.  Needs the oop array for resolved
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   712
      // references to be created first.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   713
      return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   714
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   715
    case JVM_CONSTANT_Integer: patch_type = T_INT;    goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   716
    case JVM_CONSTANT_Float:   patch_type = T_FLOAT;  goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   717
    case JVM_CONSTANT_Long:    patch_type = T_LONG;   goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   718
    case JVM_CONSTANT_Double:  patch_type = T_DOUBLE; goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   719
    patch_prim:
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   720
    {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   721
      jvalue value;
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   722
      BasicType value_type = java_lang_boxing_object::get_value(patch(), &value);
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   723
      guarantee_property(value_type == patch_type,
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   724
                         "Illegal primitive patch at %d in class file %s",
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   725
                         index, CHECK);
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   726
      switch (value_type) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   727
        case T_INT:    cp->int_at_put(index,   value.i); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   728
        case T_FLOAT:  cp->float_at_put(index, value.f); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   729
        case T_LONG:   cp->long_at_put(index,  value.j); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   730
        case T_DOUBLE: cp->double_at_put(index, value.d); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   731
        default:       assert(false, "");
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   732
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   733
    } // end patch_prim label
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   734
    break;
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   735
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   736
    default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   737
      // %%% TODO: put method handles into CONSTANT_InterfaceMethodref, etc.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   738
      guarantee_property(!has_cp_patch_at(index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   739
                         "Illegal unexpected patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   740
                         index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   741
      return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   742
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   743
  } // end of switch(tag)
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   744
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   745
  // On fall-through, mark the patch as used.
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   746
  clear_cp_patch_at(index);
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   747
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   748
class NameSigHash: public ResourceObj {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   749
 public:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   750
  const Symbol*       _name;       // name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   751
  const Symbol*       _sig;        // signature
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   752
  NameSigHash*  _next;             // Next entry in hash table
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   753
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
   754
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   755
static const int HASH_ROW_SIZE = 256;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   756
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   757
static unsigned int hash(const Symbol* name, const Symbol* sig) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   758
  unsigned int raw_hash = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   759
  raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   760
  raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   761
489c9b5090e2 Initial load
duke
parents:
diff changeset
   762
  return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   763
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   764
489c9b5090e2 Initial load
duke
parents:
diff changeset
   765
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   766
static void initialize_hashtable(NameSigHash** table) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   767
  memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   768
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   769
// Return false if the name/sig combination is found in table.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   770
// Return true if no duplicate is found. And name/sig is added as a new entry in table.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   771
// The old format checker uses heap sort to find duplicates.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   772
// NOTE: caller should guarantee that GC doesn't happen during the life cycle
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   773
// of table since we don't expect Symbol*'s to move.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   774
static bool put_after_lookup(const Symbol* name, const Symbol* sig, NameSigHash** table) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   775
  assert(name != NULL, "name in constant pool is NULL");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   776
489c9b5090e2 Initial load
duke
parents:
diff changeset
   777
  // First lookup for duplicates
489c9b5090e2 Initial load
duke
parents:
diff changeset
   778
  int index = hash(name, sig);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   779
  NameSigHash* entry = table[index];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   780
  while (entry != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   781
    if (entry->_name == name && entry->_sig == sig) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   782
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   783
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   784
    entry = entry->_next;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   785
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   786
489c9b5090e2 Initial load
duke
parents:
diff changeset
   787
  // No duplicate is found, allocate a new entry and fill it.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   788
  entry = new NameSigHash();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   789
  entry->_name = name;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   790
  entry->_sig = sig;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   791
489c9b5090e2 Initial load
duke
parents:
diff changeset
   792
  // Insert into hash table
489c9b5090e2 Initial load
duke
parents:
diff changeset
   793
  entry->_next = table[index];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   794
  table[index] = entry;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   795
489c9b5090e2 Initial load
duke
parents:
diff changeset
   796
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   797
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   798
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   799
// Side-effects: populates the _local_interfaces field
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   800
void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   801
                                       const int itfs_len,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   802
                                       ConstantPool* const cp,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   803
                                       bool* const has_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   804
                                       TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   805
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   806
  assert(cp != NULL, "invariant");
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   807
  assert(has_nonstatic_concrete_methods != NULL, "invariant");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   808
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   809
  if (itfs_len == 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   810
    _local_interfaces = Universe::the_empty_klass_array();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   811
  } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   812
    assert(itfs_len > 0, "only called for len>0");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   813
    _local_interfaces = MetadataFactory::new_array<Klass*>(_loader_data, itfs_len, NULL, CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   814
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   815
    int index;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   816
    for (index = 0; index < itfs_len; index++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   817
      const u2 interface_index = stream->get_u2(CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   818
      KlassHandle interf;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   819
      check_property(
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   820
        valid_klass_reference_at(interface_index),
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   821
        "Interface name has bad constant pool index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   822
        interface_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   823
      if (cp->tag_at(interface_index).is_klass()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   824
        interf = KlassHandle(THREAD, cp->resolved_klass_at(interface_index));
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   825
      } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   826
        Symbol* const unresolved_klass  = cp->klass_name_at(interface_index);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   827
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   828
        // Don't need to check legal name because it's checked when parsing constant pool.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   829
        // But need to make sure it's not an array type.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   830
        guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   831
                           "Bad interface name in class file %s", CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   832
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   833
        // Call resolve_super so classcircularity is checked
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   834
        const Klass* const k =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   835
          SystemDictionary::resolve_super_or_fail(_class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   836
                                                  unresolved_klass,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
   837
                                                  Handle(THREAD, _loader_data->class_loader()),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   838
                                                  _protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   839
                                                  false,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   840
                                                  CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   841
        interf = KlassHandle(THREAD, k);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   842
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   843
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   844
      if (!interf()->is_interface()) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   845
        THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   846
                   "Implementing class");
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   847
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   848
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   849
      if (InstanceKlass::cast(interf())->has_nonstatic_concrete_methods()) {
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   850
        *has_nonstatic_concrete_methods = true;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   851
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   852
      _local_interfaces->at_put(index, interf());
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   853
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   854
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   855
    if (!_need_verify || itfs_len <= 1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   856
      return;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   857
    }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   858
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   859
    // Check if there's any duplicates in interfaces
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   860
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   861
    NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   862
                                                                 NameSigHash*,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   863
                                                                 HASH_ROW_SIZE);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   864
    initialize_hashtable(interface_names);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   865
    bool dup = false;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   866
    {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35220
diff changeset
   867
      debug_only(NoSafepointVerifier nsv;)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   868
      for (index = 0; index < itfs_len; index++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   869
        const Klass* const k = _local_interfaces->at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   870
        const Symbol* const name = InstanceKlass::cast(k)->name();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   871
        // If no duplicates, add (name, NULL) in hashtable interface_names.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   872
        if (!put_after_lookup(name, NULL, interface_names)) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   873
          dup = true;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   874
          break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   875
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   876
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   877
    }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   878
    if (dup) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   879
      classfile_parse_error("Duplicate interface name in class file %s", CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   880
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   881
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   882
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   883
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   884
void ClassFileParser::verify_constantvalue(const ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   885
                                           int constantvalue_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   886
                                           int signature_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   887
                                           TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   888
  // Make sure the constant pool entry is of a type appropriate to this field
489c9b5090e2 Initial load
duke
parents:
diff changeset
   889
  guarantee_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
   890
    (constantvalue_index > 0 &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   891
      constantvalue_index < cp->length()),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   892
    "Bad initial value index %u in ConstantValue attribute in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   893
    constantvalue_index, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   894
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   895
  const constantTag value_type = cp->tag_at(constantvalue_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   896
  switch(cp->basic_type_for_signature_at(signature_index)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   897
    case T_LONG: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   898
      guarantee_property(value_type.is_long(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   899
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   900
                         CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   901
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   902
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   903
    case T_FLOAT: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   904
      guarantee_property(value_type.is_float(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   905
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   906
                         CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   907
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   908
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   909
    case T_DOUBLE: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   910
      guarantee_property(value_type.is_double(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   911
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   912
                         CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   913
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   914
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   915
    case T_BYTE:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   916
    case T_CHAR:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   917
    case T_SHORT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   918
    case T_BOOLEAN:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   919
    case T_INT: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   920
      guarantee_property(value_type.is_int(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   921
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   922
                         CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   923
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   924
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   925
    case T_OBJECT: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   926
      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   927
                         && value_type.is_string()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   928
                         "Bad string initial value in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   929
                         CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   930
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   931
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   932
    default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   933
      classfile_parse_error("Unable to set initial value %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   934
                             constantvalue_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   935
                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   936
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   937
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   938
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   939
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   940
class AnnotationCollector : public ResourceObj{
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   941
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   942
  enum Location { _in_field, _in_method, _in_class };
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   943
  enum ID {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   944
    _unknown = 0,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   945
    _method_CallerSensitive,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   946
    _method_ForceInline,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   947
    _method_DontInline,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   948
    _method_InjectedProfile,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   949
    _method_LambdaForm_Compiled,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   950
    _method_LambdaForm_Hidden,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   951
    _method_HotSpotIntrinsicCandidate,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   952
    _jdk_internal_vm_annotation_Contended,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   953
    _field_Stable,
35071
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
   954
    _jdk_internal_vm_annotation_ReservedStackAccess,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   955
    _annotation_LIMIT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   956
  };
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   957
  const Location _location;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   958
  int _annotations_present;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   959
  u2 _contended_group;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   960
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   961
  AnnotationCollector(Location location)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   962
    : _location(location), _annotations_present(0)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   963
  {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   964
    assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   965
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   966
  // If this annotation name has an ID, report it (or _none).
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   967
  ID annotation_index(const ClassLoaderData* loader_data, const Symbol* name);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   968
  // Set the annotation name:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   969
  void set_annotation(ID id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   970
    assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   971
    _annotations_present |= nth_bit((int)id);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   972
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   973
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   974
  void remove_annotation(ID id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   975
    assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   976
    _annotations_present &= ~nth_bit((int)id);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   977
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   978
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   979
  // Report if the annotation is present.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   980
  bool has_any_annotations() const { return _annotations_present != 0; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   981
  bool has_annotation(ID id) const { return (nth_bit((int)id) & _annotations_present) != 0; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   982
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   983
  void set_contended_group(u2 group) { _contended_group = group; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   984
  u2 contended_group() const { return _contended_group; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   985
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   986
  bool is_contended() const { return has_annotation(_jdk_internal_vm_annotation_Contended); }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   987
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   988
  void set_stable(bool stable) { set_annotation(_field_Stable); }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   989
  bool is_stable() const { return has_annotation(_field_Stable); }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   990
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   991
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   992
// This class also doubles as a holder for metadata cleanup.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   993
class ClassFileParser::FieldAnnotationCollector : public AnnotationCollector {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   994
private:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   995
  ClassLoaderData* _loader_data;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   996
  AnnotationArray* _field_annotations;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   997
  AnnotationArray* _field_type_annotations;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   998
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   999
  FieldAnnotationCollector(ClassLoaderData* loader_data) :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1000
    AnnotationCollector(_in_field),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1001
    _loader_data(loader_data),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1002
    _field_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1003
    _field_type_annotations(NULL) {}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1004
  ~FieldAnnotationCollector();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1005
  void apply_to(FieldInfo* f);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1006
  AnnotationArray* field_annotations()      { return _field_annotations; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1007
  AnnotationArray* field_type_annotations() { return _field_type_annotations; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1008
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1009
  void set_field_annotations(AnnotationArray* a)      { _field_annotations = a; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1010
  void set_field_type_annotations(AnnotationArray* a) { _field_type_annotations = a; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1011
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1012
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1013
class MethodAnnotationCollector : public AnnotationCollector{
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1014
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1015
  MethodAnnotationCollector() : AnnotationCollector(_in_method) { }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1016
  void apply_to(methodHandle m);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1017
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1018
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1019
class ClassFileParser::ClassAnnotationCollector : public AnnotationCollector{
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1020
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1021
  ClassAnnotationCollector() : AnnotationCollector(_in_class) { }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1022
  void apply_to(InstanceKlass* ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1023
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1024
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1025
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1026
static int skip_annotation_value(const u1*, int, int); // fwd decl
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1027
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1028
// Safely increment index by val if does not pass limit
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1029
#define SAFE_ADD(index, limit, val) \
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1030
if (index >= limit - val) return limit; \
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1031
index += val;
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1032
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1033
// Skip an annotation.  Return >=limit if there is any problem.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1034
static int skip_annotation(const u1* buffer, int limit, int index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1035
  assert(buffer != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1036
  // annotation := atype:u2 do(nmem:u2) {member:u2 value}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1037
  // value := switch (tag:u1) { ... }
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1038
  SAFE_ADD(index, limit, 4); // skip atype and read nmem
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1039
  int nmem = Bytes::get_Java_u2((address)buffer + index - 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1040
  while (--nmem >= 0 && index < limit) {
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1041
    SAFE_ADD(index, limit, 2); // skip member
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1042
    index = skip_annotation_value(buffer, limit, index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1043
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1044
  return index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1045
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1046
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1047
// Skip an annotation value.  Return >=limit if there is any problem.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1048
static int skip_annotation_value(const u1* buffer, int limit, int index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1049
  assert(buffer != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1050
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1051
  // value := switch (tag:u1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1052
  //   case B, C, I, S, Z, D, F, J, c: con:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1053
  //   case e: e_class:u2 e_name:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1054
  //   case s: s_con:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1055
  //   case [: do(nval:u2) {value};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1056
  //   case @: annotation;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1057
  //   case s: s_con:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1058
  // }
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1059
  SAFE_ADD(index, limit, 1); // read tag
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1060
  const u1 tag = buffer[index - 1];
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1061
  switch (tag) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1062
    case 'B':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1063
    case 'C':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1064
    case 'I':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1065
    case 'S':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1066
    case 'Z':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1067
    case 'D':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1068
    case 'F':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1069
    case 'J':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1070
    case 'c':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1071
    case 's':
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1072
      SAFE_ADD(index, limit, 2);  // skip con or s_con
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1073
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1074
    case 'e':
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1075
      SAFE_ADD(index, limit, 4);  // skip e_class, e_name
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1076
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1077
    case '[':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1078
    {
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1079
      SAFE_ADD(index, limit, 2); // read nval
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1080
      int nval = Bytes::get_Java_u2((address)buffer + index - 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1081
      while (--nval >= 0 && index < limit) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1082
        index = skip_annotation_value(buffer, limit, index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1083
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1084
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1085
    break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1086
    case '@':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1087
      index = skip_annotation(buffer, limit, index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1088
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1089
    default:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1090
      return limit;  //  bad tag byte
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1091
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1092
  return index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1093
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1094
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1095
// Sift through annotations, looking for those significant to the VM:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1096
static void parse_annotations(const ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1097
                              const u1* buffer, int limit,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1098
                              AnnotationCollector* coll,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1099
                              ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1100
                              TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1101
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1102
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1103
  assert(buffer != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1104
  assert(coll != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1105
  assert(loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1106
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1107
  // annotations := do(nann:u2) {annotation}
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1108
  int index = 2; // read nann
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1109
  if (index >= limit)  return;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1110
  int nann = Bytes::get_Java_u2((address)buffer + index - 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1111
  enum {  // initial annotation layout
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1112
    atype_off = 0,      // utf8 such as 'Ljava/lang/annotation/Retention;'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1113
    count_off = 2,      // u2   such as 1 (one value)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1114
    member_off = 4,     // utf8 such as 'value'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1115
    tag_off = 6,        // u1   such as 'c' (type) or 'e' (enum)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1116
    e_tag_val = 'e',
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1117
    e_type_off = 7,   // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1118
    e_con_off = 9,    // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1119
    e_size = 11,     // end of 'e' annotation
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1120
    c_tag_val = 'c',    // payload is type
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1121
    c_con_off = 7,    // utf8 payload, such as 'I'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1122
    c_size = 9,       // end of 'c' annotation
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1123
    s_tag_val = 's',    // payload is String
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1124
    s_con_off = 7,    // utf8 payload, such as 'Ljava/lang/String;'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1125
    s_size = 9,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1126
    min_size = 6        // smallest possible size (zero members)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1127
  };
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1128
  // Cannot add min_size to index in case of overflow MAX_INT
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1129
  while ((--nann) >= 0 && (index - 2 <= limit - min_size)) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1130
    int index0 = index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1131
    index = skip_annotation(buffer, limit, index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1132
    const u1* const abase = buffer + index0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1133
    const int atype = Bytes::get_Java_u2((address)abase + atype_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1134
    const int count = Bytes::get_Java_u2((address)abase + count_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1135
    const Symbol* const aname = check_symbol_at(cp, atype);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1136
    if (aname == NULL)  break;  // invalid annotation name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1137
    const Symbol* member = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1138
    if (count >= 1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1139
      const int member_index = Bytes::get_Java_u2((address)abase + member_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1140
      member = check_symbol_at(cp, member_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1141
      if (member == NULL)  break;  // invalid member name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1142
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1143
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1144
    // Here is where parsing particular annotations will take place.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1145
    AnnotationCollector::ID id = coll->annotation_index(loader_data, aname);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1146
    if (AnnotationCollector::_unknown == id)  continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1147
    coll->set_annotation(id);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1148
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1149
    if (AnnotationCollector::_jdk_internal_vm_annotation_Contended == id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1150
      // @Contended can optionally specify the contention group.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1151
      //
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1152
      // Contended group defines the equivalence class over the fields:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1153
      // the fields within the same contended group are not treated distinct.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1154
      // The only exception is default group, which does not incur the
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1155
      // equivalence. Naturally, contention group for classes is meaningless.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1156
      //
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1157
      // While the contention group is specified as String, annotation
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1158
      // values are already interned, and we might as well use the constant
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1159
      // pool index as the group tag.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1160
      //
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1161
      u2 group_index = 0; // default contended group
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1162
      if (count == 1
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1163
        && s_size == (index - index0)  // match size
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1164
        && s_tag_val == *(abase + tag_off)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1165
        && member == vmSymbols::value_name()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1166
        group_index = Bytes::get_Java_u2((address)abase + s_con_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1167
        if (cp->symbol_at(group_index)->utf8_length() == 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1168
          group_index = 0; // default contended group
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1169
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1170
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1171
      coll->set_contended_group(group_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1172
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1173
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1174
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1175
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1176
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1177
// Parse attributes for a field.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1178
void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1179
                                             u2 attributes_count,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1180
                                             bool is_static, u2 signature_index,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1181
                                             u2* const constantvalue_index_addr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1182
                                             bool* const is_synthetic_addr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1183
                                             u2* const generic_signature_index_addr,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  1184
                                             ClassFileParser::FieldAnnotationCollector* parsed_annotations,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1185
                                             TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1186
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1187
  assert(constantvalue_index_addr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1188
  assert(is_synthetic_addr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1189
  assert(generic_signature_index_addr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1190
  assert(parsed_annotations != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1191
  assert(attributes_count > 0, "attributes_count should be greater than 0");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1192
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1193
  u2 constantvalue_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1194
  u2 generic_signature_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1195
  bool is_synthetic = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1196
  const u1* runtime_visible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1197
  int runtime_visible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1198
  const u1* runtime_invisible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1199
  int runtime_invisible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1200
  const u1* runtime_visible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1201
  int runtime_visible_type_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1202
  const u1* runtime_invisible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1203
  int runtime_invisible_type_annotations_length = 0;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1204
  bool runtime_invisible_annotations_exists = false;
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1205
  bool runtime_invisible_type_annotations_exists = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1206
  const ConstantPool* const cp = _cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1207
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1208
  while (attributes_count--) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1209
    cfs->guarantee_more(6, CHECK);  // attribute_name_index, attribute_length
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1210
    const u2 attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1211
    const u4 attribute_length = cfs->get_u4_fast();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1212
    check_property(valid_symbol_at(attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1213
                   "Invalid field attribute index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1214
                   attribute_name_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1215
                   CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1216
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1217
    const Symbol* const attribute_name = cp->symbol_at(attribute_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1218
    if (is_static && attribute_name == vmSymbols::tag_constant_value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1219
      // ignore if non-static
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1220
      if (constantvalue_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1221
        classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1222
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1223
      check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1224
        attribute_length == 2,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1225
        "Invalid ConstantValue field attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1226
        attribute_length, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1227
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1228
      constantvalue_index = cfs->get_u2(CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1229
      if (_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1230
        verify_constantvalue(cp, constantvalue_index, signature_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1231
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1232
    } else if (attribute_name == vmSymbols::tag_synthetic()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1233
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1234
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1235
          "Invalid Synthetic field attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1236
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1237
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1238
      is_synthetic = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1239
    } else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1240
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1241
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1242
          "Invalid Deprecated field attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1243
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1244
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1245
    } else if (_major_version >= JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1246
      if (attribute_name == vmSymbols::tag_signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1247
        if (attribute_length != 2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1248
          classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1249
            "Wrong size %u for field's Signature attribute in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1250
            attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1251
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1252
        generic_signature_index = parse_generic_signature_attribute(cfs, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1253
      } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1254
        if (runtime_visible_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1255
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1256
            "Multiple RuntimeVisibleAnnotations attributes for field in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1257
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1258
        runtime_visible_annotations_length = attribute_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1259
        runtime_visible_annotations = cfs->get_u1_buffer();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1260
        assert(runtime_visible_annotations != NULL, "null visible annotations");
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1261
        cfs->guarantee_more(runtime_visible_annotations_length, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1262
        parse_annotations(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1263
                          runtime_visible_annotations,
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1264
                          runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1265
                          parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1266
                          _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1267
                          CHECK);
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1268
        cfs->skip_u1_fast(runtime_visible_annotations_length);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1269
      } else if (attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1270
        if (runtime_invisible_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1271
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1272
            "Multiple RuntimeInvisibleAnnotations attributes for field in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1273
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1274
        runtime_invisible_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1275
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1276
          runtime_invisible_annotations_length = attribute_length;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1277
          runtime_invisible_annotations = cfs->get_u1_buffer();
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1278
          assert(runtime_invisible_annotations != NULL, "null invisible annotations");
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1279
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1280
        cfs->skip_u1(attribute_length, CHECK);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1281
      } else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1282
        if (runtime_visible_type_annotations != NULL) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1283
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1284
            "Multiple RuntimeVisibleTypeAnnotations attributes for field in class file %s", CHECK);
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1285
        }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1286
        runtime_visible_type_annotations_length = attribute_length;
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1287
        runtime_visible_type_annotations = cfs->get_u1_buffer();
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1288
        assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1289
        cfs->skip_u1(runtime_visible_type_annotations_length, CHECK);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1290
      } else if (attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1291
        if (runtime_invisible_type_annotations_exists) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1292
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1293
            "Multiple RuntimeInvisibleTypeAnnotations attributes for field in class file %s", CHECK);
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1294
        } else {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1295
          runtime_invisible_type_annotations_exists = true;
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1296
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1297
        if (PreserveAllAnnotations) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1298
          runtime_invisible_type_annotations_length = attribute_length;
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1299
          runtime_invisible_type_annotations = cfs->get_u1_buffer();
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1300
          assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1301
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1302
        cfs->skip_u1(attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1303
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1304
        cfs->skip_u1(attribute_length, CHECK);  // Skip unknown attributes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1305
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1306
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1307
      cfs->skip_u1(attribute_length, CHECK);  // Skip unknown attributes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1308
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1309
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1310
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1311
  *constantvalue_index_addr = constantvalue_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1312
  *is_synthetic_addr = is_synthetic;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1313
  *generic_signature_index_addr = generic_signature_index;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1314
  AnnotationArray* a = assemble_annotations(runtime_visible_annotations,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1315
                                            runtime_visible_annotations_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1316
                                            runtime_invisible_annotations,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1317
                                            runtime_invisible_annotations_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1318
                                            CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1319
  parsed_annotations->set_field_annotations(a);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1320
  a = assemble_annotations(runtime_visible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1321
                           runtime_visible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1322
                           runtime_invisible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1323
                           runtime_invisible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1324
                           CHECK);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1325
  parsed_annotations->set_field_type_annotations(a);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1326
  return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1327
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1328
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1329
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1330
// Field allocation types. Used for computing field offsets.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1331
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1332
enum FieldAllocationType {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1333
  STATIC_OOP,           // Oops
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1334
  STATIC_BYTE,          // Boolean, Byte, char
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1335
  STATIC_SHORT,         // shorts
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1336
  STATIC_WORD,          // ints
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1337
  STATIC_DOUBLE,        // aligned long or double
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1338
  NONSTATIC_OOP,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1339
  NONSTATIC_BYTE,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1340
  NONSTATIC_SHORT,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1341
  NONSTATIC_WORD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1342
  NONSTATIC_DOUBLE,
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1343
  MAX_FIELD_ALLOCATION_TYPE,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1344
  BAD_ALLOCATION_TYPE = -1
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1345
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1346
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1347
static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1348
  BAD_ALLOCATION_TYPE, // 0
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1349
  BAD_ALLOCATION_TYPE, // 1
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1350
  BAD_ALLOCATION_TYPE, // 2
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1351
  BAD_ALLOCATION_TYPE, // 3
13969
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1352
  NONSTATIC_BYTE ,     // T_BOOLEAN     =  4,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1353
  NONSTATIC_SHORT,     // T_CHAR        =  5,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1354
  NONSTATIC_WORD,      // T_FLOAT       =  6,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1355
  NONSTATIC_DOUBLE,    // T_DOUBLE      =  7,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1356
  NONSTATIC_BYTE,      // T_BYTE        =  8,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1357
  NONSTATIC_SHORT,     // T_SHORT       =  9,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1358
  NONSTATIC_WORD,      // T_INT         = 10,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1359
  NONSTATIC_DOUBLE,    // T_LONG        = 11,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1360
  NONSTATIC_OOP,       // T_OBJECT      = 12,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1361
  NONSTATIC_OOP,       // T_ARRAY       = 13,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1362
  BAD_ALLOCATION_TYPE, // T_VOID        = 14,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1363
  BAD_ALLOCATION_TYPE, // T_ADDRESS     = 15,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1364
  BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 16,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1365
  BAD_ALLOCATION_TYPE, // T_METADATA    = 17,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1366
  BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1367
  BAD_ALLOCATION_TYPE, // T_CONFLICT    = 19,
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1368
  BAD_ALLOCATION_TYPE, // 0
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1369
  BAD_ALLOCATION_TYPE, // 1
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1370
  BAD_ALLOCATION_TYPE, // 2
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1371
  BAD_ALLOCATION_TYPE, // 3
13969
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1372
  STATIC_BYTE ,        // T_BOOLEAN     =  4,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1373
  STATIC_SHORT,        // T_CHAR        =  5,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1374
  STATIC_WORD,         // T_FLOAT       =  6,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1375
  STATIC_DOUBLE,       // T_DOUBLE      =  7,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1376
  STATIC_BYTE,         // T_BYTE        =  8,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1377
  STATIC_SHORT,        // T_SHORT       =  9,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1378
  STATIC_WORD,         // T_INT         = 10,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1379
  STATIC_DOUBLE,       // T_LONG        = 11,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1380
  STATIC_OOP,          // T_OBJECT      = 12,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1381
  STATIC_OOP,          // T_ARRAY       = 13,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1382
  BAD_ALLOCATION_TYPE, // T_VOID        = 14,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1383
  BAD_ALLOCATION_TYPE, // T_ADDRESS     = 15,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1384
  BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 16,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1385
  BAD_ALLOCATION_TYPE, // T_METADATA    = 17,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1386
  BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1387
  BAD_ALLOCATION_TYPE, // T_CONFLICT    = 19,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1388
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1389
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1390
static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1391
  assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1392
  FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1393
  assert(result != BAD_ALLOCATION_TYPE, "bad type");
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1394
  return result;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1395
}
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1396
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1397
class ClassFileParser::FieldAllocationCount : public ResourceObj {
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1398
 public:
11412
62fe312f32c5 7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents: 10546
diff changeset
  1399
  u2 count[MAX_FIELD_ALLOCATION_TYPE];
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1400
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1401
  FieldAllocationCount() {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1402
    for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1403
      count[i] = 0;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1404
    }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1405
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1406
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1407
  FieldAllocationType update(bool is_static, BasicType type) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1408
    FieldAllocationType atype = basic_type_to_atype(is_static, type);
38658
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1409
    if (atype != BAD_ALLOCATION_TYPE) {
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1410
      // Make sure there is no overflow with injected fields.
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1411
      assert(count[atype] < 0xFFFF, "More than 65535 fields");
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1412
      count[atype]++;
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1413
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1414
    return atype;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1415
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1416
};
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1417
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1418
// Side-effects: populates the _fields, _fields_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1419
// _fields_type_annotations fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1420
void ClassFileParser::parse_fields(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1421
                                   bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1422
                                   FieldAllocationCount* const fac,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1423
                                   ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1424
                                   const int cp_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1425
                                   u2* const java_fields_count_ptr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1426
                                   TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1427
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1428
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1429
  assert(fac != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1430
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1431
  assert(java_fields_count_ptr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1432
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1433
  assert(NULL == _fields, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1434
  assert(NULL == _fields_annotations, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1435
  assert(NULL == _fields_type_annotations, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1436
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1437
  cfs->guarantee_more(2, CHECK);  // length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1438
  const u2 length = cfs->get_u2_fast();
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1439
  *java_fields_count_ptr = length;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1440
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1441
  int num_injected = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1442
  const InjectedField* const injected = JavaClasses::get_injected(_class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1443
                                                                  &num_injected);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1444
  const int total_fields = length + num_injected;
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1445
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1446
  // The field array starts with tuples of shorts
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1447
  // [access, name index, sig index, initial value index, byte offset].
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1448
  // A generic signature slot only exists for field with generic
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1449
  // signature attribute. And the access flag is set with
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1450
  // JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE for that field. The generic
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1451
  // signature slots are at the end of the field array and after all
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1452
  // other fields data.
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1453
  //
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1454
  //   f1: [access, name index, sig index, initial value index, low_offset, high_offset]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1455
  //   f2: [access, name index, sig index, initial value index, low_offset, high_offset]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1456
  //       ...
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1457
  //   fn: [access, name index, sig index, initial value index, low_offset, high_offset]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1458
  //       [generic signature index]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1459
  //       [generic signature index]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1460
  //       ...
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1461
  //
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1462
  // Allocate a temporary resource array for field data. For each field,
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1463
  // a slot is reserved in the temporary array for the generic signature
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1464
  // index. After parsing all fields, the data are copied to a permanent
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1465
  // array and any unused slots will be discarded.
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1466
  ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1467
  u2* const fa = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1468
                                              u2,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1469
                                              total_fields * (FieldInfo::field_slots + 1));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1470
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1471
  // The generic signature slots start after all other fields' data.
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1472
  int generic_signature_slot = total_fields * FieldInfo::field_slots;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1473
  int num_generic_signature = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1474
  for (int n = 0; n < length; n++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1475
    // access_flags, name_index, descriptor_index, attributes_count
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1476
    cfs->guarantee_more(8, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1477
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1478
    AccessFlags access_flags;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1479
    const jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1480
    verify_legal_field_modifiers(flags, is_interface, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1481
    access_flags.set_flags(flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1482
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1483
    const u2 name_index = cfs->get_u2_fast();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1484
    check_property(valid_symbol_at(name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1485
      "Invalid constant pool index %u for field name in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1486
      name_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1487
    const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1488
    verify_legal_field_name(name, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1489
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1490
    const u2 signature_index = cfs->get_u2_fast();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1491
    check_property(valid_symbol_at(signature_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1492
      "Invalid constant pool index %u for field signature in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1493
      signature_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1494
    const Symbol* const sig = cp->symbol_at(signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1495
    verify_legal_field_signature(name, sig, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1496
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1497
    u2 constantvalue_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1498
    bool is_synthetic = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1499
    u2 generic_signature_index = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1500
    const bool is_static = access_flags.is_static();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1501
    FieldAnnotationCollector parsed_annotations(_loader_data);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1502
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1503
    const u2 attributes_count = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1504
    if (attributes_count > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1505
      parse_field_attributes(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1506
                             attributes_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1507
                             is_static,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1508
                             signature_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1509
                             &constantvalue_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1510
                             &is_synthetic,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1511
                             &generic_signature_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1512
                             &parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1513
                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1514
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1515
      if (parsed_annotations.field_annotations() != NULL) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1516
        if (_fields_annotations == NULL) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1517
          _fields_annotations = MetadataFactory::new_array<AnnotationArray*>(
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1518
                                             _loader_data, length, NULL,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1519
                                             CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1520
        }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1521
        _fields_annotations->at_put(n, parsed_annotations.field_annotations());
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1522
        parsed_annotations.set_field_annotations(NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1523
      }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1524
      if (parsed_annotations.field_type_annotations() != NULL) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1525
        if (_fields_type_annotations == NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1526
          _fields_type_annotations =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1527
            MetadataFactory::new_array<AnnotationArray*>(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1528
                                                         length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1529
                                                         NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1530
                                                         CHECK);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1531
        }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1532
        _fields_type_annotations->at_put(n, parsed_annotations.field_type_annotations());
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1533
        parsed_annotations.set_field_type_annotations(NULL);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1534
      }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1535
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1536
      if (is_synthetic) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1537
        access_flags.set_is_synthetic();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1538
      }
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1539
      if (generic_signature_index != 0) {
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1540
        access_flags.set_field_has_generic_signature();
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1541
        fa[generic_signature_slot] = generic_signature_index;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1542
        generic_signature_slot ++;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1543
        num_generic_signature ++;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1544
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1545
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1546
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1547
    FieldInfo* const field = FieldInfo::from_field_array(fa, n);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1548
    field->initialize(access_flags.as_short(),
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1549
                      name_index,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1550
                      signature_index,
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1551
                      constantvalue_index);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1552
    const BasicType type = cp->basic_type_for_signature_at(signature_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1553
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1554
    // Remember how many oops we encountered and compute allocation type
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1555
    const FieldAllocationType atype = fac->update(is_static, type);
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1556
    field->set_allocation_type(atype);
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1557
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1558
    // After field is initialized with type, we can augment it with aux info
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1559
    if (parsed_annotations.has_any_annotations())
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1560
      parsed_annotations.apply_to(field);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1561
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1562
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1563
  int index = length;
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1564
  if (num_injected != 0) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1565
    for (int n = 0; n < num_injected; n++) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1566
      // Check for duplicates
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1567
      if (injected[n].may_be_java) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1568
        const Symbol* const name      = injected[n].name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1569
        const Symbol* const signature = injected[n].signature();
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1570
        bool duplicate = false;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1571
        for (int i = 0; i < length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1572
          const FieldInfo* const f = FieldInfo::from_field_array(fa, i);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1573
          if (name      == cp->symbol_at(f->name_index()) &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1574
              signature == cp->symbol_at(f->signature_index())) {
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1575
            // Symbol is desclared in Java so skip this one
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1576
            duplicate = true;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1577
            break;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1578
          }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1579
        }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1580
        if (duplicate) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1581
          // These will be removed from the field array at the end
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1582
          continue;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1583
        }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1584
      }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1585
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1586
      // Injected field
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1587
      FieldInfo* const field = FieldInfo::from_field_array(fa, index);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1588
      field->initialize(JVM_ACC_FIELD_INTERNAL,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1589
                        injected[n].name_index,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1590
                        injected[n].signature_index,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1591
                        0);
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1592
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1593
      const BasicType type = FieldType::basic_type(injected[n].signature());
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1594
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1595
      // Remember how many oops we encountered and compute allocation type
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1596
      const FieldAllocationType atype = fac->update(false, type);
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1597
      field->set_allocation_type(atype);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1598
      index++;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1599
    }
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1600
  }
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1601
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1602
  assert(NULL == _fields, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1603
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1604
  _fields =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1605
    MetadataFactory::new_array<u2>(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1606
                                   index * FieldInfo::field_slots + num_generic_signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1607
                                   CHECK);
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1608
  // Sometimes injected fields already exist in the Java source so
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1609
  // the fields array could be too long.  In that case the
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1610
  // fields array is trimed. Also unused slots that were reserved
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1611
  // for generic signature indexes are discarded.
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1612
  {
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1613
    int i = 0;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1614
    for (; i < index * FieldInfo::field_slots; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1615
      _fields->at_put(i, fa[i]);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1616
    }
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1617
    for (int j = total_fields * FieldInfo::field_slots;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1618
         j < generic_signature_slot; j++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1619
      _fields->at_put(i++, fa[j]);
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1620
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1621
    assert(_fields->length() == i, "");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1622
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1623
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1624
  if (_need_verify && length > 1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1625
    // Check duplicated fields
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1626
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1627
    NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1628
      THREAD, NameSigHash*, HASH_ROW_SIZE);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1629
    initialize_hashtable(names_and_sigs);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1630
    bool dup = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1631
    {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35220
diff changeset
  1632
      debug_only(NoSafepointVerifier nsv;)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1633
      for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1634
        const Symbol* const name = fs.name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1635
        const Symbol* const sig = fs.signature();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1636
        // If no duplicates, add name/signature in hashtable names_and_sigs.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1637
        if (!put_after_lookup(name, sig, names_and_sigs)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1638
          dup = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1639
          break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1640
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1641
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1642
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1643
    if (dup) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1644
      classfile_parse_error("Duplicate field name&signature in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1645
                            CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1646
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1647
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1648
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1649
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1650
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1651
static void copy_u2_with_conversion(u2* dest, const u2* src, int length) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1652
  while (length-- > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1653
    *dest++ = Bytes::get_Java_u2((u1*) (src++));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1654
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1655
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1656
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1657
const u2* ClassFileParser::parse_exception_table(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1658
                                                 u4 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1659
                                                 u4 exception_table_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1660
                                                 TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1661
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1662
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1663
  const u2* const exception_table_start = cfs->get_u2_buffer();
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1664
  assert(exception_table_start != NULL, "null exception table");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1665
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1666
  cfs->guarantee_more(8 * exception_table_length, CHECK_NULL); // start_pc,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1667
                                                               // end_pc,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1668
                                                               // handler_pc,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1669
                                                               // catch_type_index
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1670
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1671
  // Will check legal target after parsing code array in verifier.
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1672
  if (_need_verify) {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1673
    for (unsigned int i = 0; i < exception_table_length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1674
      const u2 start_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1675
      const u2 end_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1676
      const u2 handler_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1677
      const u2 catch_type_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1678
      guarantee_property((start_pc < end_pc) && (end_pc <= code_length),
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1679
                         "Illegal exception table range in class file %s",
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1680
                         CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1681
      guarantee_property(handler_pc < code_length,
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1682
                         "Illegal exception table handler in class file %s",
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1683
                         CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1684
      if (catch_type_index != 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1685
        guarantee_property(valid_klass_reference_at(catch_type_index),
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1686
                           "Catch type in exception table has bad constant type in class file %s", CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1687
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1688
    }
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1689
  } else {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1690
    cfs->skip_u2_fast(exception_table_length * 4);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1691
  }
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1692
  return exception_table_start;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1693
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1694
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1695
void ClassFileParser::parse_linenumber_table(u4 code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1696
                                             u4 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1697
                                             CompressedLineNumberWriteStream**const write_stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1698
                                             TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1699
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1700
  const ClassFileStream* const cfs = _stream;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1701
  unsigned int num_entries = cfs->get_u2(CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1702
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1703
  // Each entry is a u2 start_pc, and a u2 line_number
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1704
  const unsigned int length_in_bytes = num_entries * (sizeof(u2) * 2);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1705
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1706
  // Verify line number attribute and table length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1707
  check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1708
    code_attribute_length == sizeof(u2) + length_in_bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1709
    "LineNumberTable attribute has wrong length in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1710
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1711
  cfs->guarantee_more(length_in_bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1712
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1713
  if ((*write_stream) == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1714
    if (length_in_bytes > fixed_buffer_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1715
      (*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1716
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1717
      (*write_stream) = new CompressedLineNumberWriteStream(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1718
        _linenumbertable_buffer, fixed_buffer_size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1719
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1720
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1721
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1722
  while (num_entries-- > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1723
    const u2 bci  = cfs->get_u2_fast(); // start_pc
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1724
    const u2 line = cfs->get_u2_fast(); // line_number
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1725
    guarantee_property(bci < code_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1726
        "Invalid pc in LineNumberTable in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1727
    (*write_stream)->write_pair(bci, line);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1728
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1729
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1730
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1731
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1732
class LVT_Hash : public AllStatic {
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1733
 public:
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1734
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1735
  static bool equals(LocalVariableTableElement const& e0, LocalVariableTableElement const& e1) {
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1736
  /*
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1737
   * 3-tuple start_bci/length/slot has to be unique key,
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1738
   * so the following comparison seems to be redundant:
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1739
   *       && elem->name_cp_index == entry->_elem->name_cp_index
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1740
   */
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1741
    return (e0.start_bci     == e1.start_bci &&
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1742
            e0.length        == e1.length &&
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1743
            e0.name_cp_index == e1.name_cp_index &&
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1744
            e0.slot          == e1.slot);
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1745
  }
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1746
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1747
  static unsigned int hash(LocalVariableTableElement const& e0) {
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1748
    unsigned int raw_hash = e0.start_bci;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1749
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1750
    raw_hash = e0.length        + raw_hash * 37;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1751
    raw_hash = e0.name_cp_index + raw_hash * 37;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1752
    raw_hash = e0.slot          + raw_hash * 37;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1753
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1754
    return raw_hash;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1755
  }
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1756
};
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1757
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1758
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1759
// Class file LocalVariableTable elements.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1760
class Classfile_LVT_Element VALUE_OBJ_CLASS_SPEC {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1761
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1762
  u2 start_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1763
  u2 length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1764
  u2 name_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1765
  u2 descriptor_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1766
  u2 slot;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1767
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1768
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1769
static void copy_lvt_element(const Classfile_LVT_Element* const src,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1770
                             LocalVariableTableElement* const lvt) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1771
  lvt->start_bci           = Bytes::get_Java_u2((u1*) &src->start_bci);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1772
  lvt->length              = Bytes::get_Java_u2((u1*) &src->length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1773
  lvt->name_cp_index       = Bytes::get_Java_u2((u1*) &src->name_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1774
  lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1775
  lvt->signature_cp_index  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1776
  lvt->slot                = Bytes::get_Java_u2((u1*) &src->slot);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1777
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1778
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1779
// Function is used to parse both attributes:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1780
// LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1781
const u2* ClassFileParser::parse_localvariable_table(const ClassFileStream* cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1782
                                                     u4 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1783
                                                     u2 max_locals,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1784
                                                     u4 code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1785
                                                     u2* const localvariable_table_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1786
                                                     bool isLVTT,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1787
                                                     TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1788
  const char* const tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable";
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1789
  *localvariable_table_length = cfs->get_u2(CHECK_NULL);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1790
  const unsigned int size =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1791
    (*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1792
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1793
  const ConstantPool* const cp = _cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1794
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1795
  // Verify local variable table attribute has right length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1796
  if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1797
    guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1798
                       "%s has wrong length in class file %s", tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1799
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1800
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1801
  const u2* const localvariable_table_start = cfs->get_u2_buffer();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1802
  assert(localvariable_table_start != NULL, "null local variable table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1803
  if (!_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1804
    cfs->skip_u2_fast(size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1805
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1806
    cfs->guarantee_more(size * 2, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1807
    for(int i = 0; i < (*localvariable_table_length); i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1808
      const u2 start_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1809
      const u2 length = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1810
      const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1811
      const u2 descriptor_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1812
      const u2 index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1813
      // Assign to a u4 to avoid overflow
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1814
      const u4 end_pc = (u4)start_pc + (u4)length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1815
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1816
      if (start_pc >= code_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1817
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1818
          "Invalid start_pc %u in %s in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1819
          start_pc, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1820
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1821
      if (end_pc > code_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1822
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1823
          "Invalid length %u in %s in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1824
          length, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1825
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1826
      const int cp_size = cp->length();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1827
      guarantee_property(valid_symbol_at(name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1828
        "Name index %u in %s has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1829
        name_index, tbl_name, CHECK_NULL);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1830
      guarantee_property(valid_symbol_at(descriptor_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1831
        "Signature index %u in %s has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1832
        descriptor_index, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1833
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1834
      const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1835
      const Symbol* const sig = cp->symbol_at(descriptor_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1836
      verify_legal_field_name(name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1837
      u2 extra_slot = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1838
      if (!isLVTT) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1839
        verify_legal_field_signature(name, sig, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1840
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1841
        // 4894874: check special cases for double and long local variables
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  1842
        if (sig == vmSymbols::type_signature(T_DOUBLE) ||
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  1843
            sig == vmSymbols::type_signature(T_LONG)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1844
          extra_slot = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1845
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1846
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1847
      guarantee_property((index + extra_slot) < max_locals,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1848
                          "Invalid index %u in %s in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1849
                          index, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1850
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1851
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1852
  return localvariable_table_start;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1853
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1854
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1855
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1856
void ClassFileParser::parse_type_array(u2 array_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1857
                                       u4 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1858
                                       u4* const u1_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1859
                                       u4* const u2_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1860
                                       u1* const u1_array,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1861
                                       u2* const u2_array,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1862
                                       TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1863
  const ClassFileStream* const cfs = _stream;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1864
  u2 index = 0; // index in the array with long/double occupying two slots
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1865
  u4 i1 = *u1_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1866
  u4 i2 = *u2_index + 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1867
  for(int i = 0; i < array_length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1868
    const u1 tag = u1_array[i1++] = cfs->get_u1(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1869
    index++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1870
    if (tag == ITEM_Long || tag == ITEM_Double) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1871
      index++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1872
    } else if (tag == ITEM_Object) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1873
      const u2 class_index = u2_array[i2++] = cfs->get_u2(CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1874
      guarantee_property(valid_klass_reference_at(class_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1875
                         "Bad class index %u in StackMap in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1876
                         class_index, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1877
    } else if (tag == ITEM_Uninitialized) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1878
      const u2 offset = u2_array[i2++] = cfs->get_u2(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1879
      guarantee_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1880
        offset < code_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1881
        "Bad uninitialized type offset %u in StackMap in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1882
        offset, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1883
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1884
      guarantee_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1885
        tag <= (u1)ITEM_Uninitialized,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1886
        "Unknown variable type %u in StackMap in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1887
        tag, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1888
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1889
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1890
  u2_array[*u2_index] = index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1891
  *u1_index = i1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1892
  *u2_index = i2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1893
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1894
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1895
static const u1* parse_stackmap_table(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1896
                                      u4 code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1897
                                      bool need_verify,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1898
                                      TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1899
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1900
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1901
  if (0 == code_attribute_length) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1902
    return NULL;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1903
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1904
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1905
  const u1* const stackmap_table_start = cfs->get_u1_buffer();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1906
  assert(stackmap_table_start != NULL, "null stackmap table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1907
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1908
  // check code_attribute_length first
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1909
  cfs->skip_u1(code_attribute_length, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1910
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1911
  if (!need_verify && !DumpSharedSpaces) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1912
    return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1913
  }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1914
  return stackmap_table_start;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1915
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1916
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1917
const u2* ClassFileParser::parse_checked_exceptions(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1918
                                                    u2* const checked_exceptions_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1919
                                                    u4 method_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1920
                                                    TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1921
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1922
  assert(checked_exceptions_length != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1923
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1924
  cfs->guarantee_more(2, CHECK_NULL);  // checked_exceptions_length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1925
  *checked_exceptions_length = cfs->get_u2_fast();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1926
  const unsigned int size =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1927
    (*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1928
  const u2* const checked_exceptions_start = cfs->get_u2_buffer();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1929
  assert(checked_exceptions_start != NULL, "null checked exceptions");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1930
  if (!_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1931
    cfs->skip_u2_fast(size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1932
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1933
    // Verify each value in the checked exception table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1934
    u2 checked_exception;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1935
    const u2 len = *checked_exceptions_length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1936
    cfs->guarantee_more(2 * len, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1937
    for (int i = 0; i < len; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1938
      checked_exception = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1939
      check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1940
        valid_klass_reference_at(checked_exception),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1941
        "Exception name has bad type at constant pool %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1942
        checked_exception, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1943
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1944
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1945
  // check exceptions attribute length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1946
  if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1947
    guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) +
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1948
                                                   sizeof(u2) * size),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1949
                      "Exceptions attribute has wrong length in class file %s", CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1950
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1951
  return checked_exceptions_start;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1952
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1953
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1954
void ClassFileParser::throwIllegalSignature(const char* type,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1955
                                            const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1956
                                            const Symbol* sig,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1957
                                            TRAPS) const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1958
  assert(name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1959
  assert(sig != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1960
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  1961
  ResourceMark rm(THREAD);
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  1962
  Exceptions::fthrow(THREAD_AND_LOCATION,
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  1963
      vmSymbols::java_lang_ClassFormatError(),
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  1964
      "%s \"%s\" in class %s has illegal signature \"%s\"", type,
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  1965
      name->as_C_string(), _class_name->as_C_string(), sig->as_C_string());
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  1966
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1967
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1968
AnnotationCollector::ID
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1969
AnnotationCollector::annotation_index(const ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1970
                                      const Symbol* name) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1971
  const vmSymbols::SID sid = vmSymbols::find_sid(name);
15244
83447fffce1e 8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents: 15221
diff changeset
  1972
  // Privileged code can use all annotations.  Other code silently drops some.
16617
6235d2c7549f 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 15935
diff changeset
  1973
  const bool privileged = loader_data->is_the_null_class_loader_data() ||
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  1974
                          loader_data->is_platform_class_loader_data() ||
16617
6235d2c7549f 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 15935
diff changeset
  1975
                          loader_data->is_anonymous();
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  1976
  switch (sid) {
37301
a936b4e01afb 8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents: 37242
diff changeset
  1977
    case vmSymbols::VM_SYMBOL_ENUM_NAME(reflect_CallerSensitive_signature): {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1978
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1979
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1980
      return _method_CallerSensitive;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1981
    }
35135
twisti
parents: 35099 35071
diff changeset
  1982
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_ForceInline_signature): {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1983
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1984
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1985
      return _method_ForceInline;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1986
    }
35135
twisti
parents: 35099 35071
diff changeset
  1987
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_DontInline_signature): {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1988
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1989
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1990
      return _method_DontInline;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1991
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1992
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_InjectedProfile_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1993
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1994
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1995
      return _method_InjectedProfile;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1996
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1997
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1998
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1999
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2000
      return _method_LambdaForm_Compiled;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2001
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2002
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2003
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2004
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2005
      return _method_LambdaForm_Hidden;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2006
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2007
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_HotSpotIntrinsicCandidate_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2008
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2009
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2010
      return _method_HotSpotIntrinsicCandidate;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2011
    }
35135
twisti
parents: 35099 35071
diff changeset
  2012
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Stable_signature): {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2013
      if (_location != _in_field)   break;  // only allow for fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2014
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2015
      return _field_Stable;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2016
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2017
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Contended_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2018
      if (_location != _in_field && _location != _in_class) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2019
        break;  // only allow for fields and classes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2020
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2021
      if (!EnableContended || (RestrictContended && !privileged)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2022
        break;  // honor privileges
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2023
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2024
      return _jdk_internal_vm_annotation_Contended;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2025
    }
35071
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2026
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_ReservedStackAccess_signature): {
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2027
      if (_location != _in_method)  break;  // only allow for methods
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2028
      if (RestrictReservedStack && !privileged) break; // honor privileges
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2029
      return _jdk_internal_vm_annotation_ReservedStackAccess;
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2030
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2031
    default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2032
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2033
    }
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2034
  }
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2035
  return AnnotationCollector::_unknown;
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2036
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2037
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2038
void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) {
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  2039
  if (is_contended())
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  2040
    f->set_contended_group(contended_group());
19770
7cb9f982ea81 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 19681
diff changeset
  2041
  if (is_stable())
7cb9f982ea81 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 19681
diff changeset
  2042
    f->set_stable(true);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2043
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2044
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2045
ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2046
  // If there's an error deallocate metadata for field annotations
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2047
  MetadataFactory::free_array<u1>(_loader_data, _field_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2048
  MetadataFactory::free_array<u1>(_loader_data, _field_type_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2049
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2050
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2051
void MethodAnnotationCollector::apply_to(methodHandle m) {
16617
6235d2c7549f 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 15935
diff changeset
  2052
  if (has_annotation(_method_CallerSensitive))
6235d2c7549f 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 15935
diff changeset
  2053
    m->set_caller_sensitive(true);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2054
  if (has_annotation(_method_ForceInline))
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2055
    m->set_force_inline(true);
13391
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2056
  if (has_annotation(_method_DontInline))
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2057
    m->set_dont_inline(true);
31228
8e427370cdd1 8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents: 30764
diff changeset
  2058
  if (has_annotation(_method_InjectedProfile))
8e427370cdd1 8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents: 30764
diff changeset
  2059
    m->set_has_injected_profile(true);
13391
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2060
  if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none)
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2061
    m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm);
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2062
  if (has_annotation(_method_LambdaForm_Hidden))
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2063
    m->set_hidden(true);
31587
e48945b7849c 8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents: 31402
diff changeset
  2064
  if (has_annotation(_method_HotSpotIntrinsicCandidate) && !m->is_synthetic())
e48945b7849c 8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents: 31402
diff changeset
  2065
    m->set_intrinsic_candidate(true);
35071
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2066
  if (has_annotation(_jdk_internal_vm_annotation_ReservedStackAccess))
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2067
    m->set_has_reserved_stack_access(true);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2068
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2069
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2070
void ClassFileParser::ClassAnnotationCollector::apply_to(InstanceKlass* ik) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2071
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2072
  ik->set_is_contended(is_contended());
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2073
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2074
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2075
#define MAX_ARGS_SIZE 255
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2076
#define MAX_CODE_SIZE 65535
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2077
#define INITIAL_MAX_LVT_NUMBER 256
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2078
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2079
/* Copy class file LVT's/LVTT's into the HotSpot internal LVT.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2080
 *
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2081
 * Rules for LVT's and LVTT's are:
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2082
 *   - There can be any number of LVT's and LVTT's.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2083
 *   - If there are n LVT's, it is the same as if there was just
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2084
 *     one LVT containing all the entries from the n LVT's.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2085
 *   - There may be no more than one LVT entry per local variable.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2086
 *     Two LVT entries are 'equal' if these fields are the same:
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2087
 *        start_pc, length, name, slot
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2088
 *   - There may be no more than one LVTT entry per each LVT entry.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2089
 *     Each LVTT entry has to match some LVT entry.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2090
 *   - HotSpot internal LVT keeps natural ordering of class file LVT entries.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2091
 */
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2092
void ClassFileParser::copy_localvariable_table(const ConstMethod* cm,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2093
                                               int lvt_cnt,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2094
                                               u2* const localvariable_table_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2095
                                               const u2**const localvariable_table_start,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2096
                                               int lvtt_cnt,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2097
                                               u2* const localvariable_type_table_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2098
                                               const u2**const localvariable_type_table_start,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2099
                                               TRAPS) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2100
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2101
  ResourceMark rm(THREAD);
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2102
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2103
  typedef ResourceHashtable<LocalVariableTableElement, LocalVariableTableElement*,
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2104
                            &LVT_Hash::hash, &LVT_Hash::equals> LVT_HashTable;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2105
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2106
  LVT_HashTable* const table = new LVT_HashTable();
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2107
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2108
  // To fill LocalVariableTable in
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2109
  const Classfile_LVT_Element* cf_lvt;
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2110
  LocalVariableTableElement* lvt = cm->localvariable_table_start();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2111
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2112
  for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2113
    cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no];
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2114
    for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2115
      copy_lvt_element(&cf_lvt[idx], lvt);
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2116
      // If no duplicates, add LVT elem in hashtable.
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2117
      if (table->put(*lvt, lvt) == false
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2118
          && _need_verify
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2119
          && _major_version >= JAVA_1_5_VERSION) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2120
        classfile_parse_error("Duplicated LocalVariableTable attribute "
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2121
                              "entry for '%s' in class file %s",
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2122
                               _cp->symbol_at(lvt->name_cp_index)->as_utf8(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2123
                               CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2124
      }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2125
    }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2126
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2127
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2128
  // To merge LocalVariableTable and LocalVariableTypeTable
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2129
  const Classfile_LVT_Element* cf_lvtt;
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2130
  LocalVariableTableElement lvtt_elem;
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2131
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2132
  for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2133
    cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no];
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2134
    for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2135
      copy_lvt_element(&cf_lvtt[idx], &lvtt_elem);
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2136
      LocalVariableTableElement** entry = table->get(lvtt_elem);
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2137
      if (entry == NULL) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2138
        if (_need_verify) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2139
          classfile_parse_error("LVTT entry for '%s' in class file %s "
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2140
                                "does not match any LVT entry",
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2141
                                 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2142
                                 CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2143
        }
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2144
      } else if ((*entry)->signature_cp_index != 0 && _need_verify) {
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2145
        classfile_parse_error("Duplicated LocalVariableTypeTable attribute "
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2146
                              "entry for '%s' in class file %s",
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2147
                               _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2148
                               CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2149
      } else {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2150
        // to add generic signatures into LocalVariableTable
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2151
        (*entry)->signature_cp_index = lvtt_elem.descriptor_cp_index;
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2152
      }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2153
    }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2154
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2155
}
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2156
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2157
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2158
void ClassFileParser::copy_method_annotations(ConstMethod* cm,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2159
                                       const u1* runtime_visible_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2160
                                       int runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2161
                                       const u1* runtime_invisible_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2162
                                       int runtime_invisible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2163
                                       const u1* runtime_visible_parameter_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2164
                                       int runtime_visible_parameter_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2165
                                       const u1* runtime_invisible_parameter_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2166
                                       int runtime_invisible_parameter_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2167
                                       const u1* runtime_visible_type_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2168
                                       int runtime_visible_type_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2169
                                       const u1* runtime_invisible_type_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2170
                                       int runtime_invisible_type_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2171
                                       const u1* annotation_default,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2172
                                       int annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2173
                                       TRAPS) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2174
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2175
  AnnotationArray* a;
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2176
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2177
  if (runtime_visible_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2178
      runtime_invisible_annotations_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2179
     a = assemble_annotations(runtime_visible_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2180
                              runtime_visible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2181
                              runtime_invisible_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2182
                              runtime_invisible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2183
                              CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2184
     cm->set_method_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2185
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2186
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2187
  if (runtime_visible_parameter_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2188
      runtime_invisible_parameter_annotations_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2189
    a = assemble_annotations(runtime_visible_parameter_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2190
                             runtime_visible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2191
                             runtime_invisible_parameter_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2192
                             runtime_invisible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2193
                             CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2194
    cm->set_parameter_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2195
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2196
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2197
  if (annotation_default_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2198
    a = assemble_annotations(annotation_default,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2199
                             annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2200
                             NULL,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2201
                             0,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2202
                             CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2203
    cm->set_default_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2204
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2205
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2206
  if (runtime_visible_type_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2207
      runtime_invisible_type_annotations_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2208
    a = assemble_annotations(runtime_visible_type_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2209
                             runtime_visible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2210
                             runtime_invisible_type_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2211
                             runtime_invisible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2212
                             CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2213
    cm->set_type_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2214
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2215
}
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2216
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2217
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2218
// Note: the parse_method below is big and clunky because all parsing of the code and exceptions
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2219
// attribute is inlined. This is cumbersome to avoid since we inline most of the parts in the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2220
// Method* to save footprint, so we only know the size of the resulting Method* when the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2221
// entire method attribute is parsed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2222
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2223
// The promoted_flags parameter is used to pass relevant access_flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2224
// from the method back up to the containing klass. These flag values
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2225
// are added to klass's access_flags.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2226
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2227
Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2228
                                      bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2229
                                      const ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2230
                                      AccessFlags* const promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2231
                                      TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2232
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2233
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2234
  assert(promoted_flags != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2235
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2236
  ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2237
  // Parse fixed parts:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2238
  // access_flags, name_index, descriptor_index, attributes_count
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2239
  cfs->guarantee_more(8, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2240
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2241
  int flags = cfs->get_u2_fast();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2242
  const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2243
  const int cp_size = cp->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2244
  check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2245
    valid_symbol_at(name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2246
    "Illegal constant pool index %u for method name in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2247
    name_index, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2248
  const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2249
  verify_legal_method_name(name, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2250
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2251
  const u2 signature_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2252
  guarantee_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2253
    valid_symbol_at(signature_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2254
    "Illegal constant pool index %u for method signature in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2255
    signature_index, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2256
  const Symbol* const signature = cp->symbol_at(signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2257
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2258
  if (name == vmSymbols::class_initializer_name()) {
8653
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2259
    // We ignore the other access flags for a valid class initializer.
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2260
    // (JVM Spec 2nd ed., chapter 4.6)
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2261
    if (_major_version < 51) { // backward compatibility
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2262
      flags = JVM_ACC_STATIC;
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2263
    } else if ((flags & JVM_ACC_STATIC) == JVM_ACC_STATIC) {
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2264
      flags &= JVM_ACC_STATIC | JVM_ACC_STRICT;
32824
3b686e54dece 8135208: VM permits illegal <clinit> access_flags, versions 51-52
hseigel
parents: 31867
diff changeset
  2265
    } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2266
      classfile_parse_error("Method <clinit> is not static in class file %s", CHECK_NULL);
8653
8797d788a4f1 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 8296
diff changeset
  2267
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2268
  } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2269
    verify_legal_method_modifiers(flags, is_interface, name, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2270
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2271
33207
edc4431940b2 8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents: 33105
diff changeset
  2272
  if (name == vmSymbols::object_initializer_name() && is_interface) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2273
    classfile_parse_error("Interface cannot have a method named <init>, class file %s", CHECK_NULL);
33207
edc4431940b2 8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents: 33105
diff changeset
  2274
  }
edc4431940b2 8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents: 33105
diff changeset
  2275
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2276
  int args_size = -1;  // only used when _need_verify is true
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2277
  if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2278
    args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) +
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2279
                 verify_legal_method_signature(name, signature, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2280
    if (args_size > MAX_ARGS_SIZE) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2281
      classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2282
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2283
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2284
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2285
  AccessFlags access_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2286
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2287
  // Default values for code and exceptions attribute elements
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2288
  u2 max_stack = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2289
  u2 max_locals = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2290
  u4 code_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2291
  const u1* code_start = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2292
  u2 exception_table_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2293
  const u2* exception_table_start = NULL;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2294
  Array<int>* exception_handlers = Universe::the_empty_int_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2295
  u2 checked_exceptions_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2296
  const u2* checked_exceptions_start = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2297
  CompressedLineNumberWriteStream* linenumber_table = NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2298
  int linenumber_table_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2299
  int total_lvt_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2300
  u2 lvt_cnt = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2301
  u2 lvtt_cnt = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2302
  bool lvt_allocated = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2303
  u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2304
  u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER;
31851
ec2f9350c499 8079825: Uninitialised variable in hotspot/src/share/vm & cpu/x86/vm (runtime)
ccheung
parents: 31778
diff changeset
  2305
  u2* localvariable_table_length = NULL;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2306
  const u2** localvariable_table_start = NULL;
31851
ec2f9350c499 8079825: Uninitialised variable in hotspot/src/share/vm & cpu/x86/vm (runtime)
ccheung
parents: 31778
diff changeset
  2307
  u2* localvariable_type_table_length = NULL;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2308
  const u2** localvariable_type_table_start = NULL;
27612
7201412afbd0 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents: 27402
diff changeset
  2309
  int method_parameters_length = -1;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2310
  const u1* method_parameters_data = NULL;
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2311
  bool method_parameters_seen = false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2312
  bool parsed_code_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2313
  bool parsed_checked_exceptions_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2314
  bool parsed_stackmap_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2315
  // stackmap attribute - JDK1.5
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2316
  const u1* stackmap_data = NULL;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2317
  int stackmap_data_length = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2318
  u2 generic_signature_index = 0;
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2319
  MethodAnnotationCollector parsed_annotations;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2320
  const u1* runtime_visible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2321
  int runtime_visible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2322
  const u1* runtime_invisible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2323
  int runtime_invisible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2324
  const u1* runtime_visible_parameter_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2325
  int runtime_visible_parameter_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2326
  const u1* runtime_invisible_parameter_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2327
  int runtime_invisible_parameter_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2328
  const u1* runtime_visible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2329
  int runtime_visible_type_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2330
  const u1* runtime_invisible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2331
  int runtime_invisible_type_annotations_length = 0;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2332
  bool runtime_invisible_annotations_exists = false;
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2333
  bool runtime_invisible_type_annotations_exists = false;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2334
  bool runtime_invisible_parameter_annotations_exists = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2335
  const u1* annotation_default = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2336
  int annotation_default_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2337
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2338
  // Parse code and exceptions attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2339
  u2 method_attributes_count = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2340
  while (method_attributes_count--) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2341
    cfs->guarantee_more(6, CHECK_NULL);  // method_attribute_name_index, method_attribute_length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2342
    const u2 method_attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2343
    const u4 method_attribute_length = cfs->get_u4_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2344
    check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2345
      valid_symbol_at(method_attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2346
      "Invalid method attribute name index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2347
      method_attribute_name_index, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2348
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2349
    const Symbol* const method_attribute_name = cp->symbol_at(method_attribute_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2350
    if (method_attribute_name == vmSymbols::tag_code()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2351
      // Parse Code attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2352
      if (_need_verify) {
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  2353
        guarantee_property(
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  2354
            !access_flags.is_native() && !access_flags.is_abstract(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2355
                        "Code attribute in native or abstract methods in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2356
                         CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2357
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2358
      if (parsed_code_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2359
        classfile_parse_error("Multiple Code attributes in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2360
                              CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2361
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2362
      parsed_code_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2363
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2364
      // Stack size, locals size, and code size
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2365
      if (_major_version == 45 && _minor_version <= 2) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2366
        cfs->guarantee_more(4, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2367
        max_stack = cfs->get_u1_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2368
        max_locals = cfs->get_u1_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2369
        code_length = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2370
      } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2371
        cfs->guarantee_more(8, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2372
        max_stack = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2373
        max_locals = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2374
        code_length = cfs->get_u4_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2375
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2376
      if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2377
        guarantee_property(args_size <= max_locals,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2378
                           "Arguments can't fit into locals in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2379
                           CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2380
        guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2381
                           "Invalid method Code length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2382
                           code_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2383
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2384
      // Code pointer
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2385
      code_start = cfs->get_u1_buffer();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2386
      assert(code_start != NULL, "null code start");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2387
      cfs->guarantee_more(code_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2388
      cfs->skip_u1_fast(code_length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2389
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2390
      // Exception handler table
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2391
      cfs->guarantee_more(2, CHECK_NULL);  // exception_table_length
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2392
      exception_table_length = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2393
      if (exception_table_length > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2394
        exception_table_start = parse_exception_table(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2395
                                                      code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2396
                                                      exception_table_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2397
                                                      CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2398
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2399
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2400
      // Parse additional attributes in code attribute
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2401
      cfs->guarantee_more(2, CHECK_NULL);  // code_attributes_count
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2402
      u2 code_attributes_count = cfs->get_u2_fast();
339
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2403
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2404
      unsigned int calculated_attribute_length = 0;
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2405
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2406
      if (_major_version > 45 || (_major_version == 45 && _minor_version > 2)) {
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2407
        calculated_attribute_length =
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2408
            sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length);
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2409
      } else {
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2410
        // max_stack, locals and length are smaller in pre-version 45.2 classes
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2411
        calculated_attribute_length = sizeof(u1) + sizeof(u1) + sizeof(u2);
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2412
      }
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2413
      calculated_attribute_length +=
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2414
        code_length +
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2415
        sizeof(exception_table_length) +
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2416
        sizeof(code_attributes_count) +
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2417
        exception_table_length *
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2418
            ( sizeof(u2) +   // start_pc
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2419
              sizeof(u2) +   // end_pc
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2420
              sizeof(u2) +   // handler_pc
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2421
              sizeof(u2) );  // catch_type_index
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2422
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2423
      while (code_attributes_count--) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2424
        cfs->guarantee_more(6, CHECK_NULL);  // code_attribute_name_index, code_attribute_length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2425
        const u2 code_attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2426
        const u4 code_attribute_length = cfs->get_u4_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2427
        calculated_attribute_length += code_attribute_length +
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2428
                                       sizeof(code_attribute_name_index) +
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2429
                                       sizeof(code_attribute_length);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2430
        check_property(valid_symbol_at(code_attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2431
                       "Invalid code attribute name index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2432
                       code_attribute_name_index,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2433
                       CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2434
        if (LoadLineNumberTables &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2435
            cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2436
          // Parse and compress line number table
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2437
          parse_linenumber_table(code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2438
                                 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2439
                                 &linenumber_table,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2440
                                 CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2441
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2442
        } else if (LoadLocalVariableTables &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2443
                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2444
          // Parse local variable table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2445
          if (!lvt_allocated) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2446
            localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2447
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2448
            localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2449
              THREAD, const u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2450
            localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2451
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2452
            localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2453
              THREAD, const u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2454
            lvt_allocated = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2455
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2456
          if (lvt_cnt == max_lvt_cnt) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2457
            max_lvt_cnt <<= 1;
20668
0d04d8ae0292 8023683: Enhance class file parsing
iklam
parents: 20667
diff changeset
  2458
            localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2459
            localvariable_table_start  = REALLOC_RESOURCE_ARRAY(const u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2460
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2461
          localvariable_table_start[lvt_cnt] =
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2462
            parse_localvariable_table(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2463
                                      code_length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2464
                                      max_locals,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2465
                                      code_attribute_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2466
                                      &localvariable_table_length[lvt_cnt],
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2467
                                      false,    // is not LVTT
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2468
                                      CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2469
          total_lvt_length += localvariable_table_length[lvt_cnt];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2470
          lvt_cnt++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2471
        } else if (LoadLocalVariableTypeTables &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2472
                   _major_version >= JAVA_1_5_VERSION &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2473
                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2474
          if (!lvt_allocated) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2475
            localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2476
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2477
            localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2478
              THREAD, const u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2479
            localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2480
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2481
            localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2482
              THREAD, const u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2483
            lvt_allocated = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2484
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2485
          // Parse local variable type table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2486
          if (lvtt_cnt == max_lvtt_cnt) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2487
            max_lvtt_cnt <<= 1;
20668
0d04d8ae0292 8023683: Enhance class file parsing
iklam
parents: 20667
diff changeset
  2488
            localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2489
            localvariable_type_table_start  = REALLOC_RESOURCE_ARRAY(const u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2490
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2491
          localvariable_type_table_start[lvtt_cnt] =
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2492
            parse_localvariable_table(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2493
                                      code_length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2494
                                      max_locals,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2495
                                      code_attribute_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2496
                                      &localvariable_type_table_length[lvtt_cnt],
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2497
                                      true,     // is LVTT
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2498
                                      CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2499
          lvtt_cnt++;
16445
cb44d5b3ad89 8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents: 15935
diff changeset
  2500
        } else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2501
                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2502
          // Stack map is only needed by the new verifier in JDK1.5.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2503
          if (parsed_stackmap_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2504
            classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2505
          }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2506
          stackmap_data = parse_stackmap_table(cfs, code_attribute_length, _need_verify, CHECK_NULL);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2507
          stackmap_data_length = code_attribute_length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2508
          parsed_stackmap_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2509
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2510
          // Skip unknown attributes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2511
          cfs->skip_u1(code_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2512
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2513
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2514
      // check method attribute length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2515
      if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2516
        guarantee_property(method_attribute_length == calculated_attribute_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2517
                           "Code segment has wrong length in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2518
                           CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2519
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2520
    } else if (method_attribute_name == vmSymbols::tag_exceptions()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2521
      // Parse Exceptions attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2522
      if (parsed_checked_exceptions_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2523
        classfile_parse_error("Multiple Exceptions attributes in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2524
                              CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2525
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2526
      parsed_checked_exceptions_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2527
      checked_exceptions_start =
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2528
            parse_checked_exceptions(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2529
                                     &checked_exceptions_length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2530
                                     method_attribute_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2531
                                     CHECK_NULL);
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2532
    } else if (method_attribute_name == vmSymbols::tag_method_parameters()) {
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2533
      // reject multiple method parameters
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2534
      if (method_parameters_seen) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2535
        classfile_parse_error("Multiple MethodParameters attributes in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2536
                              CHECK_NULL);
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2537
      }
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2538
      method_parameters_seen = true;
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2539
      method_parameters_length = cfs->get_u1_fast();
27612
7201412afbd0 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents: 27402
diff changeset
  2540
      const u2 real_length = (method_parameters_length * 4u) + 1u;
7201412afbd0 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents: 27402
diff changeset
  2541
      if (method_attribute_length != real_length) {
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2542
        classfile_parse_error(
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2543
          "Invalid MethodParameters method attribute length %u in class file",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2544
          method_attribute_length, CHECK_NULL);
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2545
      }
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2546
      method_parameters_data = cfs->get_u1_buffer();
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2547
      cfs->skip_u2_fast(method_parameters_length);
17080
9151a26f5888 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 17024
diff changeset
  2548
      cfs->skip_u2_fast(method_parameters_length);
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2549
      // ignore this attribute if it cannot be reflected
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2550
      if (!SystemDictionary::Parameter_klass_loaded())
27612
7201412afbd0 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents: 27402
diff changeset
  2551
        method_parameters_length = -1;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2552
    } else if (method_attribute_name == vmSymbols::tag_synthetic()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2553
      if (method_attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2554
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2555
          "Invalid Synthetic method attribute length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2556
          method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2557
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2558
      // Should we check that there hasn't already been a synthetic attribute?
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2559
      access_flags.set_is_synthetic();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2560
    } else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2561
      if (method_attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2562
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2563
          "Invalid Deprecated method attribute length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2564
          method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2565
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2566
    } else if (_major_version >= JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2567
      if (method_attribute_name == vmSymbols::tag_signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2568
        if (method_attribute_length != 2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2569
          classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2570
            "Invalid Signature attribute length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2571
            method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2572
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2573
        generic_signature_index = parse_generic_signature_attribute(cfs, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2574
      } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2575
        if (runtime_visible_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2576
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2577
            "Multiple RuntimeVisibleAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2578
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2579
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2580
        runtime_visible_annotations_length = method_attribute_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2581
        runtime_visible_annotations = cfs->get_u1_buffer();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2582
        assert(runtime_visible_annotations != NULL, "null visible annotations");
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  2583
        cfs->guarantee_more(runtime_visible_annotations_length, CHECK_NULL);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2584
        parse_annotations(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2585
                          runtime_visible_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2586
                          runtime_visible_annotations_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2587
                          &parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2588
                          _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2589
                          CHECK_NULL);
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  2590
        cfs->skip_u1_fast(runtime_visible_annotations_length);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2591
      } else if (method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2592
        if (runtime_invisible_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2593
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2594
            "Multiple RuntimeInvisibleAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2595
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2596
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2597
        runtime_invisible_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2598
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2599
          runtime_invisible_annotations_length = method_attribute_length;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2600
          runtime_invisible_annotations = cfs->get_u1_buffer();
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2601
          assert(runtime_invisible_annotations != NULL, "null invisible annotations");
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2602
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2603
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2604
      } else if (method_attribute_name == vmSymbols::tag_runtime_visible_parameter_annotations()) {
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2605
        if (runtime_visible_parameter_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2606
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2607
            "Multiple RuntimeVisibleParameterAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2608
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2609
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2610
        runtime_visible_parameter_annotations_length = method_attribute_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2611
        runtime_visible_parameter_annotations = cfs->get_u1_buffer();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2612
        assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2613
        cfs->skip_u1(runtime_visible_parameter_annotations_length, CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2614
      } else if (method_attribute_name == vmSymbols::tag_runtime_invisible_parameter_annotations()) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2615
        if (runtime_invisible_parameter_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2616
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2617
            "Multiple RuntimeInvisibleParameterAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2618
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2619
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2620
        runtime_invisible_parameter_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2621
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2622
          runtime_invisible_parameter_annotations_length = method_attribute_length;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2623
          runtime_invisible_parameter_annotations = cfs->get_u1_buffer();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2624
          assert(runtime_invisible_parameter_annotations != NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2625
            "null invisible parameter annotations");
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2626
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2627
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2628
      } else if (method_attribute_name == vmSymbols::tag_annotation_default()) {
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2629
        if (annotation_default != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2630
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2631
            "Multiple AnnotationDefault attributes for method in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2632
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2633
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2634
        annotation_default_length = method_attribute_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2635
        annotation_default = cfs->get_u1_buffer();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2636
        assert(annotation_default != NULL, "null annotation default");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2637
        cfs->skip_u1(annotation_default_length, CHECK_NULL);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2638
      } else if (method_attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2639
        if (runtime_visible_type_annotations != NULL) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2640
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2641
            "Multiple RuntimeVisibleTypeAnnotations attributes for method in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2642
            CHECK_NULL);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2643
        }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2644
        runtime_visible_type_annotations_length = method_attribute_length;
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2645
        runtime_visible_type_annotations = cfs->get_u1_buffer();
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2646
        assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2647
        // No need for the VM to parse Type annotations
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2648
        cfs->skip_u1(runtime_visible_type_annotations_length, CHECK_NULL);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2649
      } else if (method_attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2650
        if (runtime_invisible_type_annotations_exists) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2651
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2652
            "Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2653
            CHECK_NULL);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2654
        } else {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2655
          runtime_invisible_type_annotations_exists = true;
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2656
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2657
        if (PreserveAllAnnotations) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2658
          runtime_invisible_type_annotations_length = method_attribute_length;
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2659
          runtime_invisible_type_annotations = cfs->get_u1_buffer();
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2660
          assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2661
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2662
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2663
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2664
        // Skip unknown attributes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2665
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2666
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2667
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2668
      // Skip unknown attributes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2669
      cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2670
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2671
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2672
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2673
  if (linenumber_table != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2674
    linenumber_table->write_terminator();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2675
    linenumber_table_length = linenumber_table->position();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2676
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2677
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2678
  // Make sure there's at least one Code attribute in non-native/non-abstract method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2679
  if (_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2680
    guarantee_property(access_flags.is_native() ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2681
                       access_flags.is_abstract() ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2682
                       parsed_code_attribute,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2683
                       "Absent Code attribute in method that is not native or abstract in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2684
                       CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2685
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2686
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2687
  // All sizing information for a Method* is finally available, now create it
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2688
  InlineTableSizes sizes(
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2689
      total_lvt_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2690
      linenumber_table_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2691
      exception_table_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2692
      checked_exceptions_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2693
      method_parameters_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2694
      generic_signature_index,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2695
      runtime_visible_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2696
           runtime_invisible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2697
      runtime_visible_parameter_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2698
           runtime_invisible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2699
      runtime_visible_type_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2700
           runtime_invisible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2701
      annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2702
      0);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2703
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2704
  Method* const m = Method::allocate(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2705
                                     code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2706
                                     access_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2707
                                     &sizes,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2708
                                     ConstMethod::NORMAL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2709
                                     CHECK_NULL);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2710
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35495
diff changeset
  2711
  ClassLoadingService::add_class_method_size(m->size()*wordSize);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2712
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2713
  // Fill in information from fixed part (access_flags already set)
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2714
  m->set_constants(_cp);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2715
  m->set_name_index(name_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2716
  m->set_signature_index(signature_index);
37480
291ee208fb72 8132051: Better byte behavior
coleenp
parents: 37301
diff changeset
  2717
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2718
  ResultTypeFinder rtf(cp->symbol_at(signature_index));
37480
291ee208fb72 8132051: Better byte behavior
coleenp
parents: 37301
diff changeset
  2719
  m->constMethod()->set_result_type(rtf.type());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2720
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2721
  if (args_size >= 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2722
    m->set_size_of_parameters(args_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2723
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2724
    m->compute_size_of_parameters(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2725
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2726
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2727
  if (args_size >= 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2728
    m->compute_size_of_parameters(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2729
    assert(args_size == m->size_of_parameters(), "");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2730
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2731
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2732
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2733
  // Fill in code attribute information
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2734
  m->set_max_stack(max_stack);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2735
  m->set_max_locals(max_locals);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2736
  if (stackmap_data != NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2737
    m->constMethod()->copy_stackmap_data(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2738
                                         (u1*)stackmap_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2739
                                         stackmap_data_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2740
                                         CHECK_NULL);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2741
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2742
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2743
  // Copy byte codes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2744
  m->set_code((u1*)code_start);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2745
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2746
  // Copy line number table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2747
  if (linenumber_table != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2748
    memcpy(m->compressed_linenumber_table(),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2749
           linenumber_table->buffer(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2750
           linenumber_table_length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2751
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2752
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2753
  // Copy exception table
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2754
  if (exception_table_length > 0) {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2755
    int size =
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2756
      exception_table_length * sizeof(ExceptionTableElement) / sizeof(u2);
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2757
    copy_u2_with_conversion((u2*) m->exception_table_start(),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2758
                            exception_table_start, size);
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2759
  }
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2760
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2761
  // Copy method parameters
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2762
  if (method_parameters_length > 0) {
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2763
    MethodParametersElement* elem = m->constMethod()->method_parameters_start();
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2764
    for (int i = 0; i < method_parameters_length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2765
      elem[i].name_cp_index = Bytes::get_Java_u2((address)method_parameters_data);
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2766
      method_parameters_data += 2;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2767
      elem[i].flags = Bytes::get_Java_u2((address)method_parameters_data);
17080
9151a26f5888 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 17024
diff changeset
  2768
      method_parameters_data += 2;
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2769
    }
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2770
  }
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2771
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2772
  // Copy checked exceptions
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2773
  if (checked_exceptions_length > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2774
    const int size =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2775
      checked_exceptions_length * sizeof(CheckedExceptionElement) / sizeof(u2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2776
    copy_u2_with_conversion((u2*) m->checked_exceptions_start(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2777
                            checked_exceptions_start,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2778
                            size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2779
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2780
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2781
  // Copy class file LVT's/LVTT's into the HotSpot internal LVT.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2782
  if (total_lvt_length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2783
    promoted_flags->set_has_localvariable_table();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2784
    copy_localvariable_table(m->constMethod(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2785
                             lvt_cnt,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2786
                             localvariable_table_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2787
                             localvariable_table_start,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2788
                             lvtt_cnt,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2789
                             localvariable_type_table_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2790
                             localvariable_type_table_start,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2791
                             CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2792
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2793
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2794
  if (parsed_annotations.has_any_annotations())
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2795
    parsed_annotations.apply_to(m);
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2796
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2797
  // Copy annotations
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2798
  copy_method_annotations(m->constMethod(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2799
                          runtime_visible_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2800
                          runtime_visible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2801
                          runtime_invisible_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2802
                          runtime_invisible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2803
                          runtime_visible_parameter_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2804
                          runtime_visible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2805
                          runtime_invisible_parameter_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2806
                          runtime_invisible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2807
                          runtime_visible_type_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2808
                          runtime_visible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2809
                          runtime_invisible_type_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2810
                          runtime_invisible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2811
                          annotation_default,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2812
                          annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2813
                          CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2814
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2815
  if (name == vmSymbols::finalize_method_name() &&
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2816
      signature == vmSymbols::void_method_signature()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2817
    if (m->is_empty_method()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2818
      _has_empty_finalizer = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2819
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2820
      _has_finalizer = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2821
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2822
  }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2823
  if (name == vmSymbols::object_initializer_name() &&
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2824
      signature == vmSymbols::void_method_signature() &&
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2825
      m->is_vanilla_constructor()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2826
    _has_vanilla_constructor = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2827
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2828
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2829
  NOT_PRODUCT(m->verify());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2830
  return m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2831
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2832
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2833
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2834
// The promoted_flags parameter is used to pass relevant access_flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2835
// from the methods back up to the containing klass. These flag values
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2836
// are added to klass's access_flags.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2837
// Side-effects: populates the _methods field in the parser
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2838
void ClassFileParser::parse_methods(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2839
                                    bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2840
                                    AccessFlags* promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2841
                                    bool* has_final_method,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2842
                                    bool* declares_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2843
                                    TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2844
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2845
  assert(promoted_flags != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2846
  assert(has_final_method != NULL, "invariant");
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2847
  assert(declares_nonstatic_concrete_methods != NULL, "invariant");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2848
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2849
  assert(NULL == _methods, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2850
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2851
  cfs->guarantee_more(2, CHECK);  // length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2852
  const u2 length = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2853
  if (length == 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2854
    _methods = Universe::the_empty_method_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2855
  } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2856
    _methods = MetadataFactory::new_array<Method*>(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2857
                                                   length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2858
                                                   NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2859
                                                   CHECK);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2860
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2861
    for (int index = 0; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2862
      Method* method = parse_method(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2863
                                    is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2864
                                    _cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2865
                                    promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2866
                                    CHECK);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2867
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2868
      if (method->is_final()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2869
        *has_final_method = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2870
      }
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2871
      // declares_nonstatic_concrete_methods: declares concrete instance methods, any access flags
27402
5c4675ddc00c 8043275: Fix interface initialization for default methods.
acorn
parents: 27023
diff changeset
  2872
      // used for interface initialization, and default method inheritance analysis
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2873
      if (is_interface && !(*declares_nonstatic_concrete_methods)
27402
5c4675ddc00c 8043275: Fix interface initialization for default methods.
acorn
parents: 27023
diff changeset
  2874
        && !method->is_abstract() && !method->is_static()) {
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2875
        *declares_nonstatic_concrete_methods = true;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  2876
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2877
      _methods->at_put(index, method);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2878
    }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2879
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2880
    if (_need_verify && length > 1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2881
      // Check duplicated methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2882
      ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2883
      NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2884
        THREAD, NameSigHash*, HASH_ROW_SIZE);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2885
      initialize_hashtable(names_and_sigs);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2886
      bool dup = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2887
      {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35220
diff changeset
  2888
        debug_only(NoSafepointVerifier nsv;)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2889
        for (int i = 0; i < length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2890
          const Method* const m = _methods->at(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2891
          // If no duplicates, add name/signature in hashtable names_and_sigs.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2892
          if (!put_after_lookup(m->name(), m->signature(), names_and_sigs)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2893
            dup = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2894
            break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2895
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2896
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2897
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2898
      if (dup) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2899
        classfile_parse_error("Duplicate method name&signature in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2900
                              CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2901
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2902
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2903
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2904
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2905
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2906
static const intArray* sort_methods(Array<Method*>* methods) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2907
  const int length = methods->length();
9172
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  2908
  // If JVMTI original method ordering or sharing is enabled we have to
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2909
  // remember the original class file ordering.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2910
  // We temporarily use the vtable_index field in the Method* to store the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2911
  // class file index, so we can read in after calling qsort.
9172
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  2912
  // Put the method ordering in the shared archive.
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  2913
  if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2914
    for (int index = 0; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2915
      Method* const m = methods->at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2916
      assert(!m->valid_vtable_index(), "vtable index should not be set");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2917
      m->set_vtable_index(index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2918
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2919
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2920
  // Sort method array by ascending method name (for faster lookups & vtable construction)
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2921
  // Note that the ordering is not alphabetical, see Symbol::fast_compare
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2922
  Method::sort_methods(methods);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2923
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2924
  intArray* method_ordering = NULL;
9172
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  2925
  // If JVMTI original method ordering or sharing is enabled construct int
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  2926
  // array remembering the original ordering
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  2927
  if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
38031
e0b822facc03 8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents: 36508
diff changeset
  2928
    method_ordering = new intArray(length, length, -1);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2929
    for (int index = 0; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2930
      Method* const m = methods->at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2931
      const int old_index = m->vtable_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2932
      assert(old_index >= 0 && old_index < length, "invalid method index");
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2933
      method_ordering->at_put(index, old_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2934
      m->set_vtable_index(Method::invalid_vtable_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2935
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2936
  }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2937
  return method_ordering;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2938
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2939
25507
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2940
// Parse generic_signature attribute for methods and fields
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2941
u2 ClassFileParser::parse_generic_signature_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2942
                                                      TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2943
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2944
25507
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2945
  cfs->guarantee_more(2, CHECK_0);  // generic_signature_index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2946
  const u2 generic_signature_index = cfs->get_u2_fast();
25507
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2947
  check_property(
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2948
    valid_symbol_at(generic_signature_index),
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2949
    "Invalid Signature attribute at constant pool index %u in class file %s",
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2950
    generic_signature_index, CHECK_0);
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2951
  return generic_signature_index;
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  2952
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2953
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2954
void ClassFileParser::parse_classfile_sourcefile_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2955
                                                           TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2956
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2957
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2958
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2959
  cfs->guarantee_more(2, CHECK);  // sourcefile_index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2960
  const u2 sourcefile_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2961
  check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2962
    valid_symbol_at(sourcefile_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2963
    "Invalid SourceFile attribute at constant pool index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2964
    sourcefile_index, CHECK);
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  2965
  set_class_sourcefile_index(sourcefile_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2966
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2967
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2968
void ClassFileParser::parse_classfile_source_debug_extension_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2969
                                                                       int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2970
                                                                       TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2971
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2972
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2973
  const u1* const sde_buffer = cfs->get_u1_buffer();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2974
  assert(sde_buffer != NULL, "null sde buffer");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2975
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2976
  // Don't bother storing it if there is no way to retrieve it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2977
  if (JvmtiExport::can_get_source_debug_extension()) {
13295
kvn
parents: 13201 13291
diff changeset
  2978
    assert((length+1) > length, "Overflow checking");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2979
    u1* const sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1);
13295
kvn
parents: 13201 13291
diff changeset
  2980
    for (int i = 0; i < length; i++) {
kvn
parents: 13201 13291
diff changeset
  2981
      sde[i] = sde_buffer[i];
kvn
parents: 13201 13291
diff changeset
  2982
    }
kvn
parents: 13201 13291
diff changeset
  2983
    sde[length] = '\0';
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2984
    set_class_sde_buffer((const char*)sde, length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2985
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2986
  // Got utf8 string, set stream position forward
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2987
  cfs->skip_u1(length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2988
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2989
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2990
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2991
// Inner classes can be static, private or protected (classic VM does this)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2992
#define RECOGNIZED_INNER_CLASS_MODIFIERS ( JVM_RECOGNIZED_CLASS_MODIFIERS | \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2993
                                           JVM_ACC_PRIVATE |                \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2994
                                           JVM_ACC_PROTECTED |              \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2995
                                           JVM_ACC_STATIC                   \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2996
                                         )
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2997
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2998
// Return number of classes in the inner classes attribute table
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2999
u2 ClassFileParser::parse_classfile_inner_classes_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3000
                                                            const u1* const inner_classes_attribute_start,
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3001
                                                            bool parsed_enclosingmethod_attribute,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3002
                                                            u2 enclosing_method_class_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3003
                                                            u2 enclosing_method_method_index,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3004
                                                            TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3005
  const u1* const current_mark = cfs->current();
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3006
  u2 length = 0;
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3007
  if (inner_classes_attribute_start != NULL) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3008
    cfs->set_current(inner_classes_attribute_start);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3009
    cfs->guarantee_more(2, CHECK_0);  // length
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3010
    length = cfs->get_u2_fast();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3011
  }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3012
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3013
  // 4-tuples of shorts of inner classes data and 2 shorts of enclosing
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3014
  // method data:
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3015
  //   [inner_class_info_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3016
  //    outer_class_info_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3017
  //    inner_name_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3018
  //    inner_class_access_flags,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3019
  //    ...
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3020
  //    enclosing_method_class_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3021
  //    enclosing_method_method_index]
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3022
  const int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3023
  Array<u2>* const inner_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3024
  _inner_classes = inner_classes;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3025
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3026
  int index = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3027
  const int cp_size = _cp->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3028
  cfs->guarantee_more(8 * length, CHECK_0);  // 4-tuples of u2
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3029
  for (int n = 0; n < length; n++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3030
    // Inner class index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3031
    const u2 inner_class_info_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3032
    check_property(
31776
70dd826a47b5 8130183: InnerClasses: VM permits wrong inner_class_info_index value of zero
hseigel
parents: 31402
diff changeset
  3033
      valid_klass_reference_at(inner_class_info_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3034
      "inner_class_info_index %u has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3035
      inner_class_info_index, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3036
    // Outer class index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3037
    const u2 outer_class_info_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3038
    check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3039
      outer_class_info_index == 0 ||
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3040
        valid_klass_reference_at(outer_class_info_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3041
      "outer_class_info_index %u has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3042
      outer_class_info_index, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3043
    // Inner class name
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3044
    const u2 inner_name_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3045
    check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3046
      inner_name_index == 0 || valid_symbol_at(inner_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3047
      "inner_name_index %u has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3048
      inner_name_index, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3049
    if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3050
      guarantee_property(inner_class_info_index != outer_class_info_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3051
                         "Class is both outer and inner class in class file %s", CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3052
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3053
    // Access flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3054
    jint flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3055
    if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3056
      // Set abstract bit for old class files for backward compatibility
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3057
      flags |= JVM_ACC_ABSTRACT;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3058
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3059
    verify_legal_class_modifiers(flags, CHECK_0);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3060
    AccessFlags inner_access_flags(flags);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3061
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3062
    inner_classes->at_put(index++, inner_class_info_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3063
    inner_classes->at_put(index++, outer_class_info_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3064
    inner_classes->at_put(index++, inner_name_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3065
    inner_classes->at_put(index++, inner_access_flags.as_short());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3066
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3067
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3068
  // 4347400: make sure there's no duplicate entry in the classes array
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3069
  if (_need_verify && _major_version >= JAVA_1_5_VERSION) {
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3070
    for(int i = 0; i < length * 4; i += 4) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3071
      for(int j = i + 4; j < length * 4; j += 4) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3072
        guarantee_property((inner_classes->at(i)   != inner_classes->at(j) ||
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3073
                            inner_classes->at(i+1) != inner_classes->at(j+1) ||
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3074
                            inner_classes->at(i+2) != inner_classes->at(j+2) ||
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3075
                            inner_classes->at(i+3) != inner_classes->at(j+3)),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3076
                            "Duplicate entry in InnerClasses in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3077
                            CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3078
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3079
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3080
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3081
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3082
  // Set EnclosingMethod class and method indexes.
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3083
  if (parsed_enclosingmethod_attribute) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3084
    inner_classes->at_put(index++, enclosing_method_class_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3085
    inner_classes->at_put(index++, enclosing_method_method_index);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3086
  }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3087
  assert(index == size, "wrong size");
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3088
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3089
  // Restore buffer's current position.
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3090
  cfs->set_current(current_mark);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3091
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3092
  return length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3093
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3094
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3095
void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) {
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3096
  set_class_synthetic_flag(true);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3097
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3098
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3099
void ClassFileParser::parse_classfile_signature_attribute(const ClassFileStream* const cfs, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3100
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3101
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3102
  const u2 signature_index = cfs->get_u2(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3103
  check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3104
    valid_symbol_at(signature_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3105
    "Invalid constant pool index %u in Signature attribute in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3106
    signature_index, CHECK);
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  3107
  set_class_generic_signature_index(signature_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3108
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3109
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3110
void ClassFileParser::parse_classfile_bootstrap_methods_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3111
                                                                  ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3112
                                                                  u4 attribute_byte_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3113
                                                                  TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3114
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3115
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3116
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3117
  const u1* const current_start = cfs->current();
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3118
25506
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3119
  guarantee_property(attribute_byte_length >= sizeof(u2),
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3120
                     "Invalid BootstrapMethods attribute length %u in class file %s",
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3121
                     attribute_byte_length,
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3122
                     CHECK);
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3123
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3124
  cfs->guarantee_more(attribute_byte_length, CHECK);
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3125
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3126
  const int attribute_array_length = cfs->get_u2_fast();
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3127
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3128
  guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3129
                     "Short length on BootstrapMethods in class file %s",
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3130
                     CHECK);
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3131
23840
a1963807bff5 8034926: Attribute classes properly
hseigel
parents: 22752
diff changeset
  3132
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3133
  // The attribute contains a counted array of counted tuples of shorts,
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3134
  // represending bootstrap specifiers:
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3135
  //    length*{bootstrap_method_index, argument_count*{argument_index}}
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3136
  const int operand_count = (attribute_byte_length - sizeof(u2)) / sizeof(u2);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3137
  // operand_count = number of shorts in attr, except for leading length
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3138
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3139
  // The attribute is copied into a short[] array.
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3140
  // The array begins with a series of short[2] pairs, one for each tuple.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3141
  const int index_size = (attribute_array_length * 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3142
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3143
  Array<u2>* const operands =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3144
    MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3145
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3146
  // Eagerly assign operands so they will be deallocated with the constant
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3147
  // pool if there is an error.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3148
  cp->set_operands(operands);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3149
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3150
  int operand_fill_index = index_size;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3151
  const int cp_size = cp->length();
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3152
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3153
  for (int n = 0; n < attribute_array_length; n++) {
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3154
    // Store a 32-bit offset into the header of the operand array.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3155
    ConstantPool::operand_offset_at_put(operands, n, operand_fill_index);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3156
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3157
    // Read a bootstrap specifier.
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3158
    cfs->guarantee_more(sizeof(u2) * 2, CHECK);  // bsm, argc
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3159
    const u2 bootstrap_method_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3160
    const u2 argument_count = cfs->get_u2_fast();
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3161
    check_property(
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3162
      valid_cp_range(bootstrap_method_index, cp_size) &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3163
      cp->tag_at(bootstrap_method_index).is_method_handle(),
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3164
      "bootstrap_method_index %u has bad constant type in class file %s",
7709
8e90b245b989 7008165: Garbage in ClassFormatError message
twisti
parents: 7436
diff changeset
  3165
      bootstrap_method_index,
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3166
      CHECK);
27023
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3167
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3168
    guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3169
      "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3170
      CHECK);
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3171
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3172
    operands->at_put(operand_fill_index++, bootstrap_method_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3173
    operands->at_put(operand_fill_index++, argument_count);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3174
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3175
    cfs->guarantee_more(sizeof(u2) * argument_count, CHECK);  // argv[argc]
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3176
    for (int j = 0; j < argument_count; j++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3177
      const u2 argument_index = cfs->get_u2_fast();
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3178
      check_property(
7709
8e90b245b989 7008165: Garbage in ClassFormatError message
twisti
parents: 7436
diff changeset
  3179
        valid_cp_range(argument_index, cp_size) &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3180
        cp->tag_at(argument_index).is_loadable_constant(),
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3181
        "argument_index %u has bad constant type in class file %s",
7709
8e90b245b989 7008165: Garbage in ClassFormatError message
twisti
parents: 7436
diff changeset
  3182
        argument_index,
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3183
        CHECK);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3184
      operands->at_put(operand_fill_index++, argument_index);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3185
    }
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3186
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3187
  guarantee_property(current_start + attribute_byte_length == cfs->current(),
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3188
                     "Bad length on BootstrapMethods in class file %s",
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3189
                     CHECK);
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3190
}
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3191
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3192
void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3193
                                                 ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3194
                 ClassFileParser::ClassAnnotationCollector* parsed_annotations,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3195
                                                 TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3196
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3197
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3198
  assert(parsed_annotations != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3199
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3200
  // Set inner classes attribute to default sentinel
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3201
  _inner_classes = Universe::the_empty_short_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3202
  cfs->guarantee_more(2, CHECK);  // attributes_count
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3203
  u2 attributes_count = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3204
  bool parsed_sourcefile_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3205
  bool parsed_innerclasses_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3206
  bool parsed_enclosingmethod_attribute = false;
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3207
  bool parsed_bootstrap_methods_attribute = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3208
  const u1* runtime_visible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3209
  int runtime_visible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3210
  const u1* runtime_invisible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3211
  int runtime_invisible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3212
  const u1* runtime_visible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3213
  int runtime_visible_type_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3214
  const u1* runtime_invisible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3215
  int runtime_invisible_type_annotations_length = 0;
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3216
  bool runtime_invisible_type_annotations_exists = false;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3217
  bool runtime_invisible_annotations_exists = false;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3218
  bool parsed_source_debug_ext_annotations_exist = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3219
  const u1* inner_classes_attribute_start = NULL;
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3220
  u4  inner_classes_attribute_length = 0;
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3221
  u2  enclosing_method_class_index = 0;
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3222
  u2  enclosing_method_method_index = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3223
  // Iterate over attributes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3224
  while (attributes_count--) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3225
    cfs->guarantee_more(6, CHECK);  // attribute_name_index, attribute_length
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3226
    const u2 attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3227
    const u4 attribute_length = cfs->get_u4_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3228
    check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3229
      valid_symbol_at(attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3230
      "Attribute name has bad constant pool index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3231
      attribute_name_index, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3232
    const Symbol* const tag = cp->symbol_at(attribute_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3233
    if (tag == vmSymbols::tag_source_file()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3234
      // Check for SourceFile tag
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3235
      if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3236
        guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3237
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3238
      if (parsed_sourcefile_attribute) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3239
        classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3240
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3241
        parsed_sourcefile_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3242
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3243
      parse_classfile_sourcefile_attribute(cfs, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3244
    } else if (tag == vmSymbols::tag_source_debug_extension()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3245
      // Check for SourceDebugExtension tag
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3246
      if (parsed_source_debug_ext_annotations_exist) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3247
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3248
            "Multiple SourceDebugExtension attributes in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3249
      }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3250
      parsed_source_debug_ext_annotations_exist = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3251
      parse_classfile_source_debug_extension_attribute(cfs, (int)attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3252
    } else if (tag == vmSymbols::tag_inner_classes()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3253
      // Check for InnerClasses tag
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3254
      if (parsed_innerclasses_attribute) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3255
        classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3256
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3257
        parsed_innerclasses_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3258
      }
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3259
      inner_classes_attribute_start = cfs->get_u1_buffer();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3260
      inner_classes_attribute_length = attribute_length;
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3261
      cfs->skip_u1(inner_classes_attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3262
    } else if (tag == vmSymbols::tag_synthetic()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3263
      // Check for Synthetic tag
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3264
      // Shouldn't we check that the synthetic flags wasn't already set? - not required in spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3265
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3266
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3267
          "Invalid Synthetic classfile attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3268
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3269
      }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3270
      parse_classfile_synthetic_attribute(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3271
    } else if (tag == vmSymbols::tag_deprecated()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3272
      // Check for Deprecatd tag - 4276120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3273
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3274
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3275
          "Invalid Deprecated classfile attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3276
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3277
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3278
    } else if (_major_version >= JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3279
      if (tag == vmSymbols::tag_signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3280
        if (attribute_length != 2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3281
          classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3282
            "Wrong Signature attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3283
            attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3284
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3285
        parse_classfile_signature_attribute(cfs, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3286
      } else if (tag == vmSymbols::tag_runtime_visible_annotations()) {
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3287
        if (runtime_visible_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3288
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3289
            "Multiple RuntimeVisibleAnnotations attributes in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3290
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3291
        runtime_visible_annotations_length = attribute_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3292
        runtime_visible_annotations = cfs->get_u1_buffer();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3293
        assert(runtime_visible_annotations != NULL, "null visible annotations");
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  3294
        cfs->guarantee_more(runtime_visible_annotations_length, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3295
        parse_annotations(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3296
                          runtime_visible_annotations,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3297
                          runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3298
                          parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3299
                          _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3300
                          CHECK);
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  3301
        cfs->skip_u1_fast(runtime_visible_annotations_length);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3302
      } else if (tag == vmSymbols::tag_runtime_invisible_annotations()) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3303
        if (runtime_invisible_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3304
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3305
            "Multiple RuntimeInvisibleAnnotations attributes in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3306
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3307
        runtime_invisible_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3308
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3309
          runtime_invisible_annotations_length = attribute_length;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3310
          runtime_invisible_annotations = cfs->get_u1_buffer();
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3311
          assert(runtime_invisible_annotations != NULL, "null invisible annotations");
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3312
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3313
        cfs->skip_u1(attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3314
      } else if (tag == vmSymbols::tag_enclosing_method()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3315
        if (parsed_enclosingmethod_attribute) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3316
          classfile_parse_error("Multiple EnclosingMethod attributes in class file %s", CHECK);
25054
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3317
        } else {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3318
          parsed_enclosingmethod_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3319
        }
25054
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3320
        guarantee_property(attribute_length == 4,
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3321
          "Wrong EnclosingMethod attribute length %u in class file %s",
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3322
          attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3323
        cfs->guarantee_more(4, CHECK);  // class_index, method_index
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3324
        enclosing_method_class_index  = cfs->get_u2_fast();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3325
        enclosing_method_method_index = cfs->get_u2_fast();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3326
        if (enclosing_method_class_index == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3327
          classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3328
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3329
        // Validate the constant pool indices and types
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3330
        check_property(valid_klass_reference_at(enclosing_method_class_index),
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3331
          "Invalid or out-of-bounds class index in EnclosingMethod attribute in class file %s", CHECK);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3332
        if (enclosing_method_method_index != 0 &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3333
            (!cp->is_within_bounds(enclosing_method_method_index) ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3334
             !cp->tag_at(enclosing_method_method_index).is_name_and_type())) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3335
          classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3336
        }
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3337
      } else if (tag == vmSymbols::tag_bootstrap_methods() &&
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3338
                 _major_version >= Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
38658
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  3339
        if (parsed_bootstrap_methods_attribute) {
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3340
          classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK);
38658
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  3341
        }
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3342
        parsed_bootstrap_methods_attribute = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3343
        parse_classfile_bootstrap_methods_attribute(cfs, cp, attribute_length, CHECK);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3344
      } else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) {
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3345
        if (runtime_visible_type_annotations != NULL) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3346
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3347
            "Multiple RuntimeVisibleTypeAnnotations attributes in class file %s", CHECK);
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3348
        }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3349
        runtime_visible_type_annotations_length = attribute_length;
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3350
        runtime_visible_type_annotations = cfs->get_u1_buffer();
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3351
        assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3352
        // No need for the VM to parse Type annotations
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3353
        cfs->skip_u1(runtime_visible_type_annotations_length, CHECK);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3354
      } else if (tag == vmSymbols::tag_runtime_invisible_type_annotations()) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3355
        if (runtime_invisible_type_annotations_exists) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3356
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3357
            "Multiple RuntimeInvisibleTypeAnnotations attributes in class file %s", CHECK);
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3358
        } else {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3359
          runtime_invisible_type_annotations_exists = true;
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3360
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3361
        if (PreserveAllAnnotations) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3362
          runtime_invisible_type_annotations_length = attribute_length;
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3363
          runtime_invisible_type_annotations = cfs->get_u1_buffer();
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3364
          assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3365
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3366
        cfs->skip_u1(attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3367
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3368
        // Unknown attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3369
        cfs->skip_u1(attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3370
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3371
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3372
      // Unknown attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3373
      cfs->skip_u1(attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3374
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3375
  }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3376
  _annotations = assemble_annotations(runtime_visible_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3377
                                      runtime_visible_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3378
                                      runtime_invisible_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3379
                                      runtime_invisible_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3380
                                      CHECK);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3381
  _type_annotations = assemble_annotations(runtime_visible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3382
                                           runtime_visible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3383
                                           runtime_invisible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3384
                                           runtime_invisible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3385
                                           CHECK);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3386
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3387
  if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3388
    const u2 num_of_classes = parse_classfile_inner_classes_attribute(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3389
                            cfs,
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3390
                            inner_classes_attribute_start,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3391
                            parsed_innerclasses_attribute,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3392
                            enclosing_method_class_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3393
                            enclosing_method_method_index,
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3394
                            CHECK);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3395
    if (parsed_innerclasses_attribute &&_need_verify && _major_version >= JAVA_1_5_VERSION) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3396
      guarantee_property(
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3397
        inner_classes_attribute_length == sizeof(num_of_classes) + 4 * sizeof(u2) * num_of_classes,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3398
        "Wrong InnerClasses attribute length in class file %s", CHECK);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3399
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3400
  }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3401
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3402
  if (_max_bootstrap_specifier_index >= 0) {
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3403
    guarantee_property(parsed_bootstrap_methods_attribute,
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3404
                       "Missing BootstrapMethods attribute in class file %s", CHECK);
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3405
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3406
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3407
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3408
void ClassFileParser::apply_parsed_class_attributes(InstanceKlass* k) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3409
  assert(k != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3410
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3411
  if (_synthetic_flag)
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3412
    k->set_is_synthetic();
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  3413
  if (_sourcefile_index != 0) {
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  3414
    k->set_source_file_name_index(_sourcefile_index);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3415
  }
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  3416
  if (_generic_signature_index != 0) {
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  3417
    k->set_generic_signature_index(_generic_signature_index);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3418
  }
13295
kvn
parents: 13201 13291
diff changeset
  3419
  if (_sde_buffer != NULL) {
kvn
parents: 13201 13291
diff changeset
  3420
    k->set_source_debug_extension(_sde_buffer, _sde_length);
kvn
parents: 13201 13291
diff changeset
  3421
  }
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3422
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3423
28027
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3424
// Create the Annotations object that will
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3425
// hold the annotations array for the Klass.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3426
void ClassFileParser::create_combined_annotations(TRAPS) {
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3427
    if (_annotations == NULL &&
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3428
        _type_annotations == NULL &&
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3429
        _fields_annotations == NULL &&
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3430
        _fields_type_annotations == NULL) {
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3431
      // Don't create the Annotations object unnecessarily.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3432
      return;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3433
    }
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3434
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3435
    Annotations* const annotations = Annotations::allocate(_loader_data, CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3436
    annotations->set_class_annotations(_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3437
    annotations->set_class_type_annotations(_type_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3438
    annotations->set_fields_annotations(_fields_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3439
    annotations->set_fields_type_annotations(_fields_type_annotations);
28027
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3440
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3441
    // This is the Annotations object that will be
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3442
    // assigned to InstanceKlass being constructed.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3443
    _combined_annotations = annotations;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3444
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3445
    // The annotations arrays below has been transfered the
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3446
    // _combined_annotations so these fields can now be cleared.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3447
    _annotations             = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3448
    _type_annotations        = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3449
    _fields_annotations      = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3450
    _fields_type_annotations = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3451
}
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3452
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3453
// Transfer ownership of metadata allocated to the InstanceKlass.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3454
void ClassFileParser::apply_parsed_class_metadata(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3455
                                            InstanceKlass* this_klass,
28027
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3456
                                            int java_fields_count, TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3457
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3458
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3459
  _cp->set_pool_holder(this_klass);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3460
  this_klass->set_constants(_cp);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3461
  this_klass->set_fields(_fields, java_fields_count);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3462
  this_klass->set_methods(_methods);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3463
  this_klass->set_inner_classes(_inner_classes);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3464
  this_klass->set_local_interfaces(_local_interfaces);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3465
  this_klass->set_transitive_interfaces(_transitive_interfaces);
28027
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3466
  this_klass->set_annotations(_combined_annotations);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3467
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3468
  // Clear out these fields so they don't get deallocated by the destructor
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3469
  clear_class_metadata();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3470
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3471
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3472
AnnotationArray* ClassFileParser::assemble_annotations(const u1* const runtime_visible_annotations,
13952
e3cf184080bc 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 13738
diff changeset
  3473
                                                       int runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3474
                                                       const u1* const runtime_invisible_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3475
                                                       int runtime_invisible_annotations_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3476
                                                       TRAPS) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3477
  AnnotationArray* annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3478
  if (runtime_visible_annotations != NULL ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3479
      runtime_invisible_annotations != NULL) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3480
    annotations = MetadataFactory::new_array<u1>(_loader_data,
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3481
                                          runtime_visible_annotations_length +
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3482
                                          runtime_invisible_annotations_length,
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3483
                                          CHECK_(annotations));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3484
    if (runtime_visible_annotations != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3485
      for (int i = 0; i < runtime_visible_annotations_length; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3486
        annotations->at_put(i, runtime_visible_annotations[i]);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3487
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3488
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3489
    if (runtime_invisible_annotations != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3490
      for (int i = 0; i < runtime_invisible_annotations_length; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3491
        int append = runtime_visible_annotations_length+i;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3492
        annotations->at_put(append, runtime_invisible_annotations[i]);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3493
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3494
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3495
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3496
  return annotations;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3497
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3498
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3499
const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3500
                                                        const int super_class_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3501
                                                        const bool need_verify,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3502
                                                        TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3503
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3504
  const InstanceKlass* super_klass = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3505
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3506
  if (super_class_index == 0) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3507
    check_property(_class_name == vmSymbols::java_lang_Object(),
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3508
                   "Invalid superclass index %u in class file %s",
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3509
                   super_class_index,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3510
                   CHECK_NULL);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3511
  } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3512
    check_property(valid_klass_reference_at(super_class_index),
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3513
                   "Invalid superclass index %u in class file %s",
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3514
                   super_class_index,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3515
                   CHECK_NULL);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3516
    // The class name should be legal because it is checked when parsing constant pool.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3517
    // However, make sure it is not an array type.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3518
    bool is_array = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3519
    if (cp->tag_at(super_class_index).is_klass()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3520
      super_klass = InstanceKlass::cast(cp->resolved_klass_at(super_class_index));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3521
      if (need_verify)
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  3522
        is_array = super_klass->is_array_klass();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3523
    } else if (need_verify) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3524
      is_array = (cp->klass_name_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3525
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3526
    if (need_verify) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3527
      guarantee_property(!is_array,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3528
                        "Bad superclass name in class file %s", CHECK_NULL);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3529
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3530
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3531
  return super_klass;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3532
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3533
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3534
static unsigned int compute_oop_map_count(const InstanceKlass* super,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3535
                                          unsigned int nonstatic_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3536
                                          int first_nonstatic_oop_offset) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3537
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3538
  unsigned int map_count =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3539
    NULL == super ? 0 : super->nonstatic_oop_map_count();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3540
  if (nonstatic_oop_map_count > 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3541
    // We have oops to add to map
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3542
    if (map_count == 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3543
      map_count = nonstatic_oop_map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3544
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3545
    else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3546
      // Check whether we should add a new map block or whether the last one can
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3547
      // be extended
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3548
      const OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3549
      const OopMapBlock* const last_map = first_map + map_count - 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3550
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3551
      const int next_offset = last_map->offset() + last_map->count() * heapOopSize;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3552
      if (next_offset == first_nonstatic_oop_offset) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3553
        // There is no gap bettwen superklass's last oop field and first
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3554
        // local oop field, merge maps.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3555
        nonstatic_oop_map_count -= 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3556
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3557
      else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3558
        // Superklass didn't end with a oop field, add extra maps
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3559
        assert(next_offset < first_nonstatic_oop_offset, "just checking");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3560
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3561
      map_count += nonstatic_oop_map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3562
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3563
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3564
  return map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3565
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3566
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3567
#ifndef PRODUCT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3568
static void print_field_layout(const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3569
                               Array<u2>* fields,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3570
                               constantPoolHandle cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3571
                               int instance_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3572
                               int instance_fields_start,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3573
                               int instance_fields_end,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3574
                               int static_fields_end) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3575
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3576
  assert(name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3577
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3578
  tty->print("%s: field layout\n", name->as_klass_external_name());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3579
  tty->print("  @%3d %s\n", instance_fields_start, "--- instance fields start ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3580
  for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3581
    if (!fs.access_flags().is_static()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3582
      tty->print("  @%3d \"%s\" %s\n",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3583
        fs.offset(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3584
        fs.name()->as_klass_external_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3585
        fs.signature()->as_klass_external_name());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3586
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3587
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3588
  tty->print("  @%3d %s\n", instance_fields_end, "--- instance fields end ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3589
  tty->print("  @%3d %s\n", instance_size * wordSize, "--- instance ends ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3590
  tty->print("  @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3591
  for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3592
    if (fs.access_flags().is_static()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3593
      tty->print("  @%3d \"%s\" %s\n",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3594
        fs.offset(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3595
        fs.name()->as_klass_external_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3596
        fs.signature()->as_klass_external_name());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3597
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3598
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3599
  tty->print("  @%3d %s\n", static_fields_end, "--- static fields end ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3600
  tty->print("\n");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3601
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3602
#endif
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3603
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3604
// Values needed for oopmap and InstanceKlass creation
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3605
class ClassFileParser::FieldLayoutInfo : public ResourceObj {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3606
 public:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3607
  int*          nonstatic_oop_offsets;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3608
  unsigned int* nonstatic_oop_counts;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3609
  unsigned int  nonstatic_oop_map_count;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3610
  unsigned int  total_oop_map_count;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3611
  int           instance_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3612
  int           nonstatic_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3613
  int           static_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3614
  bool          has_nonstatic_fields;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3615
};
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3616
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3617
// Layout fields and fill in FieldLayoutInfo.  Could use more refactoring!
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3618
void ClassFileParser::layout_fields(ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3619
                                    const FieldAllocationCount* fac,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3620
                                    const ClassAnnotationCollector* parsed_annotations,
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3621
                                    FieldLayoutInfo* info,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3622
                                    TRAPS) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3623
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3624
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3625
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3626
  // Field size and offset computation
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3627
  int nonstatic_field_size = _super_klass == NULL ? 0 :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3628
                               _super_klass->nonstatic_field_size();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3629
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3630
  // Count the contended fields by type.
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3631
  //
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3632
  // We ignore static fields, because @Contended is not supported for them.
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3633
  // The layout code below will also ignore the static fields.
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3634
  int nonstatic_contended_count = 0;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3635
  FieldAllocationCount fac_contended;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3636
  for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3637
    FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3638
    if (fs.is_contended()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3639
      fac_contended.count[atype]++;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3640
      if (!fs.access_flags().is_static()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3641
        nonstatic_contended_count++;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3642
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3643
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3644
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3645
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3646
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3647
  // Calculate the starting byte offsets
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3648
  int next_static_oop_offset    = InstanceMirrorKlass::offset_of_static_fields();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3649
  int next_static_double_offset = next_static_oop_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3650
                                      ((fac->count[STATIC_OOP]) * heapOopSize);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3651
  if ( fac->count[STATIC_DOUBLE] &&
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3652
       (Universe::field_type_should_be_aligned(T_DOUBLE) ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3653
        Universe::field_type_should_be_aligned(T_LONG)) ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3654
    next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3655
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3656
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3657
  int next_static_word_offset   = next_static_double_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3658
                                    ((fac->count[STATIC_DOUBLE]) * BytesPerLong);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3659
  int next_static_short_offset  = next_static_word_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3660
                                    ((fac->count[STATIC_WORD]) * BytesPerInt);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3661
  int next_static_byte_offset   = next_static_short_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3662
                                  ((fac->count[STATIC_SHORT]) * BytesPerShort);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3663
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3664
  int nonstatic_fields_start  = instanceOopDesc::base_offset_in_bytes() +
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3665
                                nonstatic_field_size * heapOopSize;
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3666
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3667
  int next_nonstatic_field_offset = nonstatic_fields_start;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3668
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3669
  const bool is_contended_class     = parsed_annotations->is_contended();
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3670
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3671
  // Class is contended, pad before all the fields
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3672
  if (is_contended_class) {
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3673
    next_nonstatic_field_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3674
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3675
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3676
  // Compute the non-contended fields count.
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3677
  // The packing code below relies on these counts to determine if some field
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3678
  // can be squeezed into the alignment gap. Contended fields are obviously
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3679
  // exempt from that.
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3680
  unsigned int nonstatic_double_count = fac->count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE];
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3681
  unsigned int nonstatic_word_count   = fac->count[NONSTATIC_WORD]   - fac_contended.count[NONSTATIC_WORD];
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3682
  unsigned int nonstatic_short_count  = fac->count[NONSTATIC_SHORT]  - fac_contended.count[NONSTATIC_SHORT];
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3683
  unsigned int nonstatic_byte_count   = fac->count[NONSTATIC_BYTE]   - fac_contended.count[NONSTATIC_BYTE];
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3684
  unsigned int nonstatic_oop_count    = fac->count[NONSTATIC_OOP]    - fac_contended.count[NONSTATIC_OOP];
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3685
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3686
  // Total non-static fields count, including every contended field
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3687
  unsigned int nonstatic_fields_count = fac->count[NONSTATIC_DOUBLE] + fac->count[NONSTATIC_WORD] +
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3688
                                        fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] +
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3689
                                        fac->count[NONSTATIC_OOP];
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3690
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3691
  const bool super_has_nonstatic_fields =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3692
          (_super_klass != NULL && _super_klass->has_nonstatic_fields());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3693
  const bool has_nonstatic_fields =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3694
    super_has_nonstatic_fields || (nonstatic_fields_count != 0);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3695
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3696
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3697
  // Prepare list of oops for oop map generation.
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3698
  //
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3699
  // "offset" and "count" lists are describing the set of contiguous oop
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3700
  // regions. offset[i] is the start of the i-th region, which then has
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3701
  // count[i] oops following. Before we know how many regions are required,
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3702
  // we pessimistically allocate the maps to fit all the oops into the
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3703
  // distinct regions.
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3704
  //
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3705
  // TODO: We add +1 to always allocate non-zero resource arrays; we need
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3706
  // to figure out if we still need to do this.
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3707
  unsigned int nonstatic_oop_map_count = 0;
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3708
  unsigned int max_nonstatic_oop_maps  = fac->count[NONSTATIC_OOP] + 1;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3709
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3710
  int* nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD(
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3711
            THREAD, int, max_nonstatic_oop_maps);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3712
  unsigned int* const nonstatic_oop_counts  = NEW_RESOURCE_ARRAY_IN_THREAD(
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3713
            THREAD, unsigned int, max_nonstatic_oop_maps);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3714
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3715
  int first_nonstatic_oop_offset = 0; // will be set for first oop field
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3716
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3717
  bool compact_fields   = CompactFields;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3718
  int allocation_style = FieldsAllocationStyle;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3719
  if( allocation_style < 0 || allocation_style > 2 ) { // Out of range?
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3720
    assert(false, "0 <= FieldsAllocationStyle <= 2");
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3721
    allocation_style = 1; // Optimistic
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3722
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3723
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3724
  // The next classes have predefined hard-coded fields offsets
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3725
  // (see in JavaClasses::compute_hard_coded_offsets()).
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3726
  // Use default fields allocation order for them.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3727
  if( (allocation_style != 0 || compact_fields ) && _loader_data->class_loader() == NULL &&
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3728
      (_class_name == vmSymbols::java_lang_AssertionStatusDirectives() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3729
       _class_name == vmSymbols::java_lang_Class() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3730
       _class_name == vmSymbols::java_lang_ClassLoader() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3731
       _class_name == vmSymbols::java_lang_ref_Reference() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3732
       _class_name == vmSymbols::java_lang_ref_SoftReference() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3733
       _class_name == vmSymbols::java_lang_StackTraceElement() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3734
       _class_name == vmSymbols::java_lang_String() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3735
       _class_name == vmSymbols::java_lang_Throwable() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3736
       _class_name == vmSymbols::java_lang_Boolean() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3737
       _class_name == vmSymbols::java_lang_Character() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3738
       _class_name == vmSymbols::java_lang_Float() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3739
       _class_name == vmSymbols::java_lang_Double() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3740
       _class_name == vmSymbols::java_lang_Byte() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3741
       _class_name == vmSymbols::java_lang_Short() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3742
       _class_name == vmSymbols::java_lang_Integer() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3743
       _class_name == vmSymbols::java_lang_Long())) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3744
    allocation_style = 0;     // Allocate oops first
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3745
    compact_fields   = false; // Don't compact fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3746
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3747
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3748
  int next_nonstatic_oop_offset = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3749
  int next_nonstatic_double_offset = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3750
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3751
  // Rearrange fields for a given allocation style
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3752
  if( allocation_style == 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3753
    // Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3754
    next_nonstatic_oop_offset    = next_nonstatic_field_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3755
    next_nonstatic_double_offset = next_nonstatic_oop_offset +
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3756
                                    (nonstatic_oop_count * heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3757
  } else if( allocation_style == 1 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3758
    // Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3759
    next_nonstatic_double_offset = next_nonstatic_field_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3760
  } else if( allocation_style == 2 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3761
    // Fields allocation: oops fields in super and sub classes are together.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3762
    if( nonstatic_field_size > 0 && _super_klass != NULL &&
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3763
        _super_klass->nonstatic_oop_map_size() > 0 ) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3764
      const unsigned int map_count = _super_klass->nonstatic_oop_map_count();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3765
      const OopMapBlock* const first_map = _super_klass->start_of_nonstatic_oop_maps();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3766
      const OopMapBlock* const last_map = first_map + map_count - 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3767
      const int next_offset = last_map->offset() + (last_map->count() * heapOopSize);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3768
      if (next_offset == next_nonstatic_field_offset) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3769
        allocation_style = 0;   // allocate oops first
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3770
        next_nonstatic_oop_offset    = next_nonstatic_field_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3771
        next_nonstatic_double_offset = next_nonstatic_oop_offset +
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3772
                                       (nonstatic_oop_count * heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3773
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3774
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3775
    if( allocation_style == 2 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3776
      allocation_style = 1;     // allocate oops last
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3777
      next_nonstatic_double_offset = next_nonstatic_field_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3778
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3779
  } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3780
    ShouldNotReachHere();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3781
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3782
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3783
  int nonstatic_oop_space_count   = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3784
  int nonstatic_word_space_count  = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3785
  int nonstatic_short_space_count = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3786
  int nonstatic_byte_space_count  = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3787
  int nonstatic_oop_space_offset = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3788
  int nonstatic_word_space_offset = 0;
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33230
diff changeset
  3789
  int nonstatic_short_space_offset = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3790
  int nonstatic_byte_space_offset = 0;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3791
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3792
  // Try to squeeze some of the fields into the gaps due to
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3793
  // long/double alignment.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3794
  if (nonstatic_double_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3795
    int offset = next_nonstatic_double_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3796
    next_nonstatic_double_offset = align_size_up(offset, BytesPerLong);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3797
    if (compact_fields && offset != next_nonstatic_double_offset) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3798
      // Allocate available fields into the gap before double field.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3799
      int length = next_nonstatic_double_offset - offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3800
      assert(length == BytesPerInt, "");
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3801
      nonstatic_word_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3802
      if (nonstatic_word_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3803
        nonstatic_word_count      -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3804
        nonstatic_word_space_count = 1; // Only one will fit
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3805
        length -= BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3806
        offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3807
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3808
      nonstatic_short_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3809
      while (length >= BytesPerShort && nonstatic_short_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3810
        nonstatic_short_count       -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3811
        nonstatic_short_space_count += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3812
        length -= BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3813
        offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3814
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3815
      nonstatic_byte_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3816
      while (length > 0 && nonstatic_byte_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3817
        nonstatic_byte_count       -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3818
        nonstatic_byte_space_count += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3819
        length -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3820
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3821
      // Allocate oop field in the gap if there are no other fields for that.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3822
      nonstatic_oop_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3823
      if (length >= heapOopSize && nonstatic_oop_count > 0 &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3824
          allocation_style != 0) { // when oop fields not first
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3825
        nonstatic_oop_count      -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3826
        nonstatic_oop_space_count = 1; // Only one will fit
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3827
        length -= heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3828
        offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3829
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3830
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3831
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3832
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3833
  int next_nonstatic_word_offset = next_nonstatic_double_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3834
                                     (nonstatic_double_count * BytesPerLong);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3835
  int next_nonstatic_short_offset = next_nonstatic_word_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3836
                                      (nonstatic_word_count * BytesPerInt);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3837
  int next_nonstatic_byte_offset = next_nonstatic_short_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3838
                                     (nonstatic_short_count * BytesPerShort);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3839
  int next_nonstatic_padded_offset = next_nonstatic_byte_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3840
                                       nonstatic_byte_count;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3841
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3842
  // let oops jump before padding with this allocation style
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3843
  if( allocation_style == 1 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3844
    next_nonstatic_oop_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3845
    if( nonstatic_oop_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3846
      next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3847
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3848
    next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3849
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3850
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3851
  // Iterate over fields again and compute correct offsets.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3852
  // The field allocation type was temporarily stored in the offset slot.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3853
  // oop fields are located before non-oop fields (static and non-static).
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3854
  for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3855
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3856
    // skip already laid out fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3857
    if (fs.is_offset_set()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3858
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3859
    // contended instance fields are handled below
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3860
    if (fs.is_contended() && !fs.access_flags().is_static()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3861
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33230
diff changeset
  3862
    int real_offset = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3863
    const FieldAllocationType atype = (const FieldAllocationType) fs.allocation_type();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3864
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3865
    // pack the rest of the fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3866
    switch (atype) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3867
      case STATIC_OOP:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3868
        real_offset = next_static_oop_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3869
        next_static_oop_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3870
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3871
      case STATIC_BYTE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3872
        real_offset = next_static_byte_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3873
        next_static_byte_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3874
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3875
      case STATIC_SHORT:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3876
        real_offset = next_static_short_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3877
        next_static_short_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3878
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3879
      case STATIC_WORD:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3880
        real_offset = next_static_word_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3881
        next_static_word_offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3882
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3883
      case STATIC_DOUBLE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3884
        real_offset = next_static_double_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3885
        next_static_double_offset += BytesPerLong;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3886
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3887
      case NONSTATIC_OOP:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3888
        if( nonstatic_oop_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3889
          real_offset = nonstatic_oop_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3890
          nonstatic_oop_space_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3891
          nonstatic_oop_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3892
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3893
          real_offset = next_nonstatic_oop_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3894
          next_nonstatic_oop_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3895
        }
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  3896
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  3897
        // Record this oop in the oop maps
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3898
        if( nonstatic_oop_map_count > 0 &&
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3899
            nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3900
            real_offset -
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3901
            int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3902
            heapOopSize ) {
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  3903
          // This oop is adjacent to the previous one, add to current oop map
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3904
          assert(nonstatic_oop_map_count - 1 < max_nonstatic_oop_maps, "range check");
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3905
          nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3906
        } else {
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  3907
          // This oop is not adjacent to the previous one, create new oop map
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3908
          assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check");
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3909
          nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3910
          nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3911
          nonstatic_oop_map_count += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3912
          if( first_nonstatic_oop_offset == 0 ) { // Undefined
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3913
            first_nonstatic_oop_offset = real_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3914
          }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3915
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3916
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3917
      case NONSTATIC_BYTE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3918
        if( nonstatic_byte_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3919
          real_offset = nonstatic_byte_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3920
          nonstatic_byte_space_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3921
          nonstatic_byte_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3922
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3923
          real_offset = next_nonstatic_byte_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3924
          next_nonstatic_byte_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3925
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3926
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3927
      case NONSTATIC_SHORT:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3928
        if( nonstatic_short_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3929
          real_offset = nonstatic_short_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3930
          nonstatic_short_space_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3931
          nonstatic_short_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3932
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3933
          real_offset = next_nonstatic_short_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3934
          next_nonstatic_short_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3935
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3936
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3937
      case NONSTATIC_WORD:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3938
        if( nonstatic_word_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3939
          real_offset = nonstatic_word_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3940
          nonstatic_word_space_offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3941
          nonstatic_word_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3942
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3943
          real_offset = next_nonstatic_word_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3944
          next_nonstatic_word_offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3945
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3946
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3947
      case NONSTATIC_DOUBLE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3948
        real_offset = next_nonstatic_double_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3949
        next_nonstatic_double_offset += BytesPerLong;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3950
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3951
      default:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3952
        ShouldNotReachHere();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3953
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3954
    fs.set_offset(real_offset);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3955
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3956
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3957
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3958
  // Handle the contended cases.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3959
  //
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3960
  // Each contended field should not intersect the cache line with another contended field.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3961
  // In the absence of alignment information, we end up with pessimistically separating
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3962
  // the fields with full-width padding.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3963
  //
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3964
  // Additionally, this should not break alignment for the fields, so we round the alignment up
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3965
  // for each field.
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3966
  if (nonstatic_contended_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3967
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3968
    // if there is at least one contended field, we need to have pre-padding for them
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3969
    next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3970
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3971
    // collect all contended groups
38177
b0c9cb06506b 8141501: Problems with BitMap buffer management
stefank
parents: 38151
diff changeset
  3972
    ResourceBitMap bm(cp->size());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3973
    for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3974
      // skip already laid out fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3975
      if (fs.is_offset_set()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3976
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3977
      if (fs.is_contended()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3978
        bm.set_bit(fs.contended_group());
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3979
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3980
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3981
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3982
    int current_group = -1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3983
    while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3984
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3985
      for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3986
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3987
        // skip already laid out fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3988
        if (fs.is_offset_set()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3989
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3990
        // skip non-contended fields and fields from different group
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3991
        if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3992
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3993
        // handle statics below
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3994
        if (fs.access_flags().is_static()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3995
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33230
diff changeset
  3996
        int real_offset = 0;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3997
        FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3998
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3999
        switch (atype) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4000
          case NONSTATIC_BYTE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4001
            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4002
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4003
            next_nonstatic_padded_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4004
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4005
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4006
          case NONSTATIC_SHORT:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4007
            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4008
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4009
            next_nonstatic_padded_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4010
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4011
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4012
          case NONSTATIC_WORD:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4013
            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4014
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4015
            next_nonstatic_padded_offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4016
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4017
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4018
          case NONSTATIC_DOUBLE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4019
            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4020
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4021
            next_nonstatic_padded_offset += BytesPerLong;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4022
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4023
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4024
          case NONSTATIC_OOP:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4025
            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4026
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4027
            next_nonstatic_padded_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4028
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4029
            // Record this oop in the oop maps
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4030
            if( nonstatic_oop_map_count > 0 &&
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4031
                nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4032
                real_offset -
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4033
                int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4034
                heapOopSize ) {
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4035
              // This oop is adjacent to the previous one, add to current oop map
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4036
              assert(nonstatic_oop_map_count - 1 < max_nonstatic_oop_maps, "range check");
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4037
              nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4038
            } else {
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4039
              // This oop is not adjacent to the previous one, create new oop map
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4040
              assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check");
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4041
              nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4042
              nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4043
              nonstatic_oop_map_count += 1;
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4044
              if( first_nonstatic_oop_offset == 0 ) { // Undefined
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4045
                first_nonstatic_oop_offset = real_offset;
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4046
              }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4047
            }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4048
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4049
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4050
          default:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4051
            ShouldNotReachHere();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4052
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4053
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4054
        if (fs.contended_group() == 0) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4055
          // Contended group defines the equivalence class over the fields:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4056
          // the fields within the same contended group are not inter-padded.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4057
          // The only exception is default group, which does not incur the
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4058
          // equivalence, and so requires intra-padding.
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4059
          next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4060
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4061
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4062
        fs.set_offset(real_offset);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4063
      } // for
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4064
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4065
      // Start laying out the next group.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4066
      // Note that this will effectively pad the last group in the back;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4067
      // this is expected to alleviate memory contention effects for
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4068
      // subclass fields and/or adjacent object.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4069
      // If this was the default group, the padding is already in place.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4070
      if (current_group != 0) {
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4071
        next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4072
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4073
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4074
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4075
    // handle static fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4076
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4077
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4078
  // Entire class is contended, pad in the back.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4079
  // This helps to alleviate memory contention effects for subclass fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4080
  // and/or adjacent object.
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4081
  if (is_contended_class) {
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4082
    next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4083
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4084
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4085
  int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset;
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4086
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4087
  int nonstatic_fields_end      = align_size_up(notaligned_nonstatic_fields_end, heapOopSize);
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4088
  int instance_end              = align_size_up(notaligned_nonstatic_fields_end, wordSize);
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4089
  int static_fields_end         = align_size_up(next_static_byte_offset, wordSize);
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4090
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4091
  int static_field_size         = (static_fields_end -
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4092
                                   InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4093
  nonstatic_field_size          = nonstatic_field_size +
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4094
                                  (nonstatic_fields_end - nonstatic_fields_start) / heapOopSize;
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4095
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4096
  int instance_size             = align_object_size(instance_end / wordSize);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4097
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4098
  assert(instance_size == align_object_size(align_size_up(
17601
0db4dfbb42ca 8012939: @Contended doesn't work correctly with inheritance
shade
parents: 17374
diff changeset
  4099
         (instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize),
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4100
          wordSize) / wordSize), "consistent layout helper value");
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4101
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4102
  // Invariant: nonstatic_field end/start should only change if there are
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4103
  // nonstatic fields in the class, or if the class is contended. We compare
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4104
  // against the non-aligned value, so that end alignment will not fail the
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4105
  // assert without actually having the fields.
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4106
  assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) ||
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4107
         is_contended_class ||
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4108
         (nonstatic_fields_count > 0), "double-check nonstatic start/end");
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4109
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4110
  // Number of non-static oop map blocks allocated at end of klass.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4111
  const unsigned int total_oop_map_count =
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4112
    compute_oop_map_count(_super_klass, nonstatic_oop_map_count,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4113
                          first_nonstatic_oop_offset);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4114
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4115
#ifndef PRODUCT
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4116
  if (PrintFieldLayout) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4117
    print_field_layout(_class_name,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4118
          _fields,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4119
          cp,
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4120
          instance_size,
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4121
          nonstatic_fields_start,
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4122
          nonstatic_fields_end,
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4123
          static_fields_end);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4124
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4125
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4126
#endif
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4127
  // Pass back information needed for InstanceKlass creation
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4128
  info->nonstatic_oop_offsets = nonstatic_oop_offsets;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4129
  info->nonstatic_oop_counts = nonstatic_oop_counts;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4130
  info->nonstatic_oop_map_count = nonstatic_oop_map_count;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4131
  info->total_oop_map_count = total_oop_map_count;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4132
  info->instance_size = instance_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4133
  info->static_field_size = static_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4134
  info->nonstatic_field_size = nonstatic_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4135
  info->has_nonstatic_fields = has_nonstatic_fields;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4136
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4137
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4138
static void fill_oop_maps(const InstanceKlass* k,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4139
                          unsigned int nonstatic_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4140
                          const int* nonstatic_oop_offsets,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4141
                          const unsigned int* nonstatic_oop_counts) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4142
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4143
  assert(k != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4144
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4145
  OopMapBlock* this_oop_map = k->start_of_nonstatic_oop_maps();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4146
  const InstanceKlass* const super = k->superklass();
3694
942b7bc7f28c 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 3693
diff changeset
  4147
  const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0;
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4148
  if (super_count > 0) {
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4149
    // Copy maps from superklass
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4150
    OopMapBlock* super_oop_map = super->start_of_nonstatic_oop_maps();
3694
942b7bc7f28c 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 3693
diff changeset
  4151
    for (unsigned int i = 0; i < super_count; ++i) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4152
      *this_oop_map++ = *super_oop_map++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4153
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4154
  }
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4155
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4156
  if (nonstatic_oop_map_count > 0) {
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4157
    if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) {
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4158
      // The counts differ because there is no gap between superklass's last oop
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4159
      // field and the first local oop field.  Extend the last oop map copied
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4160
      // from the superklass instead of creating new one.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4161
      nonstatic_oop_map_count--;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4162
      nonstatic_oop_offsets++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4163
      this_oop_map--;
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4164
      this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4165
      this_oop_map++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4166
    }
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4167
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4168
    // Add new map blocks, fill them
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4169
    while (nonstatic_oop_map_count-- > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4170
      this_oop_map->set_offset(*nonstatic_oop_offsets++);
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4171
      this_oop_map->set_count(*nonstatic_oop_counts++);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4172
      this_oop_map++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4173
    }
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4174
    assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() ==
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4175
           this_oop_map, "sanity");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4176
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4177
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4178
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4179
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4180
void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4181
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4182
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4183
  const Klass* const super = ik->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4184
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4185
  // Check if this klass has an empty finalize method (i.e. one with return bytecode only),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4186
  // in which case we don't have to register objects as finalizable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4187
  if (!_has_empty_finalizer) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4188
    if (_has_finalizer ||
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4189
        (super != NULL && super->has_finalizer())) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4190
      ik->set_has_finalizer();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4191
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4192
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4193
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4194
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4195
  bool f = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4196
  const Method* const m = ik->lookup_method(vmSymbols::finalize_method_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4197
                                           vmSymbols::void_method_signature());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4198
  if (m != NULL && !m->is_empty_method()) {
24828
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4199
      f = true;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4200
  }
24828
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4201
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4202
  // Spec doesn't prevent agent from redefinition of empty finalizer.
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4203
  // Despite the fact that it's generally bad idea and redefined finalizer
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4204
  // will not work as expected we shouldn't abort vm in this case
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4205
  if (!ik->has_redefined_this_or_super()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4206
    assert(ik->has_finalizer() == f, "inconsistent has_finalizer");
24828
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4207
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4208
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4209
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4210
  // Check if this klass supports the java.lang.Cloneable interface
4571
80b553bddc26 6914300: ciEnv should export all well known classes
never
parents: 4567
diff changeset
  4211
  if (SystemDictionary::Cloneable_klass_loaded()) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4212
    if (ik->is_subtype_of(SystemDictionary::Cloneable_klass())) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4213
      ik->set_is_cloneable();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4214
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4215
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4216
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4217
  // Check if this klass has a vanilla default constructor
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4218
  if (super == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4219
    // java.lang.Object has empty default constructor
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4220
    ik->set_has_vanilla_constructor();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4221
  } else {
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  4222
    if (super->has_vanilla_constructor() &&
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4223
        _has_vanilla_constructor) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4224
      ik->set_has_vanilla_constructor();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4225
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4226
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4227
    bool v = false;
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  4228
    if (super->has_vanilla_constructor()) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4229
      const Method* const constructor =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4230
        ik->find_method(vmSymbols::object_initializer_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4231
                       vmSymbols::void_method_signature());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4232
      if (constructor != NULL && constructor->is_vanilla_constructor()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4233
        v = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4234
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4235
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4236
    assert(v == ik->has_vanilla_constructor(), "inconsistent has_vanilla_constructor");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4237
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4238
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4239
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4240
  // If it cannot be fast-path allocated, set a bit in the layout helper.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4241
  // See documentation of InstanceKlass::can_be_fastpath_allocated().
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4242
  assert(ik->size_helper() > 0, "layout_helper is initialized");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4243
  if ((!RegisterFinalizersAtInit && ik->has_finalizer())
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4244
      || ik->is_abstract() || ik->is_interface()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4245
      || (ik->name() == vmSymbols::java_lang_Class() && ik->class_loader() == NULL)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4246
      || ik->size_helper() >= FastAllocateSizeLimit) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4247
    // Forbid fast-path allocation.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4248
    const jint lh = Klass::instance_layout_helper(ik->size_helper(), true);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4249
    ik->set_layout_helper(lh);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4250
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4251
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4252
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4253
// Attach super classes and interface classes to class loader data
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4254
static void record_defined_class_dependencies(const InstanceKlass* defined_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4255
                                              TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4256
  assert(defined_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4257
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4258
  ClassLoaderData* const defining_loader_data = defined_klass->class_loader_data();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4259
  if (defining_loader_data->is_the_null_class_loader_data()) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4260
      // Dependencies to null class loader data are implicit.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4261
      return;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4262
  } else {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4263
    // add super class dependency
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4264
    Klass* const super = defined_klass->super();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4265
    if (super != NULL) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4266
      defining_loader_data->record_dependency(super, CHECK);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4267
    }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4268
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4269
    // add super interface dependencies
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4270
    const Array<Klass*>* const local_interfaces = defined_klass->local_interfaces();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4271
    if (local_interfaces != NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4272
      const int length = local_interfaces->length();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4273
      for (int i = 0; i < length; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4274
        defining_loader_data->record_dependency(local_interfaces->at(i), CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4275
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4276
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4277
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4278
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4279
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4280
// utility methods for appending an array with check for duplicates
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4281
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4282
static void append_interfaces(GrowableArray<Klass*>* result,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4283
                              const Array<Klass*>* const ifs) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4284
  // iterate over new interfaces
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4285
  for (int i = 0; i < ifs->length(); i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4286
    Klass* const e = ifs->at(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4287
    assert(e->is_klass() && InstanceKlass::cast(e)->is_interface(), "just checking");
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4288
    // add new interface
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4289
    result->append_if_missing(e);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4290
  }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4291
}
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4292
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4293
static Array<Klass*>* compute_transitive_interfaces(const InstanceKlass* super,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4294
                                                    Array<Klass*>* local_ifs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4295
                                                    ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4296
                                                    TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4297
  assert(local_ifs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4298
  assert(loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4299
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4300
  // Compute maximum size for transitive interfaces
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4301
  int max_transitive_size = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4302
  int super_size = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4303
  // Add superclass transitive interfaces size
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4304
  if (super != NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4305
    super_size = super->transitive_interfaces()->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4306
    max_transitive_size += super_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4307
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4308
  // Add local interfaces' super interfaces
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4309
  const int local_size = local_ifs->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4310
  for (int i = 0; i < local_size; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4311
    Klass* const l = local_ifs->at(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4312
    max_transitive_size += InstanceKlass::cast(l)->transitive_interfaces()->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4313
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4314
  // Finally add local interfaces
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4315
  max_transitive_size += local_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4316
  // Construct array
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4317
  if (max_transitive_size == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4318
    // no interfaces, use canonicalized array
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4319
    return Universe::the_empty_klass_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4320
  } else if (max_transitive_size == super_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4321
    // no new local interfaces added, share superklass' transitive interface array
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4322
    return super->transitive_interfaces();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4323
  } else if (max_transitive_size == local_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4324
    // only local interfaces added, share local interface array
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4325
    return local_ifs;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4326
  } else {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4327
    ResourceMark rm;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4328
    GrowableArray<Klass*>* const result = new GrowableArray<Klass*>(max_transitive_size);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4329
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4330
    // Copy down from superclass
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4331
    if (super != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4332
      append_interfaces(result, super->transitive_interfaces());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4333
    }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4334
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4335
    // Copy down from local interfaces' superinterfaces
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4336
    for (int i = 0; i < local_size; i++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4337
      Klass* const l = local_ifs->at(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4338
      append_interfaces(result, InstanceKlass::cast(l)->transitive_interfaces());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4339
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4340
    // Finally add local interfaces
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4341
    append_interfaces(result, local_ifs);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4342
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4343
    // length will be less than the max_transitive_size if duplicates were removed
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4344
    const int length = result->length();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4345
    assert(length <= max_transitive_size, "just checking");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4346
    Array<Klass*>* const new_result =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4347
      MetadataFactory::new_array<Klass*>(loader_data, length, CHECK_NULL);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4348
    for (int i = 0; i < length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4349
      Klass* const e = result->at(i);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4350
      assert(e != NULL, "just checking");
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4351
      new_result->at_put(i, e);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4352
    }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4353
    return new_result;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4354
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4355
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4356
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4357
static void check_super_class_access(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4358
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4359
  const Klass* const super = this_klass->super();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4360
  if (super != NULL) {
42574
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4361
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4362
    // If the loader is not the boot loader then throw an exception if its
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4363
    // superclass is in package jdk.internal.reflect and its loader is not a
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4364
    // special reflection class loader
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4365
    if (!this_klass->class_loader_data()->is_the_null_class_loader_data()) {
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4366
      assert(super->is_instance_klass(), "super is not instance klass");
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4367
      PackageEntry* super_package = super->package();
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4368
      if (super_package != NULL &&
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4369
          super_package->name()->fast_compare(vmSymbols::jdk_internal_reflect()) == 0 &&
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4370
          !java_lang_ClassLoader::is_reflection_class_loader(this_klass->class_loader())) {
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4371
        ResourceMark rm(THREAD);
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4372
        Exceptions::fthrow(
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4373
          THREAD_AND_LOCATION,
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4374
          vmSymbols::java_lang_IllegalAccessError(),
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4375
          "class %s loaded by %s cannot access jdk/internal/reflect superclass %s",
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4376
          this_klass->external_name(),
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4377
          this_klass->class_loader_data()->loader_name(),
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4378
          super->external_name());
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4379
        return;
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4380
      }
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4381
    }
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4382
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4383
    Reflection::VerifyClassAccessResults vca_result =
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4384
      Reflection::verify_class_access(this_klass, InstanceKlass::cast(super), false);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4385
    if (vca_result != Reflection::ACCESS_OK) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4386
      ResourceMark rm(THREAD);
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4387
      char* msg = Reflection::verify_class_access_msg(this_klass,
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4388
                                                      InstanceKlass::cast(super),
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4389
                                                      vca_result);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4390
      if (msg == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4391
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4392
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4393
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4394
          "class %s cannot access its superclass %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4395
          this_klass->external_name(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4396
          super->external_name());
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4397
      } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4398
        // Add additional message content.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4399
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4400
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4401
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4402
          "superclass access check failed: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4403
          msg);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4404
      }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4405
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4406
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4407
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4408
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4409
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4410
static void check_super_interface_access(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4411
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4412
  const Array<Klass*>* const local_interfaces = this_klass->local_interfaces();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4413
  const int lng = local_interfaces->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4414
  for (int i = lng - 1; i >= 0; i--) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4415
    Klass* const k = local_interfaces->at(i);
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  4416
    assert (k != NULL && k->is_interface(), "invalid interface");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4417
    Reflection::VerifyClassAccessResults vca_result =
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4418
      Reflection::verify_class_access(this_klass, InstanceKlass::cast(k), false);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4419
    if (vca_result != Reflection::ACCESS_OK) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4420
      ResourceMark rm(THREAD);
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4421
      char* msg = Reflection::verify_class_access_msg(this_klass,
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4422
                                                      InstanceKlass::cast(k),
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4423
                                                      vca_result);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4424
      if (msg == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4425
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4426
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4427
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4428
          "class %s cannot access its superinterface %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4429
          this_klass->external_name(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4430
          k->external_name());
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4431
      } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4432
        // Add additional message content.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4433
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4434
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4435
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4436
          "superinterface check failed: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4437
          msg);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4438
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4439
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4440
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4441
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4442
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4443
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4444
static void check_final_method_override(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4445
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4446
  const Array<Method*>* const methods = this_klass->methods();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4447
  const int num_methods = methods->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4448
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4449
  // go thru each method and check if it overrides a final method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4450
  for (int index = 0; index < num_methods; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4451
    const Method* const m = methods->at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4452
21765
e2c19a9f1039 8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents: 21556
diff changeset
  4453
    // skip private, static, and <init> methods
e2c19a9f1039 8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents: 21556
diff changeset
  4454
    if ((!m->is_private() && !m->is_static()) &&
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4455
        (m->name() != vmSymbols::object_initializer_name())) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4456
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4457
      const Symbol* const name = m->name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4458
      const Symbol* const signature = m->signature();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4459
      const Klass* k = this_klass->super();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4460
      const Method* super_m = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4461
      while (k != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4462
        // skip supers that don't have final methods.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4463
        if (k->has_final_method()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4464
          // lookup a matching method in the super class hierarchy
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4465
          super_m = InstanceKlass::cast(k)->lookup_method(name, signature);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4466
          if (super_m == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4467
            break; // didn't find any match; get out
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4468
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4469
22534
520f7a937396 8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents: 22485
diff changeset
  4470
          if (super_m->is_final() && !super_m->is_static() &&
520f7a937396 8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents: 22485
diff changeset
  4471
              // matching method in super is final, and not static
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4472
              (Reflection::verify_field_access(this_klass,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4473
                                               super_m->method_holder(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4474
                                               super_m->method_holder(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4475
                                               super_m->access_flags(), false))
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4476
            // this class can access super final method and therefore override
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4477
            ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4478
            ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4479
            Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4480
              THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4481
              vmSymbols::java_lang_VerifyError(),
25470
4e69740b1547 8026894: Improve VerifyError message about overriding a final method
hseigel
parents: 25326
diff changeset
  4482
              "class %s overrides final method %s.%s%s",
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4483
              this_klass->external_name(),
25470
4e69740b1547 8026894: Improve VerifyError message about overriding a final method
hseigel
parents: 25326
diff changeset
  4484
              super_m->method_holder()->external_name(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4485
              name->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4486
              signature->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4487
            );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4488
            return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4489
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4490
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4491
          // continue to look from super_m's holder's super.
14391
df0a1573d5bd 8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents: 14385
diff changeset
  4492
          k = super_m->method_holder()->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4493
          continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4494
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4495
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4496
        k = k->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4497
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4498
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4499
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4500
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4501
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4502
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4503
// assumes that this_klass is an interface
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4504
static void check_illegal_static_method(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4505
  assert(this_klass != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4506
  assert(this_klass->is_interface(), "not an interface");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4507
  const Array<Method*>* methods = this_klass->methods();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4508
  const int num_methods = methods->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4509
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4510
  for (int index = 0; index < num_methods; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4511
    const Method* const m = methods->at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4512
    // if m is static and not the init method, throw a verify error
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4513
    if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4514
      ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4515
      Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4516
        THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4517
        vmSymbols::java_lang_VerifyError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4518
        "Illegal static method %s in interface %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4519
        m->name()->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4520
        this_klass->external_name()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4521
      );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4522
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4523
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4524
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4525
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4526
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4527
// utility methods for format checking
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4528
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4529
void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4530
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4531
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4532
  const bool is_interface  = (flags & JVM_ACC_INTERFACE)  != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4533
  const bool is_abstract   = (flags & JVM_ACC_ABSTRACT)   != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4534
  const bool is_final      = (flags & JVM_ACC_FINAL)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4535
  const bool is_super      = (flags & JVM_ACC_SUPER)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4536
  const bool is_enum       = (flags & JVM_ACC_ENUM)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4537
  const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0;
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4538
  const bool is_module_info= (flags & JVM_ACC_MODULE)     != 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4539
  const bool major_gte_15  = _major_version >= JAVA_1_5_VERSION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4540
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4541
  if ((is_abstract && is_final) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4542
      (is_interface && !is_abstract) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4543
      (is_interface && major_gte_15 && (is_super || is_enum)) ||
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4544
      (!is_interface && major_gte_15 && is_annotation) ||
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4545
      is_module_info) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4546
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4547
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4548
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4549
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4550
      "Illegal class modifiers in class %s: 0x%X",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4551
      _class_name->as_C_string(), flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4552
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4553
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4554
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4555
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4556
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4557
static bool has_illegal_visibility(jint flags) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4558
  const bool is_public    = (flags & JVM_ACC_PUBLIC)    != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4559
  const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4560
  const bool is_private   = (flags & JVM_ACC_PRIVATE)   != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4561
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4562
  return ((is_public && is_protected) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4563
          (is_public && is_private) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4564
          (is_protected && is_private));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4565
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4566
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4567
static bool is_supported_version(u2 major, u2 minor){
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4568
  const u2 max_version = JAVA_MAX_SUPPORTED_VERSION;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4569
  return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
602
92e03692ddd6 6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents: 383
diff changeset
  4570
         (major <= max_version) &&
92e03692ddd6 6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents: 383
diff changeset
  4571
         ((major != max_version) ||
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4572
          (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4573
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4574
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4575
void ClassFileParser::verify_legal_field_modifiers(jint flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4576
                                                   bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4577
                                                   TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4578
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4579
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4580
  const bool is_public    = (flags & JVM_ACC_PUBLIC)    != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4581
  const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4582
  const bool is_private   = (flags & JVM_ACC_PRIVATE)   != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4583
  const bool is_static    = (flags & JVM_ACC_STATIC)    != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4584
  const bool is_final     = (flags & JVM_ACC_FINAL)     != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4585
  const bool is_volatile  = (flags & JVM_ACC_VOLATILE)  != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4586
  const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4587
  const bool is_enum      = (flags & JVM_ACC_ENUM)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4588
  const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4589
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4590
  bool is_illegal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4591
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4592
  if (is_interface) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4593
    if (!is_public || !is_static || !is_final || is_private ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4594
        is_protected || is_volatile || is_transient ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4595
        (major_gte_15 && is_enum)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4596
      is_illegal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4597
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4598
  } else { // not interface
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4599
    if (has_illegal_visibility(flags) || (is_final && is_volatile)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4600
      is_illegal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4601
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4602
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4603
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4604
  if (is_illegal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4605
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4606
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4607
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4608
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4609
      "Illegal field modifiers in class %s: 0x%X",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4610
      _class_name->as_C_string(), flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4611
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4612
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4613
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4614
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4615
void ClassFileParser::verify_legal_method_modifiers(jint flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4616
                                                    bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4617
                                                    const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4618
                                                    TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4619
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4620
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4621
  const bool is_public       = (flags & JVM_ACC_PUBLIC)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4622
  const bool is_private      = (flags & JVM_ACC_PRIVATE)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4623
  const bool is_static       = (flags & JVM_ACC_STATIC)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4624
  const bool is_final        = (flags & JVM_ACC_FINAL)        != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4625
  const bool is_native       = (flags & JVM_ACC_NATIVE)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4626
  const bool is_abstract     = (flags & JVM_ACC_ABSTRACT)     != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4627
  const bool is_bridge       = (flags & JVM_ACC_BRIDGE)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4628
  const bool is_strict       = (flags & JVM_ACC_STRICT)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4629
  const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0;
15185
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4630
  const bool is_protected    = (flags & JVM_ACC_PROTECTED)    != 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4631
  const bool major_gte_15    = _major_version >= JAVA_1_5_VERSION;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  4632
  const bool major_gte_8     = _major_version >= JAVA_8_VERSION;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4633
  const bool is_initializer  = (name == vmSymbols::object_initializer_name());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4634
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4635
  bool is_illegal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4636
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4637
  if (is_interface) {
15185
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4638
    if (major_gte_8) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4639
      // Class file version is JAVA_8_VERSION or later Methods of
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4640
      // interfaces may set any of the flags except ACC_PROTECTED,
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4641
      // ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4642
      // have exactly one of the ACC_PUBLIC or ACC_PRIVATE flags set.
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4643
      if ((is_public == is_private) || /* Only one of private and public should be true - XNOR */
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4644
          (is_native || is_protected || is_final || is_synchronized) ||
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4645
          // If a specific method of a class or interface has its
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4646
          // ACC_ABSTRACT flag set, it must not have any of its
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4647
          // ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC,
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4648
          // ACC_STRICT, or ACC_SYNCHRONIZED flags set.  No need to
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4649
          // check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4650
          // those flags are illegal irrespective of ACC_ABSTRACT being set or not.
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4651
          (is_abstract && (is_private || is_static || is_strict))) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4652
        is_illegal = true;
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4653
      }
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4654
    } else if (major_gte_15) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4655
      // Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION)
35911
80dd27ae501c 8135206: VM permits illegal flags for abstract methods in interfaces, versions 45.3 - 51.0
hseigel
parents: 35898
diff changeset
  4656
      if (!is_public || is_private || is_protected || is_static || is_final ||
80dd27ae501c 8135206: VM permits illegal flags for abstract methods in interfaces, versions 45.3 - 51.0
hseigel
parents: 35898
diff changeset
  4657
          is_synchronized || is_native || !is_abstract || is_strict) {
15185
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4658
        is_illegal = true;
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4659
      }
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4660
    } else {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4661
      // Class file version is pre-JAVA_1_5_VERSION
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4662
      if (!is_public || is_static || is_final || is_native || !is_abstract) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4663
        is_illegal = true;
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4664
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4665
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4666
  } else { // not interface
30136
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4667
    if (has_illegal_visibility(flags)) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4668
      is_illegal = true;
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4669
    } else {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4670
      if (is_initializer) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4671
        if (is_static || is_final || is_synchronized || is_native ||
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4672
            is_abstract || (major_gte_15 && is_bridge)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4673
          is_illegal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4674
        }
30136
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4675
      } else { // not initializer
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4676
        if (is_abstract) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4677
          if ((is_final || is_native || is_private || is_static ||
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4678
              (major_gte_15 && (is_synchronized || is_strict)))) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4679
            is_illegal = true;
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4680
          }
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4681
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4682
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4683
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4684
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4685
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4686
  if (is_illegal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4687
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4688
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4689
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4690
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4691
      "Method %s in class %s has illegal modifiers: 0x%X",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4692
      name->as_C_string(), _class_name->as_C_string(), flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4693
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4694
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4695
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4696
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4697
void ClassFileParser::verify_legal_utf8(const unsigned char* buffer,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4698
                                        int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4699
                                        TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4700
  assert(_need_verify, "only called when _need_verify is true");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4701
  if (!UTF8::is_legal_utf8(buffer, length, _major_version <= 47)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4702
    classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4703
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4704
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4705
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4706
// Unqualified names may not contain the characters '.', ';', '[', or '/'.
39218
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4707
// In class names, '/' separates unqualified names.  This is verified in this function also.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4708
// Method names also may not contain the characters '<' or '>', unless <init>
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4709
// or <clinit>.  Note that method names may not be <init> or <clinit> in this
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4710
// method.  Because these names have been checked as special cases before
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4711
// calling this method in verify_legal_method_name.
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4712
//
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4713
// This method is also called from the modular system APIs in modules.cpp
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4714
// to verify the validity of module and package names.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4715
bool ClassFileParser::verify_unqualified_name(const char* name,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4716
                                              unsigned int length,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4717
                                              int type) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4718
  for (const char* p = name; p != name + length;) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4719
    jchar ch = *p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4720
    if (ch < 128) {
42630
ae91fbc4b59f 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41744
diff changeset
  4721
      if (ch == '.' || ch == ';' || ch == '[' ) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4722
        return false;   // do not permit '.', ';', or '['
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4723
      }
39218
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4724
      if (ch == '/') {
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4725
        // check for '//' or leading or trailing '/' which are not legal
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4726
        // unqualified name must not be empty
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4727
        if (type == ClassFileParser::LegalClass) {
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4728
          if (p == name || p+1 >= name+length || *(p+1) == '/') {
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4729
           return false;
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4730
          }
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4731
        } else {
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4732
          return false;   // do not permit '/' unless it's class name
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4733
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4734
      }
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4735
      if (type == ClassFileParser::LegalMethod && (ch == '<' || ch == '>')) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4736
        return false;   // do not permit '<' or '>' in method names
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4737
      }
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4738
      p++;
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4739
    } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4740
      char* tmp_p = UTF8::next(p, &ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4741
      p = tmp_p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4742
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4743
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4744
  return true;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4745
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4746
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4747
// Take pointer to a string. Skip over the longest part of the string that could
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4748
// be taken as a fieldname. Allow '/' if slash_ok is true.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4749
// Return a pointer to just past the fieldname.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4750
// Return NULL if no fieldname at all was found, or in the case of slash_ok
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4751
// being true, we saw consecutive slashes (meaning we were looking for a
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4752
// qualified path but found something that was badly-formed).
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4753
static const char* skip_over_field_name(const char* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4754
                                        bool slash_ok,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4755
                                        unsigned int length) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4756
  const char* p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4757
  jboolean last_is_slash = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4758
  jboolean not_first_ch = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4759
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4760
  for (p = name; p != name + length; not_first_ch = true) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4761
    const char* old_p = p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4762
    jchar ch = *p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4763
    if (ch < 128) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4764
      p++;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4765
      // quick check for ascii
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4766
      if ((ch >= 'a' && ch <= 'z') ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4767
        (ch >= 'A' && ch <= 'Z') ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4768
        (ch == '_' || ch == '$') ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4769
        (not_first_ch && ch >= '0' && ch <= '9')) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4770
        last_is_slash = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4771
        continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4772
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4773
      if (slash_ok && ch == '/') {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4774
        if (last_is_slash) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4775
          return NULL;  // Don't permit consecutive slashes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4776
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4777
        last_is_slash = true;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4778
        continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4779
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4780
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4781
    else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4782
      jint unicode_ch;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4783
      char* tmp_p = UTF8::next_character(p, &unicode_ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4784
      p = tmp_p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4785
      last_is_slash = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4786
      // Check if ch is Java identifier start or is Java identifier part
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4787
      // 4672820: call java.lang.Character methods directly without generating separate tables.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4788
      EXCEPTION_MARK;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4789
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4790
      // return value
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4791
      JavaValue result(T_BOOLEAN);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4792
      // Set up the arguments to isJavaIdentifierStart and isJavaIdentifierPart
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4793
      JavaCallArguments args;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4794
      args.push_int(unicode_ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4795
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4796
      // public static boolean isJavaIdentifierStart(char ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4797
      JavaCalls::call_static(&result,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4798
        SystemDictionary::Character_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4799
        vmSymbols::isJavaIdentifierStart_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4800
        vmSymbols::int_bool_signature(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4801
        &args,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4802
        THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4803
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4804
      if (HAS_PENDING_EXCEPTION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4805
        CLEAR_PENDING_EXCEPTION;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4806
        return 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4807
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4808
      if (result.get_jboolean()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4809
        continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4810
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4811
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4812
      if (not_first_ch) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4813
        // public static boolean isJavaIdentifierPart(char ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4814
        JavaCalls::call_static(&result,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4815
          SystemDictionary::Character_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4816
          vmSymbols::isJavaIdentifierPart_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4817
          vmSymbols::int_bool_signature(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4818
          &args,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4819
          THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4820
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4821
        if (HAS_PENDING_EXCEPTION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4822
          CLEAR_PENDING_EXCEPTION;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4823
          return 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4824
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4825
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4826
        if (result.get_jboolean()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4827
          continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4828
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4829
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4830
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4831
    return (not_first_ch) ? old_p : NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4832
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4833
  return (not_first_ch) ? p : NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4834
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4835
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4836
// Take pointer to a string. Skip over the longest part of the string that could
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4837
// be taken as a field signature. Allow "void" if void_ok.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4838
// Return a pointer to just past the signature.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4839
// Return NULL if no legal signature is found.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4840
const char* ClassFileParser::skip_over_field_signature(const char* signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4841
                                                       bool void_ok,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4842
                                                       unsigned int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4843
                                                       TRAPS) const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4844
  unsigned int array_dim = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4845
  while (length > 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4846
    switch (signature[0]) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4847
    case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4848
    case JVM_SIGNATURE_BOOLEAN:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4849
    case JVM_SIGNATURE_BYTE:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4850
    case JVM_SIGNATURE_CHAR:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4851
    case JVM_SIGNATURE_SHORT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4852
    case JVM_SIGNATURE_INT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4853
    case JVM_SIGNATURE_FLOAT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4854
    case JVM_SIGNATURE_LONG:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4855
    case JVM_SIGNATURE_DOUBLE:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4856
      return signature + 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4857
    case JVM_SIGNATURE_CLASS: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4858
      if (_major_version < JAVA_1_5_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4859
        // Skip over the class name if one is there
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4860
        const char* const p = skip_over_field_name(signature + 1, true, --length);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4861
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4862
        // The next character better be a semicolon
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4863
        if (p && (p - signature) > 1 && p[0] == ';') {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4864
          return p + 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4865
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4866
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4867
      else {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4868
        // Skip leading 'L' and ignore first appearance of ';'
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4869
        length--;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4870
        signature++;
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4871
        char* c = strchr((char*) signature, ';');
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4872
        // Format check signature
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4873
        if (c != NULL) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4874
          ResourceMark rm(THREAD);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4875
          int newlen = c - (char*) signature;
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4876
          char* sig = NEW_RESOURCE_ARRAY(char, newlen + 1);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4877
          strncpy(sig, signature, newlen);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4878
          sig[newlen] = '\0';
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4879
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4880
          bool legal = verify_unqualified_name(sig, newlen, LegalClass);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4881
          if (!legal) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4882
            classfile_parse_error("Class name contains illegal character "
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4883
                                  "in descriptor in class file %s",
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4884
                                  CHECK_0);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4885
            return NULL;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4886
          }
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  4887
          return signature + newlen + 1;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4888
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4889
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4890
      return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4891
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4892
    case JVM_SIGNATURE_ARRAY:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4893
      array_dim++;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4894
      if (array_dim > 255) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4895
        // 4277370: array descriptor is valid only if it represents 255 or fewer dimensions.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4896
        classfile_parse_error("Array type descriptor has more than 255 dimensions in class file %s", CHECK_0);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4897
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4898
      // The rest of what's there better be a legal signature
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4899
      signature++;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4900
      length--;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4901
      void_ok = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4902
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4903
    default:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4904
      return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4905
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4906
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4907
  return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4908
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4909
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4910
// Checks if name is a legal class name.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4911
void ClassFileParser::verify_legal_class_name(const Symbol* name, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4912
  if (!_need_verify || _relax_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4913
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4914
  char buf[fixed_buffer_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4915
  char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4916
  unsigned int length = name->utf8_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4917
  bool legal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4918
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4919
  if (length > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4920
    const char* p;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4921
    if (bytes[0] == JVM_SIGNATURE_ARRAY) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4922
      p = skip_over_field_signature(bytes, false, length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4923
      legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4924
    } else if (_major_version < JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4925
      if (bytes[0] != '<') {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4926
        p = skip_over_field_name(bytes, true, length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4927
        legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4928
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4929
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4930
      // 4900761: relax the constraints based on JSR202 spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4931
      // Class names may be drawn from the entire Unicode character set.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4932
      // Identifiers between '/' must be unqualified names.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4933
      // The utf8 string has been verified when parsing cpool entries.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4934
      legal = verify_unqualified_name(bytes, length, LegalClass);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4935
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4936
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4937
  if (!legal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4938
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4939
    assert(_class_name != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4940
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4941
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4942
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4943
      "Illegal class name \"%s\" in class file %s", bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4944
      _class_name->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4945
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4946
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4947
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4948
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4949
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4950
// Checks if name is a legal field name.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4951
void ClassFileParser::verify_legal_field_name(const Symbol* name, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4952
  if (!_need_verify || _relax_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4953
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4954
  char buf[fixed_buffer_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4955
  char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4956
  unsigned int length = name->utf8_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4957
  bool legal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4958
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4959
  if (length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4960
    if (_major_version < JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4961
      if (bytes[0] != '<') {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4962
        const char* p = skip_over_field_name(bytes, false, length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4963
        legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4964
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4965
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4966
      // 4881221: relax the constraints based on JSR202 spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4967
      legal = verify_unqualified_name(bytes, length, LegalField);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4968
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4969
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4970
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4971
  if (!legal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4972
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4973
    assert(_class_name != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4974
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4975
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4976
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4977
      "Illegal field name \"%s\" in class %s", bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4978
      _class_name->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4979
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4980
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4981
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4982
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4983
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4984
// Checks if name is a legal method name.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4985
void ClassFileParser::verify_legal_method_name(const Symbol* name, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4986
  if (!_need_verify || _relax_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4987
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4988
  assert(name != NULL, "method name is null");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4989
  char buf[fixed_buffer_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4990
  char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4991
  unsigned int length = name->utf8_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4992
  bool legal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4993
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4994
  if (length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4995
    if (bytes[0] == '<') {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4996
      if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4997
        legal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4998
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4999
    } else if (_major_version < JAVA_1_5_VERSION) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5000
      const char* p;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5001
      p = skip_over_field_name(bytes, false, length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5002
      legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5003
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5004
      // 4881221: relax the constraints based on JSR202 spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5005
      legal = verify_unqualified_name(bytes, length, LegalMethod);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5006
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5007
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5008
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5009
  if (!legal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5010
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5011
    assert(_class_name != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5012
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5013
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  5014
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5015
      "Illegal method name \"%s\" in class %s", bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5016
      _class_name->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5017
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5018
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5019
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5020
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5021
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5022
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5023
// Checks if signature is a legal field signature.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5024
void ClassFileParser::verify_legal_field_signature(const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5025
                                                   const Symbol* signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5026
                                                   TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5027
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5028
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5029
  char buf[fixed_buffer_size];
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5030
  const char* const bytes = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5031
  const unsigned int length = signature->utf8_length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5032
  const char* const p = skip_over_field_signature(bytes, false, length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5033
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5034
  if (p == NULL || (p - bytes) != (int)length) {
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  5035
    throwIllegalSignature("Field", name, signature, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5036
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5037
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5038
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5039
// Checks if signature is a legal method signature.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5040
// Returns number of parameters
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5041
int ClassFileParser::verify_legal_method_signature(const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5042
                                                   const Symbol* signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5043
                                                   TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5044
  if (!_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5045
    // make sure caller's args_size will be less than 0 even for non-static
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5046
    // method so it will be recomputed in compute_size_of_parameters().
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5047
    return -2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5048
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5049
33799
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5050
  // Class initializers cannot have args for class format version >= 51.
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5051
  if (name == vmSymbols::class_initializer_name() &&
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5052
      signature != vmSymbols::void_method_signature() &&
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5053
      _major_version >= JAVA_7_VERSION) {
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5054
    throwIllegalSignature("Method", name, signature, CHECK_0);
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5055
    return 0;
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5056
  }
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5057
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5058
  unsigned int args_size = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5059
  char buf[fixed_buffer_size];
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5060
  const char* p = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5061
  unsigned int length = signature->utf8_length();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5062
  const char* nextp;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5063
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5064
  // The first character must be a '('
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5065
  if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5066
    length--;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5067
    // Skip over legal field signatures
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5068
    nextp = skip_over_field_signature(p, false, length, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5069
    while ((length > 0) && (nextp != NULL)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5070
      args_size++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5071
      if (p[0] == 'J' || p[0] == 'D') {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5072
        args_size++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5073
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5074
      length -= nextp - p;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5075
      p = nextp;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5076
      nextp = skip_over_field_signature(p, false, length, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5077
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5078
    // The first non-signature thing better be a ')'
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5079
    if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5080
      length--;
33799
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5081
      if (name->utf8_length() > 0 && name->byte_at(0) == '<') {
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5082
        // All internal methods must return void
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5083
        if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5084
          return args_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5085
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5086
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5087
        // Now we better just have a return value
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5088
        nextp = skip_over_field_signature(p, true, length, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5089
        if (nextp && ((int)length == (nextp - p))) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5090
          return args_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5091
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5092
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5093
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5094
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5095
  // Report error
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  5096
  throwIllegalSignature("Method", name, signature, CHECK_0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5097
  return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5098
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5099
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5100
int ClassFileParser::static_field_size() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5101
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5102
  return _field_info->static_field_size;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5103
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5104
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5105
int ClassFileParser::total_oop_map_count() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5106
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5107
  return _field_info->total_oop_map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5108
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5109
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5110
jint ClassFileParser::layout_size() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5111
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5112
  return _field_info->instance_size;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5113
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5114
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5115
static void check_methods_for_intrinsics(const InstanceKlass* ik,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5116
                                         const Array<Method*>* methods) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5117
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5118
  assert(methods != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5119
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5120
  // Set up Method*::intrinsic_id as soon as we know the names of methods.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5121
  // (We used to do this lazily, but now we query it in Rewriter,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5122
  // which is eagerly done for every method, so we might as well do it now,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5123
  // when everything is fresh in memory.)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5124
  const vmSymbols::SID klass_id = Method::klass_id_for_intrinsics(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5125
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5126
  if (klass_id != vmSymbols::NO_SID) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5127
    for (int j = 0; j < methods->length(); ++j) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5128
      Method* method = methods->at(j);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5129
      method->init_intrinsic_id();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5130
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5131
      if (CheckIntrinsics) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5132
        // Check if an intrinsic is defined for method 'method',
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5133
        // but the method is not annotated with @HotSpotIntrinsicCandidate.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5134
        if (method->intrinsic_id() != vmIntrinsics::_none &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5135
            !method->intrinsic_candidate()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5136
              tty->print("Compiler intrinsic is defined for method [%s], "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5137
              "but the method is not annotated with @HotSpotIntrinsicCandidate.%s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5138
              method->name_and_sig_as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5139
              NOT_DEBUG(" Method will not be inlined.") DEBUG_ONLY(" Exiting.")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5140
            );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5141
          tty->cr();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5142
          DEBUG_ONLY(vm_exit(1));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5143
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5144
        // Check is the method 'method' is annotated with @HotSpotIntrinsicCandidate,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5145
        // but there is no intrinsic available for it.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5146
        if (method->intrinsic_candidate() &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5147
          method->intrinsic_id() == vmIntrinsics::_none) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5148
            tty->print("Method [%s] is annotated with @HotSpotIntrinsicCandidate, "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5149
              "but no compiler intrinsic is defined for the method.%s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5150
              method->name_and_sig_as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5151
              NOT_DEBUG("") DEBUG_ONLY(" Exiting.")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5152
            );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5153
          tty->cr();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5154
          DEBUG_ONLY(vm_exit(1));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5155
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5156
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5157
    } // end for
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5158
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5159
#ifdef ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5160
    if (CheckIntrinsics) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5161
      // Check for orphan methods in the current class. A method m
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5162
      // of a class C is orphan if an intrinsic is defined for method m,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5163
      // but class C does not declare m.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5164
      // The check is potentially expensive, therefore it is available
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5165
      // only in debug builds.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5166
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5167
      for (int id = vmIntrinsics::FIRST_ID; id < (int)vmIntrinsics::ID_LIMIT; ++id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5168
        if (vmIntrinsics::_compiledLambdaForm == id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5169
          // The _compiledLamdbdaForm intrinsic is a special marker for bytecode
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5170
          // generated for the JVM from a LambdaForm and therefore no method
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5171
          // is defined for it.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5172
          continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5173
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5174
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5175
        if (vmIntrinsics::class_for(vmIntrinsics::ID_from(id)) == klass_id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5176
          // Check if the current class contains a method with the same
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5177
          // name, flags, signature.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5178
          bool match = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5179
          for (int j = 0; j < methods->length(); ++j) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5180
            const Method* method = methods->at(j);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5181
            if (method->intrinsic_id() == id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5182
              match = true;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5183
              break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5184
            }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5185
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5186
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5187
          if (!match) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5188
            char buf[1000];
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5189
            tty->print("Compiler intrinsic is defined for method [%s], "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5190
                       "but the method is not available in class [%s].%s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5191
                        vmIntrinsics::short_name_as_C_string(vmIntrinsics::ID_from(id),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5192
                                                             buf, sizeof(buf)),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5193
                        ik->name()->as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5194
                        NOT_DEBUG("") DEBUG_ONLY(" Exiting.")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5195
            );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5196
            tty->cr();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5197
            DEBUG_ONLY(vm_exit(1));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5198
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5199
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5200
      } // end for
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5201
    } // CheckIntrinsics
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5202
#endif // ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5203
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5204
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5205
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5206
InstanceKlass* ClassFileParser::create_instance_klass(bool changed_by_loadhook, TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5207
  if (_klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5208
    return _klass;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5209
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5210
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5211
  InstanceKlass* const ik =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5212
    InstanceKlass::allocate_instance_klass(*this, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5213
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5214
  fill_instance_klass(ik, changed_by_loadhook, CHECK_NULL);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5215
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5216
  assert(_klass == ik, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5217
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5218
  ik->set_has_passed_fingerprint_check(false);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5219
  if (UseAOT && ik->supers_have_passed_fingerprint_checks()) {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5220
    uint64_t aot_fp = AOTLoader::get_saved_fingerprint(ik);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5221
    if (aot_fp != 0 && aot_fp == _stream->compute_fingerprint()) {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5222
      // This class matches with a class saved in an AOT library
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5223
      ik->set_has_passed_fingerprint_check(true);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5224
    } else {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5225
      ResourceMark rm;
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5226
      log_info(class, fingerprint)("%s :  expected = " PTR64_FORMAT " actual = " PTR64_FORMAT,
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5227
                                 ik->external_name(), aot_fp, _stream->compute_fingerprint());
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5228
    }
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5229
  }
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5230
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5231
  return ik;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5232
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5233
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5234
void ClassFileParser::fill_instance_klass(InstanceKlass* ik, bool changed_by_loadhook, TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5235
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5236
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5237
  set_klass_to_deallocate(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5238
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5239
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5240
  assert(ik->static_field_size() == _field_info->static_field_size, "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5241
  assert(ik->nonstatic_oop_map_count() == _field_info->total_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5242
    "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5243
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5244
  assert(ik->is_instance_klass(), "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5245
  assert(ik->size_helper() == _field_info->instance_size, "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5246
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5247
  // Fill in information already parsed
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5248
  ik->set_should_verify_class(_need_verify);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5249
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5250
  // Not yet: supers are done below to support the new subtype-checking fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5251
  ik->set_class_loader_data(_loader_data);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5252
  ik->set_nonstatic_field_size(_field_info->nonstatic_field_size);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5253
  ik->set_has_nonstatic_fields(_field_info->has_nonstatic_fields);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5254
  assert(_fac != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5255
  ik->set_static_oop_field_count(_fac->count[STATIC_OOP]);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5256
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5257
  // this transfers ownership of a lot of arrays from
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5258
  // the parser onto the InstanceKlass*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5259
  apply_parsed_class_metadata(ik, _java_fields_count, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5260
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5261
  // note that is not safe to use the fields in the parser from this point on
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5262
  assert(NULL == _cp, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5263
  assert(NULL == _fields, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5264
  assert(NULL == _methods, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5265
  assert(NULL == _inner_classes, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5266
  assert(NULL == _local_interfaces, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5267
  assert(NULL == _transitive_interfaces, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5268
  assert(NULL == _combined_annotations, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5269
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5270
  if (_has_final_method) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5271
    ik->set_has_final_method();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5272
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5273
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5274
  ik->copy_method_ordering(_method_ordering, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5275
  // The InstanceKlass::_methods_jmethod_ids cache
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5276
  // is managed on the assumption that the initial cache
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5277
  // size is equal to the number of methods in the class. If
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5278
  // that changes, then InstanceKlass::idnum_can_increment()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5279
  // has to be changed accordingly.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5280
  ik->set_initial_method_idnum(ik->methods()->length());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5281
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5282
  ik->set_name(_class_name);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5283
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5284
  if (is_anonymous()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5285
    // I am well known to myself
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5286
    ik->constants()->klass_at_put(_this_class_index, ik); // eagerly resolve
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5287
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5288
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5289
  ik->set_minor_version(_minor_version);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5290
  ik->set_major_version(_major_version);
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5291
  ik->set_has_nonstatic_concrete_methods(_has_nonstatic_concrete_methods);
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5292
  ik->set_declares_nonstatic_concrete_methods(_declares_nonstatic_concrete_methods);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5293
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5294
  if (_host_klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5295
    assert (ik->is_anonymous(), "should be the same");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5296
    ik->set_host_klass(_host_klass);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5297
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5298
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5299
  // Set PackageEntry for this_klass
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5300
  oop cl = ik->class_loader();
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5301
  Handle clh = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(cl));
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5302
  ClassLoaderData* cld = ClassLoaderData::class_loader_data_or_null(clh());
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5303
  ik->set_package(cld, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5304
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5305
  const Array<Method*>* const methods = ik->methods();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5306
  assert(methods != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5307
  const int methods_len = methods->length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5308
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5309
  check_methods_for_intrinsics(ik, methods);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5310
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5311
  // Fill in field values obtained by parse_classfile_attributes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5312
  if (_parsed_annotations->has_any_annotations()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5313
    _parsed_annotations->apply_to(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5314
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5315
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5316
  apply_parsed_class_attributes(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5317
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5318
  // Miranda methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5319
  if ((_num_miranda_methods > 0) ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5320
      // if this class introduced new miranda methods or
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5321
      (_super_klass != NULL && _super_klass->has_miranda_methods())
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5322
        // super class exists and this class inherited miranda methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5323
     ) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5324
       ik->set_has_miranda_methods(); // then set a flag
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5325
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5326
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5327
  // Fill in information needed to compute superclasses.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5328
  ik->initialize_supers(const_cast<InstanceKlass*>(_super_klass), CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5329
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5330
  // Initialize itable offset tables
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5331
  klassItable::setup_itable_offset_table(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5332
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5333
  // Compute transitive closure of interfaces this class implements
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5334
  // Do final class setup
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5335
  fill_oop_maps(ik,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5336
                _field_info->nonstatic_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5337
                _field_info->nonstatic_oop_offsets,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5338
                _field_info->nonstatic_oop_counts);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5339
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5340
  // Fill in has_finalizer, has_vanilla_constructor, and layout_helper
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5341
  set_precomputed_flags(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5342
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5343
  // check if this class can access its super class
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5344
  check_super_class_access(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5345
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5346
  // check if this class can access its superinterfaces
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5347
  check_super_interface_access(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5348
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5349
  // check if this class overrides any final method
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5350
  check_final_method_override(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5351
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5352
  // reject static interface methods prior to Java 8
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5353
  if (ik->is_interface() && _major_version < JAVA_8_VERSION) {
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5354
    check_illegal_static_method(ik, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5355
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5356
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5357
  // Obtain this_klass' module entry
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5358
  ModuleEntry* module_entry = ik->module();
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5359
  assert(module_entry != NULL, "module_entry should always be set");
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5360
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5361
  // Obtain java.lang.reflect.Module
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5362
  Handle module_handle(THREAD, JNIHandles::resolve(module_entry->module()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5363
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5364
  // Allocate mirror and initialize static fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5365
  // The create_mirror() call will also call compute_modifiers()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5366
  java_lang_Class::create_mirror(ik,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  5367
                                 Handle(THREAD, _loader_data->class_loader()),
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5368
                                 module_handle,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5369
                                 _protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5370
                                 CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5371
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5372
  assert(_all_mirandas != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5373
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5374
  // Generate any default methods - default methods are public interface methods
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5375
  // that have a default implementation.  This is new with Java 8.
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5376
  if (_has_nonstatic_concrete_methods) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5377
    DefaultMethods::generate_default_methods(ik,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5378
                                             _all_mirandas,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5379
                                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5380
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5381
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5382
  // Add read edges to the unnamed modules of the bootstrap and app class loaders.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5383
  if (changed_by_loadhook && !module_handle.is_null() && module_entry->is_named() &&
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5384
      !module_entry->has_default_read_edges()) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5385
    if (!module_entry->set_has_default_read_edges()) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5386
      // We won a potential race
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5387
      JvmtiExport::add_default_read_edges(module_handle, THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5388
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5389
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5390
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5391
  // Update the loader_data graph.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5392
  record_defined_class_dependencies(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5393
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5394
  ClassLoadingService::notify_class_loaded(ik, false /* not shared class */);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5395
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5396
  if (!is_internal()) {
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5397
    if (log_is_enabled(Info, class, load)) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5398
      ResourceMark rm;
39277
460f34bbd0c0 8157490: JCK test vm/jni/DefineClass/dfcl001/dfcl00101m1/dfcl00101m1 crashes when run with -Xlog:classload=info
mockner
parents: 39218
diff changeset
  5399
      const char* module_name = (module_entry->name() == NULL) ? UNNAMED_MODULE : module_entry->name()->as_C_string();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5400
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5401
      if (log_is_enabled(Info, class, load)) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5402
        ik->print_loading_log(LogLevel::Info, _loader_data, module_name, _stream);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5403
      }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5404
      // No 'else' here as logging levels are not mutually exclusive
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5405
      if (log_is_enabled(Debug, class, load)) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5406
        ik->print_loading_log(LogLevel::Debug, _loader_data, module_name, _stream);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5407
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5408
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5409
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5410
    if (log_is_enabled(Debug, class, resolve))  {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5411
      ResourceMark rm;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5412
      // print out the superclass.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5413
      const char * from = ik->external_name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5414
      if (ik->java_super() != NULL) {
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5415
        log_debug(class, resolve)("%s %s (super)",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5416
                   from,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5417
                   ik->java_super()->external_name());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5418
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5419
      // print out each of the interface classes referred to by this class.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5420
      const Array<Klass*>* const local_interfaces = ik->local_interfaces();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5421
      if (local_interfaces != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5422
        const int length = local_interfaces->length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5423
        for (int i = 0; i < length; i++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5424
          const Klass* const k = local_interfaces->at(i);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5425
          const char * to = k->external_name();
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5426
          log_debug(class, resolve)("%s %s (interface)", from, to);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5427
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5428
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5429
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5430
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5431
42639
762117d57d05 8170672: Event-based tracing to support classloader instances
mgronlun
parents: 42574
diff changeset
  5432
  TRACE_INIT_ID(ik);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5433
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5434
  // If we reach here, all is well.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5435
  // Now remove the InstanceKlass* from the _klass_to_deallocate field
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5436
  // in order for it to not be destroyed in the ClassFileParser destructor.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5437
  set_klass_to_deallocate(NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5438
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5439
  // it's official
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5440
  set_klass(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5441
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5442
  debug_only(ik->verify();)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5443
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5444
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5445
// For an anonymous class that is in the unnamed package, move it to its host class's
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5446
// package by prepending its host class's package name to its class name and setting
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5447
// its _class_name field.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5448
void ClassFileParser::prepend_host_package_name(const InstanceKlass* host_klass, TRAPS) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5449
  ResourceMark rm(THREAD);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5450
  assert(strrchr(_class_name->as_C_string(), '/') == NULL,
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5451
         "Anonymous class should not be in a package");
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5452
  const char* host_pkg_name =
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5453
    ClassLoader::package_from_name(host_klass->name()->as_C_string(), NULL);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5454
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5455
  if (host_pkg_name != NULL) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5456
    size_t host_pkg_len = strlen(host_pkg_name);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5457
    int class_name_len = _class_name->utf8_length();
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5458
    char* new_anon_name =
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5459
      NEW_RESOURCE_ARRAY(char, host_pkg_len + 1 + class_name_len);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5460
    // Copy host package name and trailing /.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5461
    strncpy(new_anon_name, host_pkg_name, host_pkg_len);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5462
    new_anon_name[host_pkg_len] = '/';
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5463
    // Append anonymous class name. The anonymous class name can contain odd
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5464
    // characters.  So, do a strncpy instead of using sprintf("%s...").
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5465
    strncpy(new_anon_name + host_pkg_len + 1, (char *)_class_name->base(), class_name_len);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5466
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5467
    // Create a symbol and update the anonymous class name.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5468
    _class_name = SymbolTable::new_symbol(new_anon_name,
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5469
                                          (int)host_pkg_len + 1 + class_name_len,
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5470
                                          CHECK);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5471
  }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5472
}
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5473
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5474
// If the host class and the anonymous class are in the same package then do
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5475
// nothing.  If the anonymous class is in the unnamed package then move it to its
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5476
// host's package.  If the classes are in different packages then throw an IAE
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5477
// exception.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5478
void ClassFileParser::fix_anonymous_class_name(TRAPS) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5479
  assert(_host_klass != NULL, "Expected an anonymous class");
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5480
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5481
  const jbyte* anon_last_slash = UTF8::strrchr(_class_name->base(),
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5482
                                               _class_name->utf8_length(), '/');
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5483
  if (anon_last_slash == NULL) {  // Unnamed package
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5484
    prepend_host_package_name(_host_klass, CHECK);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5485
  } else {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5486
    if (!InstanceKlass::is_same_class_package(_host_klass->class_loader(),
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5487
                                              _host_klass->name(),
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5488
                                              _host_klass->class_loader(),
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5489
                                              _class_name)) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5490
      ResourceMark rm(THREAD);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5491
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5492
        err_msg("Host class %s and anonymous class %s are in different packages",
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5493
        _host_klass->name()->as_C_string(), _class_name->as_C_string()));
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5494
    }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5495
  }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5496
}
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5497
40856
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5498
static bool relax_format_check_for(ClassLoaderData* loader_data) {
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5499
  bool trusted = (loader_data->is_the_null_class_loader_data() ||
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5500
                  SystemDictionary::is_platform_class_loader(loader_data->class_loader()));
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5501
  bool need_verify =
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5502
    // verifyAll
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5503
    (BytecodeVerificationLocal && BytecodeVerificationRemote) ||
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5504
    // verifyRemote
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5505
    (!BytecodeVerificationLocal && BytecodeVerificationRemote && !trusted);
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5506
  return !need_verify;
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5507
}
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5508
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5509
ClassFileParser::ClassFileParser(ClassFileStream* stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5510
                                 Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5511
                                 ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5512
                                 Handle protection_domain,
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5513
                                 const InstanceKlass* host_klass,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5514
                                 GrowableArray<Handle>* cp_patches,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5515
                                 Publicity pub_level,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5516
                                 TRAPS) :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5517
  _stream(stream),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5518
  _requested_name(name),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5519
  _loader_data(loader_data),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5520
  _host_klass(host_klass),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5521
  _cp_patches(cp_patches),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5522
  _super_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5523
  _cp(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5524
  _fields(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5525
  _methods(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5526
  _inner_classes(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5527
  _local_interfaces(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5528
  _transitive_interfaces(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5529
  _combined_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5530
  _annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5531
  _type_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5532
  _fields_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5533
  _fields_type_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5534
  _klass(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5535
  _klass_to_deallocate(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5536
  _parsed_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5537
  _fac(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5538
  _field_info(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5539
  _method_ordering(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5540
  _all_mirandas(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5541
  _vtable_size(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5542
  _itable_size(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5543
  _num_miranda_methods(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5544
  _rt(REF_NONE),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5545
  _protection_domain(protection_domain),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5546
  _access_flags(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5547
  _pub_level(pub_level),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5548
  _synthetic_flag(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5549
  _sde_length(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5550
  _sde_buffer(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5551
  _sourcefile_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5552
  _generic_signature_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5553
  _major_version(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5554
  _minor_version(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5555
  _this_class_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5556
  _super_class_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5557
  _itfs_len(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5558
  _java_fields_count(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5559
  _need_verify(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5560
  _relax_verify(false),
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5561
  _has_nonstatic_concrete_methods(false),
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5562
  _declares_nonstatic_concrete_methods(false),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5563
  _has_final_method(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5564
  _has_finalizer(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5565
  _has_empty_finalizer(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5566
  _has_vanilla_constructor(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5567
  _max_bootstrap_specifier_index(-1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5568
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5569
  _class_name = name != NULL ? name : vmSymbols::unknown_class_name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5570
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5571
  assert(THREAD->is_Java_thread(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5572
  assert(_loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5573
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5574
  assert(_stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5575
  assert(_stream->buffer() == _stream->current(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5576
  assert(_class_name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5577
  assert(0 == _access_flags.as_int(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5578
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5579
  // Figure out whether we can skip format checking (matching classic VM behavior)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5580
  if (DumpSharedSpaces) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5581
    // verify == true means it's a 'remote' class (i.e., non-boot class)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5582
    // Verification decision is based on BytecodeVerificationRemote flag
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5583
    // for those classes.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5584
    _need_verify = (stream->need_verify()) ? BytecodeVerificationRemote :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5585
                                              BytecodeVerificationLocal;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5586
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5587
  else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5588
    _need_verify = Verifier::should_verify_for(_loader_data->class_loader(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5589
                                               stream->need_verify());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5590
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5591
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5592
  // synch back verification state to stream
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5593
  stream->set_verify(_need_verify);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5594
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5595
  // Check if verification needs to be relaxed for this class file
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5596
  // Do not restrict it to jdk1.0 or jdk1.1 to maintain backward compatibility (4982376)
40856
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5597
  _relax_verify = relax_format_check_for(_loader_data);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5598
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5599
  parse_stream(stream, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5600
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5601
  post_process_parsed_stream(stream, _cp, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5602
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5603
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5604
void ClassFileParser::clear_class_metadata() {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5605
  // metadata created before the instance klass is created.  Must be
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5606
  // deallocated if classfile parsing returns an error.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5607
  _cp = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5608
  _fields = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5609
  _methods = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5610
  _inner_classes = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5611
  _local_interfaces = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5612
  _transitive_interfaces = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5613
  _combined_annotations = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5614
  _annotations = _type_annotations = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5615
  _fields_annotations = _fields_type_annotations = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5616
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5617
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5618
// Destructor to clean up
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5619
ClassFileParser::~ClassFileParser() {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5620
  if (_cp != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5621
    MetadataFactory::free_metadata(_loader_data, _cp);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5622
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5623
  if (_fields != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5624
    MetadataFactory::free_array<u2>(_loader_data, _fields);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5625
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5626
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5627
  if (_methods != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5628
    // Free methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5629
    InstanceKlass::deallocate_methods(_loader_data, _methods);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5630
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5631
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5632
  // beware of the Universe::empty_blah_array!!
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5633
  if (_inner_classes != NULL && _inner_classes != Universe::the_empty_short_array()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5634
    MetadataFactory::free_array<u2>(_loader_data, _inner_classes);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5635
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5636
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5637
  // Free interfaces
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5638
  InstanceKlass::deallocate_interfaces(_loader_data, _super_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5639
                                       _local_interfaces, _transitive_interfaces);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5640
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5641
  if (_combined_annotations != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5642
    // After all annotations arrays have been created, they are installed into the
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5643
    // Annotations object that will be assigned to the InstanceKlass being created.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5644
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5645
    // Deallocate the Annotations object and the installed annotations arrays.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5646
    _combined_annotations->deallocate_contents(_loader_data);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5647
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5648
    // If the _combined_annotations pointer is non-NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5649
    // then the other annotations fields should have been cleared.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5650
    assert(_annotations             == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5651
    assert(_type_annotations        == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5652
    assert(_fields_annotations      == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5653
    assert(_fields_type_annotations == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5654
  } else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5655
    // If the annotations arrays were not installed into the Annotations object,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5656
    // then they have to be deallocated explicitly.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5657
    MetadataFactory::free_array<u1>(_loader_data, _annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5658
    MetadataFactory::free_array<u1>(_loader_data, _type_annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5659
    Annotations::free_contents(_loader_data, _fields_annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5660
    Annotations::free_contents(_loader_data, _fields_type_annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5661
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5662
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5663
  clear_class_metadata();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5664
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5665
  // deallocate the klass if already created.  Don't directly deallocate, but add
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5666
  // to the deallocate list so that the klass is removed from the CLD::_klasses list
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5667
  // at a safepoint.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5668
  if (_klass_to_deallocate != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5669
    _loader_data->add_to_deallocate_list(_klass_to_deallocate);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5670
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5671
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5672
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5673
void ClassFileParser::parse_stream(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5674
                                   TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5675
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5676
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5677
  assert(_class_name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5678
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5679
  // BEGIN STREAM PARSING
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5680
  stream->guarantee_more(8, CHECK);  // magic, major, minor
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5681
  // Magic value
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5682
  const u4 magic = stream->get_u4_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5683
  guarantee_property(magic == JAVA_CLASSFILE_MAGIC,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5684
                     "Incompatible magic value %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5685
                     magic, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5686
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5687
  // Version numbers
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5688
  _minor_version = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5689
  _major_version = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5690
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5691
  if (DumpSharedSpaces && _major_version < JAVA_1_5_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5692
    ResourceMark rm;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5693
    warning("Pre JDK 1.5 class not supported by CDS: %u.%u %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5694
            _major_version,  _minor_version, _class_name->as_C_string());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5695
    Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5696
      THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5697
      vmSymbols::java_lang_UnsupportedClassVersionError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5698
      "Unsupported major.minor version for dump time %u.%u",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5699
      _major_version,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5700
      _minor_version);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5701
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5702
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5703
  // Check version numbers - we check this even with verifier off
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5704
  if (!is_supported_version(_major_version, _minor_version)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5705
    ResourceMark rm(THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5706
    Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5707
      THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5708
      vmSymbols::java_lang_UnsupportedClassVersionError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5709
      "%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5710
      "this version of the Java Runtime only recognizes class file versions up to %u.%u",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5711
      _class_name->as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5712
      _major_version,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5713
      _minor_version,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5714
      JAVA_MAX_SUPPORTED_VERSION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5715
      JAVA_MAX_SUPPORTED_MINOR_VERSION);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5716
    return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5717
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5718
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5719
  stream->guarantee_more(3, CHECK); // length, first cp tag
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5720
  const u2 cp_size = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5721
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5722
  guarantee_property(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5723
    cp_size >= 1, "Illegal constant pool size %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5724
    cp_size, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5725
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5726
  _cp = ConstantPool::allocate(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5727
                               cp_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5728
                               CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5729
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5730
  ConstantPool* const cp = _cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5731
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5732
  parse_constant_pool(stream, cp, cp_size, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5733
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5734
  assert(cp_size == (const u2)cp->length(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5735
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5736
  // ACCESS FLAGS
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5737
  stream->guarantee_more(8, CHECK);  // flags, this_class, super_class, infs_len
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5738
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5739
  // Access flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5740
  jint flags = stream->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5741
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5742
  if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5743
    // Set abstract bit for old class files for backward compatibility
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5744
    flags |= JVM_ACC_ABSTRACT;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5745
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5746
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5747
  _access_flags.set_flags(flags);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5748
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5749
  verify_legal_class_modifiers((jint)_access_flags.as_int(), CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5750
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5751
  // This class and superclass
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5752
  _this_class_index = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5753
  check_property(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5754
    valid_cp_range(_this_class_index, cp_size) &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5755
      cp->tag_at(_this_class_index).is_unresolved_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5756
    "Invalid this class index %u in constant pool in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5757
    _this_class_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5758
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5759
  Symbol* const class_name_in_cp = cp->klass_name_at(_this_class_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5760
  assert(class_name_in_cp != NULL, "class_name can't be null");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5761
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5762
  // Update _class_name which could be null previously
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5763
  // to reflect the name in the constant pool
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5764
  _class_name = class_name_in_cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5765
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5766
  // Don't need to check whether this class name is legal or not.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5767
  // It has been checked when constant pool is parsed.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5768
  // However, make sure it is not an array type.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5769
  if (_need_verify) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5770
    guarantee_property(_class_name->byte_at(0) != JVM_SIGNATURE_ARRAY,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5771
                       "Bad class name in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5772
                       CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5773
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5774
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5775
  // Checks if name in class file matches requested name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5776
  if (_requested_name != NULL && _requested_name != _class_name) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5777
    ResourceMark rm(THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5778
    Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5779
      THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5780
      vmSymbols::java_lang_NoClassDefFoundError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5781
      "%s (wrong name: %s)",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5782
      _class_name->as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5783
      _requested_name != NULL ? _requested_name->as_C_string() : "NoName"
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5784
    );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5785
    return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5786
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5787
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5788
  // if this is an anonymous class fix up its name if it's in the unnamed
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5789
  // package.  Otherwise, throw IAE if it is in a different package than
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5790
  // its host class.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5791
  if (_host_klass != NULL) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5792
    fix_anonymous_class_name(CHECK);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5793
  }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5794
40016
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  5795
  // Verification prevents us from creating names with dots in them, this
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  5796
  // asserts that that's the case.
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  5797
  assert(is_internal_format(_class_name), "external class name format used internally");
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  5798
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5799
  if (!is_internal()) {
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5800
    if (log_is_enabled(Debug, class, preorder)){
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  5801
      ResourceMark rm(THREAD);
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5802
      outputStream* log = Log(class, preorder)::debug_stream();
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  5803
      log->print("%s", _class_name->as_klass_external_name());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5804
      if (stream->source() != NULL) {
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  5805
        log->print(" source: %s", stream->source());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5806
      }
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  5807
      log->cr();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5808
    }
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  5809
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5810
#if INCLUDE_CDS
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5811
    if (DumpLoadedClassList != NULL && stream->source() != NULL && classlist_file->is_open()) {
38313
615905db3fe4 8149977: DumpLoadedClassList should not include generated classes.
jiangli
parents: 38177
diff changeset
  5812
      // Only dump the classes that can be stored into CDS archive.
615905db3fe4 8149977: DumpLoadedClassList should not include generated classes.
jiangli
parents: 38177
diff changeset
  5813
      // Anonymous classes such as generated LambdaForm classes are also not included.
615905db3fe4 8149977: DumpLoadedClassList should not include generated classes.
jiangli
parents: 38177
diff changeset
  5814
      if (SystemDictionaryShared::is_sharing_possible(_loader_data) &&
615905db3fe4 8149977: DumpLoadedClassList should not include generated classes.
jiangli
parents: 38177
diff changeset
  5815
          _host_klass == NULL) {
41741
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5816
        oop class_loader = _loader_data->class_loader();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5817
        ResourceMark rm(THREAD);
41741
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5818
        // For the boot and platform class loaders, check if the class is not found in the
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5819
        // java runtime image. Additional check for the boot class loader is if the class
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5820
        // is not found in the boot loader's appended entries. This indicates that the class
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5821
        // is not useable during run time, such as the ones found in the --patch-module entries,
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5822
        // so it should not be included in the classlist file.
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5823
        if (((class_loader == NULL && !ClassLoader::contains_append_entry(stream->source())) ||
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5824
             SystemDictionary::is_platform_class_loader(class_loader)) &&
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5825
            !ClassLoader::is_jrt(stream->source())) {
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5826
          tty->print_cr("skip writing class %s from source %s to classlist file",
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5827
            _class_name->as_C_string(), stream->source());
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5828
        } else {
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5829
          classlist_file->print_cr("%s", _class_name->as_C_string());
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5830
          classlist_file->flush();
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  5831
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5832
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5833
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5834
#endif
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5835
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5836
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5837
  // SUPERKLASS
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5838
  _super_class_index = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5839
  _super_klass = parse_super_class(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5840
                                   _super_class_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5841
                                   _need_verify,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5842
                                   CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5843
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5844
  // Interfaces
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5845
  _itfs_len = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5846
  parse_interfaces(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5847
                   _itfs_len,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5848
                   cp,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5849
                   &_has_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5850
                   CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5851
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5852
  assert(_local_interfaces != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5853
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5854
  // Fields (offsets are filled in later)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5855
  _fac = new FieldAllocationCount();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5856
  parse_fields(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5857
               _access_flags.is_interface(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5858
               _fac,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5859
               cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5860
               cp_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5861
               &_java_fields_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5862
               CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5863
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5864
  assert(_fields != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5865
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5866
  // Methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5867
  AccessFlags promoted_flags;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5868
  parse_methods(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5869
                _access_flags.is_interface(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5870
                &promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5871
                &_has_final_method,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5872
                &_declares_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5873
                CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5874
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5875
  assert(_methods != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5876
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5877
  // promote flags from parse_methods() to the klass' flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5878
  _access_flags.add_promoted_flags(promoted_flags.as_int());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5879
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5880
  if (_declares_nonstatic_concrete_methods) {
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5881
    _has_nonstatic_concrete_methods = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5882
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5883
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5884
  // Additional attributes/annotations
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5885
  _parsed_annotations = new ClassAnnotationCollector();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5886
  parse_classfile_attributes(stream, cp, _parsed_annotations, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5887
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5888
  assert(_inner_classes != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5889
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5890
  // Finalize the Annotations metadata object,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5891
  // now that all annotation arrays have been created.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5892
  create_combined_annotations(CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5893
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5894
  // Make sure this is the end of class file stream
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5895
  guarantee_property(stream->at_eos(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5896
                     "Extra bytes at the end of class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5897
                     CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5898
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5899
  // all bytes in stream read and parsed
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5900
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5901
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5902
void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5903
                                                 ConstantPool* cp,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5904
                                                 TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5905
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5906
  assert(stream->at_eos(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5907
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5908
  assert(_loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5909
41544
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  5910
  if (_class_name == vmSymbols::java_lang_Object()) {
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  5911
    check_property(_local_interfaces == Universe::the_empty_klass_array(),
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  5912
                   "java.lang.Object cannot implement an interface in class file %s",
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  5913
                   CHECK);
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  5914
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5915
  // We check super class after class file is parsed and format is checked
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5916
  if (_super_class_index > 0 && NULL ==_super_klass) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5917
    Symbol* const super_class_name = cp->klass_name_at(_super_class_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5918
    if (_access_flags.is_interface()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5919
      // Before attempting to resolve the superclass, check for class format
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5920
      // errors not checked yet.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5921
      guarantee_property(super_class_name == vmSymbols::java_lang_Object(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5922
        "Interfaces must have java.lang.Object as superclass in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5923
        CHECK);
38147
c020feaafdcb 8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream
ecaspole
parents: 38060
diff changeset
  5924
    }
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  5925
    Handle loader(THREAD, _loader_data->class_loader());
38147
c020feaafdcb 8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream
ecaspole
parents: 38060
diff changeset
  5926
    _super_klass = (const InstanceKlass*)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5927
                       SystemDictionary::resolve_super_or_fail(_class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5928
                                                               super_class_name,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  5929
                                                               loader,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5930
                                                               _protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5931
                                                               true,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5932
                                                               CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5933
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5934
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5935
  if (_super_klass != NULL) {
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5936
    if (_super_klass->has_nonstatic_concrete_methods()) {
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5937
      _has_nonstatic_concrete_methods = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5938
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5939
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5940
    if (_super_klass->is_interface()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5941
      ResourceMark rm(THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5942
      Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5943
        THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5944
        vmSymbols::java_lang_IncompatibleClassChangeError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5945
        "class %s has interface %s as super class",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5946
        _class_name->as_klass_external_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5947
        _super_klass->external_name()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5948
      );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5949
      return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5950
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5951
    // Make sure super class is not final
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5952
    if (_super_klass->is_final()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5953
      THROW_MSG(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5954
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5955
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5956
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5957
  // Compute the transitive list of all unique interfaces implemented by this class
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5958
  _transitive_interfaces =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5959
    compute_transitive_interfaces(_super_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5960
                                  _local_interfaces,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5961
                                  _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5962
                                  CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5963
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5964
  assert(_transitive_interfaces != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5965
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5966
  // sort methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5967
  _method_ordering = sort_methods(_methods);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5968
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5969
  _all_mirandas = new GrowableArray<Method*>(20);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5970
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  5971
  Handle loader(THREAD, _loader_data->class_loader());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5972
  klassVtable::compute_vtable_size_and_num_mirandas(&_vtable_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5973
                                                    &_num_miranda_methods,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5974
                                                    _all_mirandas,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5975
                                                    _super_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5976
                                                    _methods,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5977
                                                    _access_flags,
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 40016
diff changeset
  5978
                                                    _major_version,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  5979
                                                    loader,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5980
                                                    _class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5981
                                                    _local_interfaces,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5982
                                                    CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5983
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5984
  // Size of Java itable (in words)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5985
  _itable_size = _access_flags.is_interface() ? 0 :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5986
    klassItable::compute_itable_size(_transitive_interfaces);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5987
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5988
  assert(_fac != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5989
  assert(_parsed_annotations != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5990
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5991
  _field_info = new FieldLayoutInfo();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5992
  layout_fields(cp, _fac, _parsed_annotations, _field_info, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5993
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5994
  // Compute reference typ
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5995
  _rt = (NULL ==_super_klass) ? REF_NONE : _super_klass->reference_type();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5996
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5997
}
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5998
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5999
void ClassFileParser::set_klass(InstanceKlass* klass) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6000
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6001
#ifdef ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6002
  if (klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6003
    assert(NULL == _klass, "leaking?");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6004
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6005
#endif
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6006
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6007
  _klass = klass;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6008
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6009
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6010
void ClassFileParser::set_klass_to_deallocate(InstanceKlass* klass) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6011
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6012
#ifdef ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6013
  if (klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6014
    assert(NULL == _klass_to_deallocate, "leaking?");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6015
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6016
#endif
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6017
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6018
  _klass_to_deallocate = klass;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6019
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6020
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6021
// Caller responsible for ResourceMark
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6022
// clone stream with rewound position
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6023
const ClassFileStream* ClassFileParser::clone_stream() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6024
  assert(_stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6025
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6026
  return _stream->clone();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6027
}
40016
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6028
// ----------------------------------------------------------------------------
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6029
// debugging
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6030
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6031
#ifdef ASSERT
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6032
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6033
// return true if class_name contains no '.' (internal format is '/')
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6034
bool ClassFileParser::is_internal_format(Symbol* class_name) {
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6035
  if (class_name != NULL) {
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6036
    ResourceMark rm;
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6037
    char* name = class_name->as_C_string();
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6038
    return strchr(name, '.') == NULL;
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6039
  } else {
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6040
    return true;
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6041
  }
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6042
}
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6043
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6044
#endif