src/hotspot/share/classfile/classFileParser.cpp
author hseigel
Fri, 06 Apr 2018 09:59:48 -0400
changeset 49716 450d709262c1
parent 49677 a1a7456dd8b9
child 49948 ff8dbb56740a
permissions -rw-r--r--
8198908: Add JVM support for preview features Summary: Add new major and minor version checks Reviewed-by: dholmes, lfoltan
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
49340
4e82736053ae 8191102: Incorrect include file use in classLoader.hpp
hseigel
parents: 48826
diff changeset
     2
 * Copyright (c) 1997, 2018, 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"
47765
b7c7428eaab9 8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents: 47673
diff changeset
    25
#include "jvm.h"
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
    26
#include "aot/aotLoader.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    27
#include "classfile/classFileParser.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    28
#include "classfile/classFileStream.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    29
#include "classfile/classLoader.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    30
#include "classfile/classLoaderData.inline.hpp"
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
    31
#include "classfile/defaultMethods.hpp"
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
    32
#include "classfile/dictionary.hpp"
29081
c61eb4914428 8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents: 28817
diff changeset
    33
#include "classfile/javaClasses.inline.hpp"
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
    34
#include "classfile/moduleEntry.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    35
#include "classfile/symbolTable.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    36
#include "classfile/systemDictionary.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    37
#include "classfile/verificationType.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    38
#include "classfile/verifier.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    39
#include "classfile/vmSymbols.hpp"
35917
463d67f86eaa 8079408: Reimplement TraceClassLoading, TraceClassUnloading, and TraceClassLoaderData with Unified Logging.
mockner
parents: 35911
diff changeset
    40
#include "logging/log.hpp"
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
    41
#include "logging/logStream.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    42
#include "memory/allocation.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    43
#include "memory/metadataFactory.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    44
#include "memory/oopFactory.hpp"
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
    45
#include "memory/resourceArea.hpp"
49359
59f6547e151f 8199264: Remove universe.inline.hpp to simplify include dependencies
stefank
parents: 49348
diff changeset
    46
#include "memory/universe.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    47
#include "oops/annotations.hpp"
49340
4e82736053ae 8191102: Incorrect include file use in classLoader.hpp
hseigel
parents: 48826
diff changeset
    48
#include "oops/constantPool.inline.hpp"
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
    49
#include "oops/fieldStreams.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    50
#include "oops/instanceKlass.hpp"
8725
8c1e3dd5fe1b 7017732: move static fields into Class to prepare for perm gen removal
never
parents: 8676
diff changeset
    51
#include "oops/instanceMirrorKlass.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    52
#include "oops/klass.inline.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    53
#include "oops/klassVtable.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    54
#include "oops/metadata.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
    55
#include "oops/method.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    56
#include "oops/oop.inline.hpp"
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
    57
#include "oops/symbol.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    58
#include "prims/jvmtiExport.hpp"
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
    59
#include "prims/jvmtiThreadState.hpp"
49716
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
    60
#include "runtime/arguments.hpp"
49480
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
    61
#include "runtime/handles.inline.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    62
#include "runtime/javaCalls.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    63
#include "runtime/perfData.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    64
#include "runtime/reflection.hpp"
49594
898ef81cbc0e 8200106: Move NoSafepointVerifier out from gcLocker.hpp
stefank
parents: 49593
diff changeset
    65
#include "runtime/safepointVerifiers.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    66
#include "runtime/signature.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    67
#include "runtime/timer.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    68
#include "services/classLoadingService.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 7123
diff changeset
    69
#include "services/threadService.hpp"
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
    70
#include "trace/traceMacros.hpp"
46625
edefffab74e2 8183552: Move align functions to align.hpp
stefank
parents: 46619
diff changeset
    71
#include "utilities/align.hpp"
46502
116a09d8f142 8180755: Remove use of bitMap.inline.hpp include from instanceKlass.hpp and c1_ValueSet.hpp
tschatzl
parents: 46448
diff changeset
    72
#include "utilities/bitMap.inline.hpp"
49593
4dd58ecc9912 8200105: Remove cyclic dependency between oop.inline.hpp and collectedHeap.inline.hpp
stefank
parents: 49480
diff changeset
    73
#include "utilities/copy.hpp"
30764
fec48bf5a827 8079792: GC directory structure cleanup
pliden
parents: 30136
diff changeset
    74
#include "utilities/exceptions.hpp"
15194
a35093d73168 8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents: 15185
diff changeset
    75
#include "utilities/globalDefinitions.hpp"
46448
b5350a83520b 8153646: Move vm/utilities/array.hpp to vm/oops
hseigel
parents: 46444
diff changeset
    76
#include "utilities/growableArray.hpp"
27683
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    77
#include "utilities/macros.hpp"
26135
82b516c550f7 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 25507
diff changeset
    78
#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
    79
#include "utilities/resourceHash.hpp"
27683
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    80
#if INCLUDE_CDS
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    81
#include "classfile/systemDictionaryShared.hpp"
1d5707553fff 8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents: 27402
diff changeset
    82
#endif
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    83
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
    84
// 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
    85
// 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
    86
// 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
    87
// pool and when parsing line number tables.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    88
489c9b5090e2 Initial load
duke
parents:
diff changeset
    89
// We add assert in debug mode when class format is not checked.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
#define JAVA_CLASSFILE_MAGIC              0xCAFEBABE
489c9b5090e2 Initial load
duke
parents:
diff changeset
    92
#define JAVA_MIN_SUPPORTED_VERSION        45
49716
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
    93
#define JAVA_PREVIEW_MINOR_VERSION        65535
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    94
489c9b5090e2 Initial load
duke
parents:
diff changeset
    95
// Used for two backward compatibility reasons:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    96
// - to check for new additions to the class file format in JDK1.5
489c9b5090e2 Initial load
duke
parents:
diff changeset
    97
// - to check for bug fixes in the format checker in JDK1.5
489c9b5090e2 Initial load
duke
parents:
diff changeset
    98
#define JAVA_1_5_VERSION                  49
489c9b5090e2 Initial load
duke
parents:
diff changeset
    99
489c9b5090e2 Initial load
duke
parents:
diff changeset
   100
// Used for backward compatibility reasons:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   101
// - 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
   102
// - also used as the max version when running in jdk6
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   103
#define JAVA_6_VERSION                    50
489c9b5090e2 Initial load
duke
parents:
diff changeset
   104
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   105
// Used for backward compatibility reasons:
33799
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
   106
// - 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
   107
#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
   108
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   109
// Extension method support.
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   110
#define JAVA_8_VERSION                    52
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   111
35941
be5a3f551026 8148785: Update class file version to 53 for JDK-9
hseigel
parents: 35917
diff changeset
   112
#define JAVA_9_VERSION                    53
be5a3f551026 8148785: Update class file version to 53 for JDK-9
hseigel
parents: 35917
diff changeset
   113
48081
89829dd3cc54 8188870: Bump classfile version number to 54
psandoz
parents: 47765
diff changeset
   114
#define JAVA_10_VERSION                   54
89829dd3cc54 8188870: Bump classfile version number to 54
psandoz
parents: 47765
diff changeset
   115
48355
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48081
diff changeset
   116
#define JAVA_11_VERSION                   55
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48081
diff changeset
   117
44239
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   118
void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   119
  assert((bad_constant == 19 || bad_constant == 20) && _major_version >= JAVA_9_VERSION,
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   120
         "Unexpected bad constant pool entry");
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   121
  if (_bad_constant_seen == 0) _bad_constant_seen = bad_constant;
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   122
}
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   123
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   124
void ClassFileParser::parse_constant_pool_entries(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   125
                                                  ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   126
                                                  const int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   127
                                                  TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   128
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   129
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   130
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
  // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
  // this function (_current can be allocated in a register, with scalar
489c9b5090e2 Initial load
duke
parents:
diff changeset
   133
  // replacement of aggregates). The _current pointer is copied back to
489c9b5090e2 Initial load
duke
parents:
diff changeset
   134
  // stream() when this function returns. DON'T call another method within
489c9b5090e2 Initial load
duke
parents:
diff changeset
   135
  // this method that uses stream().
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   136
  const ClassFileStream cfs1 = *stream;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   137
  const ClassFileStream* const cfs = &cfs1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   138
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   139
  assert(cfs->allocated_on_stack(), "should be local");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   140
  debug_only(const u1* const old_current = stream->current();)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   141
489c9b5090e2 Initial load
duke
parents:
diff changeset
   142
  // Used for batching symbol allocations.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   143
  const char* names[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   144
  int lengths[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   145
  int indices[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   146
  unsigned int hashValues[SymbolTable::symbol_alloc_batch_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   147
  int names_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   148
489c9b5090e2 Initial load
duke
parents:
diff changeset
   149
  // parsing  Index 0 is unused
489c9b5090e2 Initial load
duke
parents:
diff changeset
   150
  for (int index = 1; index < length; index++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
    // Each of the following case guarantees one more byte in the stream
489c9b5090e2 Initial load
duke
parents:
diff changeset
   152
    // for the following tag or the access_flags following constant pool,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   153
    // so we don't need bounds-check for reading tag.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   154
    const u1 tag = cfs->get_u1_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   155
    switch (tag) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   156
      case JVM_CONSTANT_Class : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   157
        cfs->guarantee_more(3, CHECK);  // name_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   158
        const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   159
        cp->klass_index_at_put(index, name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   160
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   161
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   162
      case JVM_CONSTANT_Fieldref: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   163
        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
   164
        const u2 class_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   165
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   166
        cp->field_at_put(index, class_index, name_and_type_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   167
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   168
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   169
      case JVM_CONSTANT_Methodref: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   170
        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
   171
        const u2 class_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   172
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   173
        cp->method_at_put(index, class_index, name_and_type_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   175
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   176
      case JVM_CONSTANT_InterfaceMethodref: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   177
        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
   178
        const u2 class_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   179
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   180
        cp->interface_method_at_put(index, class_index, name_and_type_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   181
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   182
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   183
      case JVM_CONSTANT_String : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   184
        cfs->guarantee_more(3, CHECK);  // string_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   185
        const u2 string_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   186
        cp->string_index_at_put(index, string_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   188
      }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   189
      case JVM_CONSTANT_MethodHandle :
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   190
      case JVM_CONSTANT_MethodType: {
8675
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   191
        if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   192
          classfile_parse_error(
8675
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   193
            "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
   194
            tag, CHECK);
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   195
        }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   196
        if (tag == JVM_CONSTANT_MethodHandle) {
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   197
          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
   198
          const u1 ref_kind = cfs->get_u1_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   199
          const u2 method_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   200
          cp->method_handle_index_at_put(index, ref_kind, method_index);
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
        else if (tag == JVM_CONSTANT_MethodType) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   203
          cfs->guarantee_more(3, CHECK);  // signature_index, tag/access_flags
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   204
          const u2 signature_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   205
          cp->method_type_index_at_put(index, signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   206
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   207
        else {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   208
          ShouldNotReachHere();
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   209
        }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   210
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   211
      }
48826
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   212
      case JVM_CONSTANT_Dynamic : {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   213
        if (_major_version < Verifier::DYNAMICCONSTANT_MAJOR_VERSION) {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   214
          classfile_parse_error(
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   215
              "Class file version does not support constant tag %u in class file %s",
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   216
              tag, CHECK);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   217
        }
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   218
        cfs->guarantee_more(5, CHECK);  // bsm_index, nt, tag/access_flags
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   219
        const u2 bootstrap_specifier_index = cfs->get_u2_fast();
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   220
        const u2 name_and_type_index = cfs->get_u2_fast();
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   221
        if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index) {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   222
          _max_bootstrap_specifier_index = (int) bootstrap_specifier_index;  // collect for later
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   223
        }
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   224
        cp->dynamic_constant_at_put(index, bootstrap_specifier_index, name_and_type_index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   225
        break;
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   226
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   227
      case JVM_CONSTANT_InvokeDynamic : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   228
        if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   229
          classfile_parse_error(
8675
e9fef2a9bef7 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 8653
diff changeset
   230
              "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
   231
              tag, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   232
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   233
        cfs->guarantee_more(5, CHECK);  // bsm_index, nt, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   234
        const u2 bootstrap_specifier_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   235
        const u2 name_and_type_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   236
        if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   237
          _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
   238
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   239
        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
   240
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   241
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   242
      case JVM_CONSTANT_Integer: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   243
        cfs->guarantee_more(5, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   244
        const u4 bytes = cfs->get_u4_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   245
        cp->int_at_put(index, (jint)bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   246
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   247
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   248
      case JVM_CONSTANT_Float: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   249
        cfs->guarantee_more(5, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   250
        const u4 bytes = cfs->get_u4_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   251
        cp->float_at_put(index, *(jfloat*)&bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   252
        break;
34666
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_Long: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   255
        // A mangled type might cause you to overrun allocated memory
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   256
        guarantee_property(index + 1 < length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   257
                           "Invalid constant pool entry %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   258
                           index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   259
                           CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   260
        cfs->guarantee_more(9, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   261
        const u8 bytes = cfs->get_u8_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   262
        cp->long_at_put(index, bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   263
        index++;   // Skip entry following eigth-byte constant, see JVM book p. 98
489c9b5090e2 Initial load
duke
parents:
diff changeset
   264
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   265
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   266
      case JVM_CONSTANT_Double: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   267
        // A mangled type might cause you to overrun allocated memory
489c9b5090e2 Initial load
duke
parents:
diff changeset
   268
        guarantee_property(index+1 < length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   269
                           "Invalid constant pool entry %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   270
                           index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   271
                           CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   272
        cfs->guarantee_more(9, CHECK);  // bytes, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   273
        const u8 bytes = cfs->get_u8_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   274
        cp->double_at_put(index, *(jdouble*)&bytes);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   275
        index++;   // Skip entry following eigth-byte constant, see JVM book p. 98
489c9b5090e2 Initial load
duke
parents:
diff changeset
   276
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   277
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   278
      case JVM_CONSTANT_NameAndType: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   279
        cfs->guarantee_more(5, CHECK);  // name_index, signature_index, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   280
        const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   281
        const u2 signature_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   282
        cp->name_and_type_at_put(index, name_index, signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   283
        break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   284
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   285
      case JVM_CONSTANT_Utf8 : {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   286
        cfs->guarantee_more(2, CHECK);  // utf8_length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   287
        u2  utf8_length = cfs->get_u2_fast();
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
   288
        const u1* utf8_buffer = cfs->current();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   289
        assert(utf8_buffer != NULL, "null utf8 buffer");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   290
        // Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   291
        cfs->guarantee_more(utf8_length+1, CHECK);  // utf8 string, tag/access_flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   292
        cfs->skip_u1_fast(utf8_length);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   293
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   294
        // Before storing the symbol, make sure it's legal
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   295
        if (_need_verify) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   296
          verify_legal_utf8(utf8_buffer, utf8_length, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   297
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   298
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   299
        if (has_cp_patch_at(index)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   300
          Handle patch = clear_cp_patch_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   301
          guarantee_property(java_lang_String::is_instance(patch()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   302
                             "Illegal utf8 patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   303
                             index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   304
                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   305
          const char* const str = java_lang_String::as_utf8_string(patch());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   306
          // (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
   307
          utf8_buffer = (const u1*) str;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   308
          utf8_length = (int) strlen(str);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   309
        }
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
        unsigned int hash;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   312
        Symbol* const result = SymbolTable::lookup_only((const char*)utf8_buffer,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   313
                                                        utf8_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   314
                                                        hash);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   315
        if (result == NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   316
          names[names_count] = (const char*)utf8_buffer;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   317
          lengths[names_count] = utf8_length;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   318
          indices[names_count] = index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   319
          hashValues[names_count++] = hash;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   320
          if (names_count == SymbolTable::symbol_alloc_batch_size) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   321
            SymbolTable::new_symbols(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   322
                                     cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   323
                                     names_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   324
                                     names,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   325
                                     lengths,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   326
                                     indices,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   327
                                     hashValues,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   328
                                     CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   329
            names_count = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   330
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   331
        } else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   332
          cp->symbol_at_put(index, result);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   333
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   334
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   335
      }
44239
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   336
      case 19:
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   337
      case 20: {
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   338
        // Record that an error occurred in these two cases but keep parsing so
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   339
        // that ACC_Module can be checked for in the access_flags.  Need to
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   340
        // throw NoClassDefFoundError in that case.
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   341
        if (_major_version >= JAVA_9_VERSION) {
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   342
          cfs->guarantee_more(3, CHECK);
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   343
          cfs->get_u2_fast();
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   344
          set_class_bad_constant_seen(tag);
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   345
          break;
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   346
        }
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   347
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   348
      default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   349
        classfile_parse_error("Unknown constant tag %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   350
                              tag,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   351
                              CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   352
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   353
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   354
    } // end of switch(tag)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   355
  } // end of for
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   356
489c9b5090e2 Initial load
duke
parents:
diff changeset
   357
  // Allocate the remaining symbols
489c9b5090e2 Initial load
duke
parents:
diff changeset
   358
  if (names_count > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   359
    SymbolTable::new_symbols(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   360
                             cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   361
                             names_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   362
                             names,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   363
                             lengths,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   364
                             indices,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   365
                             hashValues,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   366
                             CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   367
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   369
  // Copy _current pointer of local copy back to stream.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   370
  assert(stream->current() == old_current, "non-exclusive use of stream");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   371
  stream->set_current(cfs1.current());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   372
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   373
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   374
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   375
static inline bool valid_cp_range(int index, int length) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   376
  return (index > 0 && index < length);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   377
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   378
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   379
static inline Symbol* check_symbol_at(const ConstantPool* cp, int index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   380
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   381
  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
   382
    return cp->symbol_at(index);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   383
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   384
  return NULL;
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
   385
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
   386
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
   387
#ifdef ASSERT
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   388
PRAGMA_DIAG_PUSH
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   389
PRAGMA_FORMAT_NONLITERAL_IGNORED
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   390
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
   391
  ResourceMark rm(THREAD);
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32824
diff changeset
   392
  fatal(msg, _class_name->as_C_string());
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   393
}
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   394
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   395
void ClassFileParser::report_assert_property_failure(const char* msg,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   396
                                                     int index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   397
                                                     TRAPS) const {
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   398
  ResourceMark rm(THREAD);
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32824
diff changeset
   399
  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
   400
}
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   401
PRAGMA_DIAG_POP
33604
ad1cd9269bd4 8139116: Fixes for warning "format not a string literal"
goetz
parents: 33602
diff changeset
   402
#endif
29201
fee2bbb2ec1d 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents: 29081
diff changeset
   403
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   404
void ClassFileParser::parse_constant_pool(const ClassFileStream* const stream,
44239
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   405
                                         ConstantPool* const cp,
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   406
                                         const int length,
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   407
                                         TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   408
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   409
  assert(stream != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   410
489c9b5090e2 Initial load
duke
parents:
diff changeset
   411
  // parsing constant pool entries
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   412
  parse_constant_pool_entries(stream, cp, length, CHECK);
44239
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   413
  if (class_bad_constant_seen() != 0) {
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   414
    // a bad CP entry has been detected previously so stop parsing and just return.
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   415
    return;
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
   416
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   417
489c9b5090e2 Initial load
duke
parents:
diff changeset
   418
  int index = 1;  // declared outside of loops for portability
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   419
  int num_klasses = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   420
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   421
  // first verification pass - validate cross references
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   422
  // and fixup class and string constants
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   423
  for (index = 1; index < length; index++) {          // Index 0 is unused
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   424
    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
   425
    switch (tag) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   426
      case JVM_CONSTANT_Class: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   427
        ShouldNotReachHere();     // Only JVM_CONSTANT_ClassIndex should be present
489c9b5090e2 Initial load
duke
parents:
diff changeset
   428
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   429
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   430
      case JVM_CONSTANT_Fieldref:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   431
        // fall through
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   432
      case JVM_CONSTANT_Methodref:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   433
        // fall through
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   434
      case JVM_CONSTANT_InterfaceMethodref: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   435
        if (!_need_verify) break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   436
        const int klass_ref_index = cp->klass_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   437
        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
   438
        check_property(valid_klass_reference_at(klass_ref_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   439
                       "Invalid constant pool index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   440
                       klass_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   441
        check_property(valid_cp_range(name_and_type_ref_index, length) &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   442
          cp->tag_at(name_and_type_ref_index).is_name_and_type(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   443
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   444
          name_and_type_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   445
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   446
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   447
      case JVM_CONSTANT_String: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   448
        ShouldNotReachHere();     // Only JVM_CONSTANT_StringIndex should be present
489c9b5090e2 Initial load
duke
parents:
diff changeset
   449
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   450
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   451
      case JVM_CONSTANT_Integer:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   452
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   453
      case JVM_CONSTANT_Float:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   454
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   455
      case JVM_CONSTANT_Long:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   456
      case JVM_CONSTANT_Double: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   457
        index++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   458
        check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
   459
          (index < length && cp->tag_at(index).is_invalid()),
489c9b5090e2 Initial load
duke
parents:
diff changeset
   460
          "Improper constant pool long/double index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   461
          index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   462
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   463
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   464
      case JVM_CONSTANT_NameAndType: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   465
        if (!_need_verify) break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   466
        const int name_ref_index = cp->name_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   467
        const int signature_ref_index = cp->signature_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   468
        check_property(valid_symbol_at(name_ref_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   469
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   470
          name_ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   471
        check_property(valid_symbol_at(signature_ref_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   472
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   473
          signature_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   474
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   475
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   476
      case JVM_CONSTANT_Utf8:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   477
        break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   478
      case JVM_CONSTANT_UnresolvedClass:         // fall-through
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   479
      case JVM_CONSTANT_UnresolvedClassInError: {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   480
        ShouldNotReachHere();     // Only JVM_CONSTANT_ClassIndex should be present
489c9b5090e2 Initial load
duke
parents:
diff changeset
   481
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   482
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   483
      case JVM_CONSTANT_ClassIndex: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   484
        const int class_index = cp->klass_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   485
        check_property(valid_symbol_at(class_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   486
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   487
          class_index, CHECK);
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   488
        cp->unresolved_klass_at_put(index, class_index, num_klasses++);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   489
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   490
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   491
      case JVM_CONSTANT_StringIndex: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   492
        const int string_index = cp->string_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   493
        check_property(valid_symbol_at(string_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   494
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   495
          string_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   496
        Symbol* const sym = cp->symbol_at(string_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   497
        cp->unresolved_string_at_put(index, sym);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   498
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   499
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   500
      case JVM_CONSTANT_MethodHandle: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   501
        const int ref_index = cp->method_handle_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   502
        check_property(valid_cp_range(ref_index, length),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   503
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   504
          ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   505
        const constantTag tag = cp->tag_at(ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   506
        const int ref_kind = cp->method_handle_ref_kind_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   507
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   508
        switch (ref_kind) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   509
          case JVM_REF_getField:
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   510
          case JVM_REF_getStatic:
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   511
          case JVM_REF_putField:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   512
          case JVM_REF_putStatic: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   513
            check_property(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   514
              tag.is_field(),
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   515
              "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
   516
              ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   517
            break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   518
          }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   519
          case JVM_REF_invokeVirtual:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   520
          case JVM_REF_newInvokeSpecial: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   521
            check_property(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   522
              tag.is_method(),
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   523
              "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
   524
              ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   525
            break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   526
          }
17024
49cbeca23983 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 16692
diff changeset
   527
          case JVM_REF_invokeStatic:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   528
          case JVM_REF_invokeSpecial: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   529
            check_property(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   530
              tag.is_method() ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   531
              ((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   532
              "Invalid constant pool index %u in class file %s (not a method)",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   533
              ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   534
            break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   535
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   536
          case JVM_REF_invokeInterface: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   537
            check_property(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   538
              tag.is_interface_method(),
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   539
              "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
   540
              ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   541
            break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   542
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   543
          default: {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   544
            classfile_parse_error(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   545
              "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
   546
              index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   547
          }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   548
        } // switch(refkind)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   549
        // 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
   550
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   551
      } // case MethodHandle
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   552
      case JVM_CONSTANT_MethodType: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   553
        const int ref_index = cp->method_type_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   554
        check_property(valid_symbol_at(ref_index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   555
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   556
          ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   557
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   558
      }
48826
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   559
      case JVM_CONSTANT_Dynamic: {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   560
        const int name_and_type_ref_index =
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   561
          cp->invoke_dynamic_name_and_type_ref_index_at(index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   562
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   563
        check_property(valid_cp_range(name_and_type_ref_index, length) &&
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   564
          cp->tag_at(name_and_type_ref_index).is_name_and_type(),
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   565
          "Invalid constant pool index %u in class file %s",
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   566
          name_and_type_ref_index, CHECK);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   567
        // bootstrap specifier index must be checked later,
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   568
        // when BootstrapMethods attr is available
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   569
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   570
        // Mark the constant pool as having a CONSTANT_Dynamic_info structure
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   571
        cp->set_has_dynamic_constant();
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   572
        break;
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   573
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   574
      case JVM_CONSTANT_InvokeDynamic: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   575
        const int name_and_type_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   576
          cp->invoke_dynamic_name_and_type_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   577
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   578
        check_property(valid_cp_range(name_and_type_ref_index, length) &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   579
          cp->tag_at(name_and_type_ref_index).is_name_and_type(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   580
          "Invalid constant pool index %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   581
          name_and_type_ref_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   582
        // bootstrap specifier index must be checked later,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   583
        // when BootstrapMethods attr is available
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   584
        break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   585
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   586
      default: {
33105
294e48b4f704 8080775: Better argument formatting for assert() and friends
david
parents: 32824
diff changeset
   587
        fatal("bad constant pool tag value %u", cp->tag_at(index).value());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   588
        ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   589
        break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   590
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   591
    } // switch(tag)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   592
  } // end of for
489c9b5090e2 Initial load
duke
parents:
diff changeset
   593
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   594
  _first_patched_klass_resolved_index = num_klasses;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   595
  cp->allocate_resolved_klasses(_loader_data, num_klasses + _max_num_patched_klasses, CHECK);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   596
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   597
  if (_cp_patches != NULL) {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   598
    // need to treat this_class specially...
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   599
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   600
    // Add dummy utf8 entries in the space reserved for names of patched classes. We'll use "*"
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   601
    // for now. These will be replaced with actual names of the patched classes in patch_class().
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   602
    Symbol* s = vmSymbols::star_name();
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   603
    for (int n=_orig_cp_size; n<cp->length(); n++) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   604
      cp->symbol_at_put(n, s);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   605
    }
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   606
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   607
    int this_class_index;
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   608
    {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   609
      stream->guarantee_more(8, CHECK);  // flags, this_class, super_class, infs_len
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   610
      const u1* const mark = stream->current();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   611
      stream->skip_u2_fast(1); // skip flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   612
      this_class_index = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   613
      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
   614
    }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   615
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   616
    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
   617
      if (has_cp_patch_at(index)) {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   618
        guarantee_property(index != this_class_index,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   619
          "Illegal constant pool patch to self at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   620
          index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   621
        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
   622
      }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   623
    }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   624
  }
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   625
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   626
  if (!_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   627
    return;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   628
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   629
489c9b5090e2 Initial load
duke
parents:
diff changeset
   630
  // 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
   631
  // but not yet to the other entries
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   632
  for (index = 1; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   633
    const jbyte tag = cp->tag_at(index).value();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   634
    switch (tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   635
      case JVM_CONSTANT_UnresolvedClass: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   636
        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
   637
        // check the name, even if _cp_patches will overwrite it
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   638
        verify_legal_class_name(class_name, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   639
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   640
      }
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   641
      case JVM_CONSTANT_NameAndType: {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   642
        if (_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   643
          const int sig_index = cp->signature_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   644
          const int name_index = cp->name_ref_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   645
          const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   646
          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
   647
          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
   648
            "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
   649
            sig_index, CHECK);
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   650
          guarantee_property(name->utf8_length() != 0,
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   651
            "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
   652
            name_index, CHECK);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   653
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   654
          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
   655
            // Format check method name and signature
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   656
            verify_legal_method_name(name, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   657
            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
   658
          } else {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   659
            // Format check field name and signature
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   660
            verify_legal_field_name(name, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   661
            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
   662
          }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   663
        }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   664
        break;
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   665
      }
48826
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   666
      case JVM_CONSTANT_Dynamic: {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   667
        const int name_and_type_ref_index =
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   668
          cp->name_and_type_ref_index_at(index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   669
        // already verified to be utf8
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   670
        const int name_ref_index =
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   671
          cp->name_ref_index_at(name_and_type_ref_index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   672
        // already verified to be utf8
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   673
        const int signature_ref_index =
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   674
          cp->signature_ref_index_at(name_and_type_ref_index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   675
        const Symbol* const name = cp->symbol_at(name_ref_index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   676
        const Symbol* const signature = cp->symbol_at(signature_ref_index);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   677
        if (_need_verify) {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   678
          // CONSTANT_Dynamic's name and signature are verified above, when iterating NameAndType_info.
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   679
          // Need only to be sure signature is non-zero length and the right type.
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   680
          if (signature->utf8_length() == 0 ||
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   681
              signature->byte_at(0) == JVM_SIGNATURE_FUNC) {
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   682
            throwIllegalSignature("CONSTANT_Dynamic", name, signature, CHECK);
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   683
          }
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   684
        }
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   685
        break;
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48355
diff changeset
   686
      }
9117
30d757743e56 7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents: 9116
diff changeset
   687
      case JVM_CONSTANT_InvokeDynamic:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   688
      case JVM_CONSTANT_Fieldref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   689
      case JVM_CONSTANT_Methodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   690
      case JVM_CONSTANT_InterfaceMethodref: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   691
        const int name_and_type_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   692
          cp->name_and_type_ref_index_at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   693
        // already verified to be utf8
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   694
        const int name_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   695
          cp->name_ref_index_at(name_and_type_ref_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   696
        // already verified to be utf8
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   697
        const int signature_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   698
          cp->signature_ref_index_at(name_and_type_ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   699
        const Symbol* const name = cp->symbol_at(name_ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   700
        const Symbol* const signature = cp->symbol_at(signature_ref_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   701
        if (tag == JVM_CONSTANT_Fieldref) {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   702
          if (_need_verify) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   703
            // 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
   704
            // 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
   705
            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
   706
                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
   707
              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
   708
            }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   709
          }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   710
        } else {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   711
          if (_need_verify) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   712
            // 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
   713
            // 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
   714
            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
   715
                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
   716
              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
   717
            }
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
   718
          }
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   719
          // 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
   720
          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
   721
          if (tag == JVM_CONSTANT_Methodref &&
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   722
              name_len != 0 &&
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   723
              name->byte_at(0) == '<' &&
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   724
              name != vmSymbols::object_initializer_name()) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   725
            classfile_parse_error(
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
   726
              "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
   727
              name_ref_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   728
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   729
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   730
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   731
      }
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   732
      case JVM_CONSTANT_MethodHandle: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   733
        const int ref_index = cp->method_handle_index_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   734
        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
   735
        switch (ref_kind) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   736
          case JVM_REF_invokeVirtual:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   737
          case JVM_REF_invokeStatic:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   738
          case JVM_REF_invokeSpecial:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   739
          case JVM_REF_newInvokeSpecial: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   740
            const int name_and_type_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   741
              cp->name_and_type_ref_index_at(ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   742
            const int name_ref_index =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   743
              cp->name_ref_index_at(name_and_type_ref_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   744
            const Symbol* const name = cp->symbol_at(name_ref_index);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   745
            if (ref_kind == JVM_REF_newInvokeSpecial) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   746
              if (name != vmSymbols::object_initializer_name()) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   747
                classfile_parse_error(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   748
                  "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
   749
                    name_ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   750
              }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   751
            } else {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   752
              if (name == vmSymbols::object_initializer_name()) {
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   753
                classfile_parse_error(
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   754
                  "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
   755
                  name_ref_index, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   756
              }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   757
            }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   758
            break;
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   759
          }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   760
          // Other ref_kinds are already fully checked in previous pass.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   761
        } // switch(ref_kind)
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   762
        break;
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   763
      }
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   764
      case JVM_CONSTANT_MethodType: {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   765
        const Symbol* const no_name = vmSymbols::type_name(); // place holder
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   766
        const Symbol* const signature = cp->method_type_signature_at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   767
        verify_legal_method_signature(no_name, signature, CHECK);
5882
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   768
        break;
6b2aecc4f7d8 6939203: JSR 292 needs method handle constants
jrose
parents: 5547
diff changeset
   769
      }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   770
      case JVM_CONSTANT_Utf8: {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
   771
        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
   772
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   773
    }  // switch(tag)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   774
  }  // end of for
489c9b5090e2 Initial load
duke
parents:
diff changeset
   775
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   776
49480
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   777
Handle ClassFileParser::clear_cp_patch_at(int index) {
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   778
  Handle patch = cp_patch_at(index);
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   779
  _cp_patches->at_put(index, Handle());
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   780
  assert(!has_cp_patch_at(index), "");
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   781
  return patch;
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   782
}
d7df2dd501ce 8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents: 49364
diff changeset
   783
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   784
void ClassFileParser::patch_class(ConstantPool* cp, int class_index, Klass* k, Symbol* name) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   785
  int name_index = _orig_cp_size + _num_patched_klasses;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   786
  int resolved_klass_index = _first_patched_klass_resolved_index + _num_patched_klasses;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   787
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   788
  cp->klass_at_put(class_index, name_index, resolved_klass_index, k, name);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   789
  _num_patched_klasses ++;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   790
}
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   791
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   792
void ClassFileParser::patch_constant_pool(ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   793
                                          int index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   794
                                          Handle patch,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   795
                                          TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   796
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   797
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   798
  BasicType patch_type = T_VOID;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
   799
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   800
  switch (cp->tag_at(index).value()) {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   801
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   802
    case JVM_CONSTANT_UnresolvedClass: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   803
      // Patching a class means pre-resolving it.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   804
      // The name in the constant pool is ignored.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   805
      if (java_lang_Class::is_instance(patch())) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   806
        guarantee_property(!java_lang_Class::is_primitive(patch()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   807
                           "Illegal class patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   808
                           index, CHECK);
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   809
        Klass* k = java_lang_Class::as_Klass(patch());
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   810
        patch_class(cp, index, k, k->name());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   811
      } else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   812
        guarantee_property(java_lang_String::is_instance(patch()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   813
                           "Illegal class patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   814
                           index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   815
        Symbol* const name = java_lang_String::as_symbol(patch(), CHECK);
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
   816
        patch_class(cp, index, NULL, name);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   817
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   818
      break;
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   819
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   820
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   821
    case JVM_CONSTANT_String: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   822
      // 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
   823
      // references to be created first.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   824
      return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   825
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   826
    case JVM_CONSTANT_Integer: patch_type = T_INT;    goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   827
    case JVM_CONSTANT_Float:   patch_type = T_FLOAT;  goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   828
    case JVM_CONSTANT_Long:    patch_type = T_LONG;   goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   829
    case JVM_CONSTANT_Double:  patch_type = T_DOUBLE; goto patch_prim;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   830
    patch_prim:
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   831
    {
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   832
      jvalue value;
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   833
      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
   834
      guarantee_property(value_type == patch_type,
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   835
                         "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
   836
                         index, CHECK);
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   837
      switch (value_type) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   838
        case T_INT:    cp->int_at_put(index,   value.i); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   839
        case T_FLOAT:  cp->float_at_put(index, value.f); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   840
        case T_LONG:   cp->long_at_put(index,  value.j); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   841
        case T_DOUBLE: cp->double_at_put(index, value.d); break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   842
        default:       assert(false, "");
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   843
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   844
    } // end patch_prim label
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   845
    break;
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   846
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   847
    default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   848
      // %%% TODO: put method handles into CONSTANT_InterfaceMethodref, etc.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   849
      guarantee_property(!has_cp_patch_at(index),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   850
                         "Illegal unexpected patch at %d in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   851
                         index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   852
      return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   853
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   854
  } // end of switch(tag)
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   855
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   856
  // 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
   857
  clear_cp_patch_at(index);
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   858
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   859
class NameSigHash: public ResourceObj {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   860
 public:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   861
  const Symbol*       _name;       // name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   862
  const Symbol*       _sig;        // signature
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   863
  NameSigHash*  _next;             // Next entry in hash table
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   864
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
   865
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   866
static const int HASH_ROW_SIZE = 256;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   867
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   868
static unsigned int hash(const Symbol* name, const Symbol* sig) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   869
  unsigned int raw_hash = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   870
  raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   871
  raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   872
489c9b5090e2 Initial load
duke
parents:
diff changeset
   873
  return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   874
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   875
489c9b5090e2 Initial load
duke
parents:
diff changeset
   876
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   877
static void initialize_hashtable(NameSigHash** table) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   878
  memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   879
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   880
// Return false if the name/sig combination is found in table.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   881
// 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
   882
// The old format checker uses heap sort to find duplicates.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   883
// 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
   884
// of table since we don't expect Symbol*'s to move.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   885
static bool put_after_lookup(const Symbol* name, const Symbol* sig, NameSigHash** table) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   886
  assert(name != NULL, "name in constant pool is NULL");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   887
489c9b5090e2 Initial load
duke
parents:
diff changeset
   888
  // First lookup for duplicates
489c9b5090e2 Initial load
duke
parents:
diff changeset
   889
  int index = hash(name, sig);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   890
  NameSigHash* entry = table[index];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   891
  while (entry != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   892
    if (entry->_name == name && entry->_sig == sig) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   893
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   894
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   895
    entry = entry->_next;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   896
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   897
489c9b5090e2 Initial load
duke
parents:
diff changeset
   898
  // No duplicate is found, allocate a new entry and fill it.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   899
  entry = new NameSigHash();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   900
  entry->_name = name;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   901
  entry->_sig = sig;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   902
489c9b5090e2 Initial load
duke
parents:
diff changeset
   903
  // Insert into hash table
489c9b5090e2 Initial load
duke
parents:
diff changeset
   904
  entry->_next = table[index];
489c9b5090e2 Initial load
duke
parents:
diff changeset
   905
  table[index] = entry;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   906
489c9b5090e2 Initial load
duke
parents:
diff changeset
   907
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   908
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   909
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   910
// Side-effects: populates the _local_interfaces field
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   911
void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   912
                                       const int itfs_len,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   913
                                       ConstantPool* const cp,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   914
                                       bool* const has_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   915
                                       TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   916
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   917
  assert(cp != NULL, "invariant");
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   918
  assert(has_nonstatic_concrete_methods != NULL, "invariant");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   919
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   920
  if (itfs_len == 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   921
    _local_interfaces = Universe::the_empty_klass_array();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   922
  } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   923
    assert(itfs_len > 0, "only called for len>0");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   924
    _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
   925
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   926
    int index;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   927
    for (index = 0; index < itfs_len; index++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   928
      const u2 interface_index = stream->get_u2(CHECK);
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   929
      Klass* interf;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   930
      check_property(
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   931
        valid_klass_reference_at(interface_index),
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   932
        "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
   933
        interface_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   934
      if (cp->tag_at(interface_index).is_klass()) {
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   935
        interf = cp->resolved_klass_at(interface_index);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   936
      } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   937
        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
   938
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   939
        // 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
   940
        // 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
   941
        guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   942
                           "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
   943
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   944
        // Call resolve_super so classcircularity is checked
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   945
        interf = SystemDictionary::resolve_super_or_fail(
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   946
                                                  _class_name,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   947
                                                  unresolved_klass,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
   948
                                                  Handle(THREAD, _loader_data->class_loader()),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   949
                                                  _protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   950
                                                  false,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   951
                                                  CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   952
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   953
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   954
      if (!interf->is_interface()) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   955
        THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   956
                   "Implementing class");
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   957
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   958
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   959
      if (InstanceKlass::cast(interf)->has_nonstatic_concrete_methods()) {
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
   960
        *has_nonstatic_concrete_methods = true;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   961
      }
46329
53ccc37bda19 8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents: 46327
diff changeset
   962
      _local_interfaces->at_put(index, interf);
1550
be2fc37a817f 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 670
diff changeset
   963
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   964
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   965
    if (!_need_verify || itfs_len <= 1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   966
      return;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
   967
    }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   968
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   969
    // 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
   970
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   971
    NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   972
                                                                 NameSigHash*,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   973
                                                                 HASH_ROW_SIZE);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   974
    initialize_hashtable(interface_names);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   975
    bool dup = false;
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
   976
    const Symbol* name = NULL;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   977
    {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35220
diff changeset
   978
      debug_only(NoSafepointVerifier nsv;)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   979
      for (index = 0; index < itfs_len; index++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   980
        const Klass* const k = _local_interfaces->at(index);
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
   981
        name = InstanceKlass::cast(k)->name();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   982
        // 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
   983
        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
   984
          dup = true;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   985
          break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   986
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   987
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   988
    }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   989
    if (dup) {
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
   990
      classfile_parse_error("Duplicate interface name \"%s\" in class file %s",
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
   991
                             name->as_C_string(), CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
   992
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   993
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   994
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   995
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   996
void ClassFileParser::verify_constantvalue(const ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   997
                                           int constantvalue_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   998
                                           int signature_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
   999
                                           TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1000
  // Make sure the constant pool entry is of a type appropriate to this field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1001
  guarantee_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1002
    (constantvalue_index > 0 &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1003
      constantvalue_index < cp->length()),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1004
    "Bad initial value index %u in ConstantValue attribute in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1005
    constantvalue_index, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1006
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1007
  const constantTag value_type = cp->tag_at(constantvalue_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1008
  switch(cp->basic_type_for_signature_at(signature_index)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1009
    case T_LONG: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1010
      guarantee_property(value_type.is_long(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1011
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1012
                         CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1013
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1014
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1015
    case T_FLOAT: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1016
      guarantee_property(value_type.is_float(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1017
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1018
                         CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1019
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1020
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1021
    case T_DOUBLE: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1022
      guarantee_property(value_type.is_double(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1023
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1024
                         CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1025
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1026
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1027
    case T_BYTE:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1028
    case T_CHAR:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1029
    case T_SHORT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1030
    case T_BOOLEAN:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1031
    case T_INT: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1032
      guarantee_property(value_type.is_int(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1033
                         "Inconsistent constant value type in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1034
                         CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1035
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1036
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1037
    case T_OBJECT: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1038
      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1039
                         && value_type.is_string()),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1040
                         "Bad string initial value in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1041
                         CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1042
      break;
34666
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
    default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1045
      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
  1046
                             constantvalue_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1047
                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1048
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1049
  }
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
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1052
class AnnotationCollector : public ResourceObj{
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1053
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1054
  enum Location { _in_field, _in_method, _in_class };
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1055
  enum ID {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1056
    _unknown = 0,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1057
    _method_CallerSensitive,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1058
    _method_ForceInline,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1059
    _method_DontInline,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1060
    _method_InjectedProfile,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1061
    _method_LambdaForm_Compiled,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1062
    _method_LambdaForm_Hidden,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1063
    _method_HotSpotIntrinsicCandidate,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1064
    _jdk_internal_vm_annotation_Contended,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1065
    _field_Stable,
35071
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  1066
    _jdk_internal_vm_annotation_ReservedStackAccess,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1067
    _annotation_LIMIT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1068
  };
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1069
  const Location _location;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1070
  int _annotations_present;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1071
  u2 _contended_group;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1072
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1073
  AnnotationCollector(Location location)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1074
    : _location(location), _annotations_present(0)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1075
  {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1076
    assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1077
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1078
  // If this annotation name has an ID, report it (or _none).
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1079
  ID annotation_index(const ClassLoaderData* loader_data, const Symbol* name);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1080
  // Set the annotation name:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1081
  void set_annotation(ID id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1082
    assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1083
    _annotations_present |= nth_bit((int)id);
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
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1086
  void remove_annotation(ID id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1087
    assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1088
    _annotations_present &= ~nth_bit((int)id);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1089
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1090
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1091
  // Report if the annotation is present.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1092
  bool has_any_annotations() const { return _annotations_present != 0; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1093
  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
  1094
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1095
  void set_contended_group(u2 group) { _contended_group = group; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1096
  u2 contended_group() const { return _contended_group; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1097
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1098
  bool is_contended() const { return has_annotation(_jdk_internal_vm_annotation_Contended); }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1099
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1100
  void set_stable(bool stable) { set_annotation(_field_Stable); }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1101
  bool is_stable() const { return has_annotation(_field_Stable); }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1102
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1103
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1104
// This class also doubles as a holder for metadata cleanup.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1105
class ClassFileParser::FieldAnnotationCollector : public AnnotationCollector {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1106
private:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1107
  ClassLoaderData* _loader_data;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1108
  AnnotationArray* _field_annotations;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1109
  AnnotationArray* _field_type_annotations;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1110
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1111
  FieldAnnotationCollector(ClassLoaderData* loader_data) :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1112
    AnnotationCollector(_in_field),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1113
    _loader_data(loader_data),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1114
    _field_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1115
    _field_type_annotations(NULL) {}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1116
  ~FieldAnnotationCollector();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1117
  void apply_to(FieldInfo* f);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1118
  AnnotationArray* field_annotations()      { return _field_annotations; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1119
  AnnotationArray* field_type_annotations() { return _field_type_annotations; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1120
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1121
  void set_field_annotations(AnnotationArray* a)      { _field_annotations = a; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1122
  void set_field_type_annotations(AnnotationArray* a) { _field_type_annotations = a; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1123
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1124
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1125
class MethodAnnotationCollector : public AnnotationCollector{
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1126
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1127
  MethodAnnotationCollector() : AnnotationCollector(_in_method) { }
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
  1128
  void apply_to(const methodHandle& m);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1129
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1130
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1131
class ClassFileParser::ClassAnnotationCollector : public AnnotationCollector{
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1132
public:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1133
  ClassAnnotationCollector() : AnnotationCollector(_in_class) { }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1134
  void apply_to(InstanceKlass* ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1135
};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1136
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1137
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1138
static int skip_annotation_value(const u1*, int, int); // fwd decl
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1139
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1140
// Safely increment index by val if does not pass limit
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1141
#define SAFE_ADD(index, limit, val) \
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1142
if (index >= limit - val) return limit; \
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1143
index += val;
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1144
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1145
// Skip an annotation.  Return >=limit if there is any problem.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1146
static int skip_annotation(const u1* buffer, int limit, int index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1147
  assert(buffer != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1148
  // annotation := atype:u2 do(nmem:u2) {member:u2 value}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1149
  // value := switch (tag:u1) { ... }
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1150
  SAFE_ADD(index, limit, 4); // skip atype and read nmem
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1151
  int nmem = Bytes::get_Java_u2((address)buffer + index - 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1152
  while (--nmem >= 0 && index < limit) {
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1153
    SAFE_ADD(index, limit, 2); // skip member
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1154
    index = skip_annotation_value(buffer, limit, index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1155
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1156
  return index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1157
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1158
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1159
// Skip an annotation value.  Return >=limit if there is any problem.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1160
static int skip_annotation_value(const u1* buffer, int limit, int index) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1161
  assert(buffer != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1162
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1163
  // value := switch (tag:u1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1164
  //   case B, C, I, S, Z, D, F, J, c: con:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1165
  //   case e: e_class:u2 e_name:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1166
  //   case s: s_con:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1167
  //   case [: do(nval:u2) {value};
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1168
  //   case @: annotation;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1169
  //   case s: s_con:u2;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1170
  // }
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1171
  SAFE_ADD(index, limit, 1); // read tag
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1172
  const u1 tag = buffer[index - 1];
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1173
  switch (tag) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1174
    case 'B':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1175
    case 'C':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1176
    case 'I':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1177
    case 'S':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1178
    case 'Z':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1179
    case 'D':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1180
    case 'F':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1181
    case 'J':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1182
    case 'c':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1183
    case 's':
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1184
      SAFE_ADD(index, limit, 2);  // skip con or s_con
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1185
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1186
    case 'e':
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1187
      SAFE_ADD(index, limit, 4);  // skip e_class, e_name
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1188
      break;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1189
    case '[':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1190
    {
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1191
      SAFE_ADD(index, limit, 2); // read nval
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1192
      int nval = Bytes::get_Java_u2((address)buffer + index - 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1193
      while (--nval >= 0 && index < limit) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1194
        index = skip_annotation_value(buffer, limit, index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1195
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1196
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1197
    break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1198
    case '@':
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1199
      index = skip_annotation(buffer, limit, index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1200
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1201
    default:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1202
      return limit;  //  bad tag byte
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1203
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1204
  return index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1205
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1206
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1207
// Sift through annotations, looking for those significant to the VM:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1208
static void parse_annotations(const ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1209
                              const u1* buffer, int limit,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1210
                              AnnotationCollector* coll,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1211
                              ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1212
                              TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1213
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1214
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1215
  assert(buffer != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1216
  assert(coll != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1217
  assert(loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1218
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1219
  // annotations := do(nann:u2) {annotation}
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1220
  int index = 2; // read nann
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1221
  if (index >= limit)  return;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1222
  int nann = Bytes::get_Java_u2((address)buffer + index - 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1223
  enum {  // initial annotation layout
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1224
    atype_off = 0,      // utf8 such as 'Ljava/lang/annotation/Retention;'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1225
    count_off = 2,      // u2   such as 1 (one value)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1226
    member_off = 4,     // utf8 such as 'value'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1227
    tag_off = 6,        // u1   such as 'c' (type) or 'e' (enum)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1228
    e_tag_val = 'e',
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1229
    e_type_off = 7,   // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1230
    e_con_off = 9,    // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1231
    e_size = 11,     // end of 'e' annotation
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1232
    c_tag_val = 'c',    // payload is type
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1233
    c_con_off = 7,    // utf8 payload, such as 'I'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1234
    c_size = 9,       // end of 'c' annotation
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1235
    s_tag_val = 's',    // payload is String
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1236
    s_con_off = 7,    // utf8 payload, such as 'Ljava/lang/String;'
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1237
    s_size = 9,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1238
    min_size = 6        // smallest possible size (zero members)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1239
  };
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1240
  // Cannot add min_size to index in case of overflow MAX_INT
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1241
  while ((--nann) >= 0 && (index - 2 <= limit - min_size)) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1242
    int index0 = index;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1243
    index = skip_annotation(buffer, limit, index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1244
    const u1* const abase = buffer + index0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1245
    const int atype = Bytes::get_Java_u2((address)abase + atype_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1246
    const int count = Bytes::get_Java_u2((address)abase + count_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1247
    const Symbol* const aname = check_symbol_at(cp, atype);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1248
    if (aname == NULL)  break;  // invalid annotation name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1249
    const Symbol* member = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1250
    if (count >= 1) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1251
      const int member_index = Bytes::get_Java_u2((address)abase + member_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1252
      member = check_symbol_at(cp, member_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1253
      if (member == NULL)  break;  // invalid member name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1254
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1255
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1256
    // Here is where parsing particular annotations will take place.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1257
    AnnotationCollector::ID id = coll->annotation_index(loader_data, aname);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1258
    if (AnnotationCollector::_unknown == id)  continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1259
    coll->set_annotation(id);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1260
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1261
    if (AnnotationCollector::_jdk_internal_vm_annotation_Contended == id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1262
      // @Contended can optionally specify the contention group.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1263
      //
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1264
      // Contended group defines the equivalence class over the fields:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1265
      // the fields within the same contended group are not treated distinct.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1266
      // The only exception is default group, which does not incur the
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1267
      // equivalence. Naturally, contention group for classes is meaningless.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1268
      //
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1269
      // While the contention group is specified as String, annotation
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1270
      // values are already interned, and we might as well use the constant
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1271
      // pool index as the group tag.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1272
      //
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1273
      u2 group_index = 0; // default contended group
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1274
      if (count == 1
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1275
        && s_size == (index - index0)  // match size
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1276
        && s_tag_val == *(abase + tag_off)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1277
        && member == vmSymbols::value_name()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1278
        group_index = Bytes::get_Java_u2((address)abase + s_con_off);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1279
        if (cp->symbol_at(group_index)->utf8_length() == 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1280
          group_index = 0; // default contended group
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1281
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1282
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1283
      coll->set_contended_group(group_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1284
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1285
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1286
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1287
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1288
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1289
// Parse attributes for a field.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1290
void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1291
                                             u2 attributes_count,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1292
                                             bool is_static, u2 signature_index,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1293
                                             u2* const constantvalue_index_addr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1294
                                             bool* const is_synthetic_addr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1295
                                             u2* const generic_signature_index_addr,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  1296
                                             ClassFileParser::FieldAnnotationCollector* parsed_annotations,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1297
                                             TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1298
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1299
  assert(constantvalue_index_addr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1300
  assert(is_synthetic_addr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1301
  assert(generic_signature_index_addr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1302
  assert(parsed_annotations != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1303
  assert(attributes_count > 0, "attributes_count should be greater than 0");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1304
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1305
  u2 constantvalue_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1306
  u2 generic_signature_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1307
  bool is_synthetic = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1308
  const u1* runtime_visible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1309
  int runtime_visible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1310
  const u1* runtime_invisible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1311
  int runtime_invisible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1312
  const u1* runtime_visible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1313
  int runtime_visible_type_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1314
  const u1* runtime_invisible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1315
  int runtime_invisible_type_annotations_length = 0;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1316
  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
  1317
  bool runtime_invisible_type_annotations_exists = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1318
  const ConstantPool* const cp = _cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1319
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1320
  while (attributes_count--) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1321
    cfs->guarantee_more(6, CHECK);  // attribute_name_index, attribute_length
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1322
    const u2 attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1323
    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
  1324
    check_property(valid_symbol_at(attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1325
                   "Invalid field attribute index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1326
                   attribute_name_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1327
                   CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1328
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1329
    const Symbol* const attribute_name = cp->symbol_at(attribute_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1330
    if (is_static && attribute_name == vmSymbols::tag_constant_value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1331
      // ignore if non-static
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1332
      if (constantvalue_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1333
        classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1334
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1335
      check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1336
        attribute_length == 2,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1337
        "Invalid ConstantValue field attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1338
        attribute_length, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1339
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1340
      constantvalue_index = cfs->get_u2(CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1341
      if (_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1342
        verify_constantvalue(cp, constantvalue_index, signature_index, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1343
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1344
    } else if (attribute_name == vmSymbols::tag_synthetic()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1345
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1346
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1347
          "Invalid Synthetic field attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1348
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1349
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1350
      is_synthetic = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1351
    } else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1352
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1353
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1354
          "Invalid Deprecated field attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1355
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1356
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1357
    } else if (_major_version >= JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1358
      if (attribute_name == vmSymbols::tag_signature()) {
44243
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  1359
        if (generic_signature_index != 0) {
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  1360
          classfile_parse_error(
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  1361
            "Multiple Signature attributes for field in class file %s", CHECK);
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  1362
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1363
        if (attribute_length != 2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1364
          classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1365
            "Wrong size %u for field's Signature attribute in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1366
            attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1367
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1368
        generic_signature_index = parse_generic_signature_attribute(cfs, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1369
      } 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
  1370
        if (runtime_visible_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1371
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1372
            "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
  1373
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1374
        runtime_visible_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  1375
        runtime_visible_annotations = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1376
        assert(runtime_visible_annotations != NULL, "null visible annotations");
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1377
        cfs->guarantee_more(runtime_visible_annotations_length, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1378
        parse_annotations(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1379
                          runtime_visible_annotations,
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1380
                          runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1381
                          parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1382
                          _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1383
                          CHECK);
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  1384
        cfs->skip_u1_fast(runtime_visible_annotations_length);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1385
      } else if (attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1386
        if (runtime_invisible_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1387
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1388
            "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
  1389
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1390
        runtime_invisible_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1391
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1392
          runtime_invisible_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  1393
          runtime_invisible_annotations = cfs->current();
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1394
          assert(runtime_invisible_annotations != NULL, "null invisible annotations");
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1395
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  1396
        cfs->skip_u1(attribute_length, CHECK);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1397
      } 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
  1398
        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
  1399
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1400
            "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
  1401
        }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1402
        runtime_visible_type_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  1403
        runtime_visible_type_annotations = cfs->current();
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1404
        assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1405
        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
  1406
      } 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
  1407
        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
  1408
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1409
            "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
  1410
        } else {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1411
          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
  1412
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1413
        if (PreserveAllAnnotations) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1414
          runtime_invisible_type_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  1415
          runtime_invisible_type_annotations = cfs->current();
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1416
          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
  1417
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  1418
        cfs->skip_u1(attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1419
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1420
        cfs->skip_u1(attribute_length, CHECK);  // Skip unknown attributes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1421
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1422
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1423
      cfs->skip_u1(attribute_length, CHECK);  // Skip unknown attributes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1424
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1425
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1426
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1427
  *constantvalue_index_addr = constantvalue_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1428
  *is_synthetic_addr = is_synthetic;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1429
  *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
  1430
  AnnotationArray* a = assemble_annotations(runtime_visible_annotations,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1431
                                            runtime_visible_annotations_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1432
                                            runtime_invisible_annotations,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1433
                                            runtime_invisible_annotations_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1434
                                            CHECK);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1435
  parsed_annotations->set_field_annotations(a);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1436
  a = assemble_annotations(runtime_visible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1437
                           runtime_visible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1438
                           runtime_invisible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1439
                           runtime_invisible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1440
                           CHECK);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1441
  parsed_annotations->set_field_type_annotations(a);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1442
  return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1443
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1444
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1445
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1446
// Field allocation types. Used for computing field offsets.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1447
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1448
enum FieldAllocationType {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1449
  STATIC_OOP,           // Oops
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1450
  STATIC_BYTE,          // Boolean, Byte, char
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1451
  STATIC_SHORT,         // shorts
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1452
  STATIC_WORD,          // ints
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1453
  STATIC_DOUBLE,        // aligned long or double
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1454
  NONSTATIC_OOP,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1455
  NONSTATIC_BYTE,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1456
  NONSTATIC_SHORT,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1457
  NONSTATIC_WORD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1458
  NONSTATIC_DOUBLE,
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1459
  MAX_FIELD_ALLOCATION_TYPE,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1460
  BAD_ALLOCATION_TYPE = -1
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1461
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1462
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1463
static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1464
  BAD_ALLOCATION_TYPE, // 0
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1465
  BAD_ALLOCATION_TYPE, // 1
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1466
  BAD_ALLOCATION_TYPE, // 2
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1467
  BAD_ALLOCATION_TYPE, // 3
13969
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1468
  NONSTATIC_BYTE ,     // T_BOOLEAN     =  4,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1469
  NONSTATIC_SHORT,     // T_CHAR        =  5,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1470
  NONSTATIC_WORD,      // T_FLOAT       =  6,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1471
  NONSTATIC_DOUBLE,    // T_DOUBLE      =  7,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1472
  NONSTATIC_BYTE,      // T_BYTE        =  8,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1473
  NONSTATIC_SHORT,     // T_SHORT       =  9,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1474
  NONSTATIC_WORD,      // T_INT         = 10,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1475
  NONSTATIC_DOUBLE,    // T_LONG        = 11,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1476
  NONSTATIC_OOP,       // T_OBJECT      = 12,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1477
  NONSTATIC_OOP,       // T_ARRAY       = 13,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1478
  BAD_ALLOCATION_TYPE, // T_VOID        = 14,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1479
  BAD_ALLOCATION_TYPE, // T_ADDRESS     = 15,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1480
  BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 16,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1481
  BAD_ALLOCATION_TYPE, // T_METADATA    = 17,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1482
  BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1483
  BAD_ALLOCATION_TYPE, // T_CONFLICT    = 19,
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1484
  BAD_ALLOCATION_TYPE, // 0
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1485
  BAD_ALLOCATION_TYPE, // 1
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1486
  BAD_ALLOCATION_TYPE, // 2
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1487
  BAD_ALLOCATION_TYPE, // 3
13969
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1488
  STATIC_BYTE ,        // T_BOOLEAN     =  4,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1489
  STATIC_SHORT,        // T_CHAR        =  5,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1490
  STATIC_WORD,         // T_FLOAT       =  6,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1491
  STATIC_DOUBLE,       // T_DOUBLE      =  7,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1492
  STATIC_BYTE,         // T_BYTE        =  8,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1493
  STATIC_SHORT,        // T_SHORT       =  9,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1494
  STATIC_WORD,         // T_INT         = 10,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1495
  STATIC_DOUBLE,       // T_LONG        = 11,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1496
  STATIC_OOP,          // T_OBJECT      = 12,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1497
  STATIC_OOP,          // T_ARRAY       = 13,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1498
  BAD_ALLOCATION_TYPE, // T_VOID        = 14,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1499
  BAD_ALLOCATION_TYPE, // T_ADDRESS     = 15,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1500
  BAD_ALLOCATION_TYPE, // T_NARROWOOP   = 16,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1501
  BAD_ALLOCATION_TYPE, // T_METADATA    = 17,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1502
  BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
d2a189b83b87 7054512: Compress class pointers after perm gen removal
roland
parents: 13738
diff changeset
  1503
  BAD_ALLOCATION_TYPE, // T_CONFLICT    = 19,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1504
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1505
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1506
static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1507
  assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1508
  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
  1509
  assert(result != BAD_ALLOCATION_TYPE, "bad type");
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1510
  return result;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1511
}
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1512
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1513
class ClassFileParser::FieldAllocationCount : public ResourceObj {
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1514
 public:
11412
62fe312f32c5 7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents: 10546
diff changeset
  1515
  u2 count[MAX_FIELD_ALLOCATION_TYPE];
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1516
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1517
  FieldAllocationCount() {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1518
    for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1519
      count[i] = 0;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1520
    }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1521
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1522
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1523
  FieldAllocationType update(bool is_static, BasicType type) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1524
    FieldAllocationType atype = basic_type_to_atype(is_static, type);
38658
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1525
    if (atype != BAD_ALLOCATION_TYPE) {
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1526
      // Make sure there is no overflow with injected fields.
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1527
      assert(count[atype] < 0xFFFF, "More than 65535 fields");
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1528
      count[atype]++;
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  1529
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1530
    return atype;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1531
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1532
};
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1533
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1534
// Side-effects: populates the _fields, _fields_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1535
// _fields_type_annotations fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1536
void ClassFileParser::parse_fields(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1537
                                   bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1538
                                   FieldAllocationCount* const fac,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1539
                                   ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1540
                                   const int cp_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1541
                                   u2* const java_fields_count_ptr,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1542
                                   TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1543
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1544
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1545
  assert(fac != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1546
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1547
  assert(java_fields_count_ptr != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1548
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1549
  assert(NULL == _fields, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1550
  assert(NULL == _fields_annotations, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1551
  assert(NULL == _fields_type_annotations, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1552
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1553
  cfs->guarantee_more(2, CHECK);  // length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1554
  const u2 length = cfs->get_u2_fast();
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1555
  *java_fields_count_ptr = length;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1556
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1557
  int num_injected = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1558
  const InjectedField* const injected = JavaClasses::get_injected(_class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1559
                                                                  &num_injected);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1560
  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
  1561
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1562
  // 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
  1563
  // [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
  1564
  // 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
  1565
  // 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
  1566
  // 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
  1567
  // 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
  1568
  // other fields data.
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1569
  //
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1570
  //   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
  1571
  //   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
  1572
  //       ...
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1573
  //   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
  1574
  //       [generic signature index]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1575
  //       [generic signature index]
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1576
  //       ...
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1577
  //
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1578
  // 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
  1579
  // 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
  1580
  // 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
  1581
  // 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
  1582
  ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1583
  u2* const fa = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1584
                                              u2,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1585
                                              total_fields * (FieldInfo::field_slots + 1));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1586
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1587
  // 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
  1588
  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
  1589
  int num_generic_signature = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1590
  for (int n = 0; n < length; n++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1591
    // access_flags, name_index, descriptor_index, attributes_count
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1592
    cfs->guarantee_more(8, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1593
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1594
    AccessFlags access_flags;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1595
    const jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1596
    verify_legal_field_modifiers(flags, is_interface, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1597
    access_flags.set_flags(flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1598
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1599
    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
  1600
    check_property(valid_symbol_at(name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1601
      "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
  1602
      name_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1603
    const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1604
    verify_legal_field_name(name, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1605
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1606
    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
  1607
    check_property(valid_symbol_at(signature_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1608
      "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
  1609
      signature_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1610
    const Symbol* const sig = cp->symbol_at(signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1611
    verify_legal_field_signature(name, sig, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1612
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1613
    u2 constantvalue_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1614
    bool is_synthetic = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1615
    u2 generic_signature_index = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1616
    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
  1617
    FieldAnnotationCollector parsed_annotations(_loader_data);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1618
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1619
    const u2 attributes_count = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1620
    if (attributes_count > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1621
      parse_field_attributes(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1622
                             attributes_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1623
                             is_static,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1624
                             signature_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1625
                             &constantvalue_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1626
                             &is_synthetic,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1627
                             &generic_signature_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1628
                             &parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1629
                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1630
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1631
      if (parsed_annotations.field_annotations() != NULL) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1632
        if (_fields_annotations == NULL) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1633
          _fields_annotations = MetadataFactory::new_array<AnnotationArray*>(
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1634
                                             _loader_data, length, NULL,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1635
                                             CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1636
        }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1637
        _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
  1638
        parsed_annotations.set_field_annotations(NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1639
      }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1640
      if (parsed_annotations.field_type_annotations() != NULL) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1641
        if (_fields_type_annotations == NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1642
          _fields_type_annotations =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1643
            MetadataFactory::new_array<AnnotationArray*>(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1644
                                                         length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1645
                                                         NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1646
                                                         CHECK);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1647
        }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1648
        _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
  1649
        parsed_annotations.set_field_type_annotations(NULL);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  1650
      }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1651
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1652
      if (is_synthetic) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1653
        access_flags.set_is_synthetic();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1654
      }
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1655
      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
  1656
        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
  1657
        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
  1658
        generic_signature_slot ++;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1659
        num_generic_signature ++;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1660
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1661
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1662
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1663
    FieldInfo* const field = FieldInfo::from_field_array(fa, n);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1664
    field->initialize(access_flags.as_short(),
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1665
                      name_index,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1666
                      signature_index,
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1667
                      constantvalue_index);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1668
    const BasicType type = cp->basic_type_for_signature_at(signature_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1669
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1670
    // Remember how many oops we encountered and compute allocation type
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1671
    const FieldAllocationType atype = fac->update(is_static, type);
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1672
    field->set_allocation_type(atype);
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1673
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1674
    // 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
  1675
    if (parsed_annotations.has_any_annotations())
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1676
      parsed_annotations.apply_to(field);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1677
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1678
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1679
  int index = length;
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1680
  if (num_injected != 0) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1681
    for (int n = 0; n < num_injected; n++) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1682
      // Check for duplicates
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1683
      if (injected[n].may_be_java) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1684
        const Symbol* const name      = injected[n].name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1685
        const Symbol* const signature = injected[n].signature();
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1686
        bool duplicate = false;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1687
        for (int i = 0; i < length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1688
          const FieldInfo* const f = FieldInfo::from_field_array(fa, i);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1689
          if (name      == cp->symbol_at(f->name_index()) &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1690
              signature == cp->symbol_at(f->signature_index())) {
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1691
            // Symbol is desclared in Java so skip this one
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1692
            duplicate = true;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1693
            break;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1694
          }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1695
        }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1696
        if (duplicate) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1697
          // These will be removed from the field array at the end
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1698
          continue;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1699
        }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1700
      }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1701
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1702
      // Injected field
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1703
      FieldInfo* const field = FieldInfo::from_field_array(fa, index);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1704
      field->initialize(JVM_ACC_FIELD_INTERNAL,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1705
                        injected[n].name_index,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1706
                        injected[n].signature_index,
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1707
                        0);
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1708
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1709
      const BasicType type = FieldType::basic_type(injected[n].signature());
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1710
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1711
      // Remember how many oops we encountered and compute allocation type
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1712
      const FieldAllocationType atype = fac->update(false, type);
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  1713
      field->set_allocation_type(atype);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1714
      index++;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1715
    }
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1716
  }
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1717
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1718
  assert(NULL == _fields, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1719
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1720
  _fields =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1721
    MetadataFactory::new_array<u2>(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1722
                                   index * FieldInfo::field_slots + num_generic_signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1723
                                   CHECK);
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1724
  // 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
  1725
  // 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
  1726
  // 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
  1727
  // 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
  1728
  {
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1729
    int i = 0;
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1730
    for (; i < index * FieldInfo::field_slots; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1731
      _fields->at_put(i, fa[i]);
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 10009
diff changeset
  1732
    }
12772
d317e5e08194 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 12587
diff changeset
  1733
    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
  1734
         j < generic_signature_slot; j++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1735
      _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
  1736
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1737
    assert(_fields->length() == i, "");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1738
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1739
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1740
  if (_need_verify && length > 1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1741
    // Check duplicated fields
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1742
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1743
    NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1744
      THREAD, NameSigHash*, HASH_ROW_SIZE);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1745
    initialize_hashtable(names_and_sigs);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1746
    bool dup = false;
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  1747
    const Symbol* name = NULL;
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  1748
    const Symbol* sig = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1749
    {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35220
diff changeset
  1750
      debug_only(NoSafepointVerifier nsv;)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1751
      for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) {
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  1752
        name = fs.name();
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  1753
        sig = fs.signature();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1754
        // If no duplicates, add name/signature in hashtable names_and_sigs.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1755
        if (!put_after_lookup(name, sig, names_and_sigs)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1756
          dup = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1757
          break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1758
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1759
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1760
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1761
    if (dup) {
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  1762
      classfile_parse_error("Duplicate field name \"%s\" with signature \"%s\" in class file %s",
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  1763
                             name->as_C_string(), sig->as_klass_external_name(), CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1764
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1765
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1766
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1767
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1768
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1769
const ClassFileParser::unsafe_u2* ClassFileParser::parse_exception_table(const ClassFileStream* const cfs,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1770
                                                                         u4 code_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1771
                                                                         u4 exception_table_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1772
                                                                         TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1773
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1774
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1775
  const unsafe_u2* const exception_table_start = cfs->current();
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1776
  assert(exception_table_start != NULL, "null exception table");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1777
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1778
  cfs->guarantee_more(8 * exception_table_length, CHECK_NULL); // start_pc,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1779
                                                               // end_pc,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1780
                                                               // handler_pc,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1781
                                                               // catch_type_index
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1782
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1783
  // 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
  1784
  if (_need_verify) {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1785
    for (unsigned int i = 0; i < exception_table_length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1786
      const u2 start_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1787
      const u2 end_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1788
      const u2 handler_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1789
      const u2 catch_type_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1790
      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
  1791
                         "Illegal exception table range in class file %s",
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1792
                         CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1793
      guarantee_property(handler_pc < code_length,
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1794
                         "Illegal exception table handler in class file %s",
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1795
                         CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1796
      if (catch_type_index != 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1797
        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
  1798
                           "Catch type in exception table has bad constant type in class file %s", CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1799
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1800
    }
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1801
  } else {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1802
    cfs->skip_u2_fast(exception_table_length * 4);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1803
  }
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  1804
  return exception_table_start;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1805
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1806
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1807
void ClassFileParser::parse_linenumber_table(u4 code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1808
                                             u4 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1809
                                             CompressedLineNumberWriteStream**const write_stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1810
                                             TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1811
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1812
  const ClassFileStream* const cfs = _stream;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1813
  unsigned int num_entries = cfs->get_u2(CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1814
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1815
  // 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
  1816
  const unsigned int length_in_bytes = num_entries * (sizeof(u2) * 2);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1817
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1818
  // Verify line number attribute and table length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1819
  check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1820
    code_attribute_length == sizeof(u2) + length_in_bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1821
    "LineNumberTable attribute has wrong length in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1822
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1823
  cfs->guarantee_more(length_in_bytes, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1824
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1825
  if ((*write_stream) == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1826
    if (length_in_bytes > fixed_buffer_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1827
      (*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1828
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1829
      (*write_stream) = new CompressedLineNumberWriteStream(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1830
        _linenumbertable_buffer, fixed_buffer_size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1831
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1832
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1833
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1834
  while (num_entries-- > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1835
    const u2 bci  = cfs->get_u2_fast(); // start_pc
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1836
    const u2 line = cfs->get_u2_fast(); // line_number
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1837
    guarantee_property(bci < code_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1838
        "Invalid pc in LineNumberTable in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1839
    (*write_stream)->write_pair(bci, line);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1840
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1841
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1842
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1843
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1844
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
  1845
 public:
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1846
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1847
  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
  1848
  /*
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1849
   * 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
  1850
   * 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
  1851
   *       && 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
  1852
   */
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1853
    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
  1854
            e0.length        == e1.length &&
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1855
            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
  1856
            e0.slot          == e1.slot);
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1857
  }
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1858
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1859
  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
  1860
    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
  1861
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1862
    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
  1863
    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
  1864
    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
  1865
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1866
    return raw_hash;
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1867
  }
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1868
};
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1869
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  1870
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1871
// Class file LocalVariableTable elements.
49364
601146c66cad 8173070: Remove ValueObj class for allocation subclassing for runtime code
coleenp
parents: 49359
diff changeset
  1872
class Classfile_LVT_Element {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1873
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1874
  u2 start_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1875
  u2 length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1876
  u2 name_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1877
  u2 descriptor_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1878
  u2 slot;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1879
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1880
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1881
static void copy_lvt_element(const Classfile_LVT_Element* const src,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1882
                             LocalVariableTableElement* const lvt) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1883
  lvt->start_bci           = Bytes::get_Java_u2((u1*) &src->start_bci);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1884
  lvt->length              = Bytes::get_Java_u2((u1*) &src->length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1885
  lvt->name_cp_index       = Bytes::get_Java_u2((u1*) &src->name_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1886
  lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1887
  lvt->signature_cp_index  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1888
  lvt->slot                = Bytes::get_Java_u2((u1*) &src->slot);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1889
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1890
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1891
// Function is used to parse both attributes:
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1892
// LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT)
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1893
const ClassFileParser::unsafe_u2* ClassFileParser::parse_localvariable_table(const ClassFileStream* cfs,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1894
                                                                             u4 code_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1895
                                                                             u2 max_locals,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1896
                                                                             u4 code_attribute_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1897
                                                                             u2* const localvariable_table_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1898
                                                                             bool isLVTT,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1899
                                                                             TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1900
  const char* const tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable";
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1901
  *localvariable_table_length = cfs->get_u2(CHECK_NULL);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1902
  const unsigned int size =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1903
    (*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2);
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 ConstantPool* const cp = _cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1906
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1907
  // Verify local variable table attribute has right length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1908
  if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1909
    guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1910
                       "%s has wrong length in class file %s", tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1911
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1912
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  1913
  const unsafe_u2* const localvariable_table_start = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1914
  assert(localvariable_table_start != NULL, "null local variable table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1915
  if (!_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1916
    cfs->skip_u2_fast(size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1917
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1918
    cfs->guarantee_more(size * 2, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1919
    for(int i = 0; i < (*localvariable_table_length); i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1920
      const u2 start_pc = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1921
      const u2 length = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1922
      const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1923
      const u2 descriptor_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1924
      const u2 index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1925
      // Assign to a u4 to avoid overflow
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1926
      const u4 end_pc = (u4)start_pc + (u4)length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1927
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1928
      if (start_pc >= code_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1929
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1930
          "Invalid start_pc %u in %s in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1931
          start_pc, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1932
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1933
      if (end_pc > code_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1934
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1935
          "Invalid length %u in %s in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1936
          length, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1937
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1938
      const int cp_size = cp->length();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1939
      guarantee_property(valid_symbol_at(name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1940
        "Name index %u in %s has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1941
        name_index, tbl_name, CHECK_NULL);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  1942
      guarantee_property(valid_symbol_at(descriptor_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1943
        "Signature index %u in %s has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1944
        descriptor_index, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1945
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1946
      const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1947
      const Symbol* const sig = cp->symbol_at(descriptor_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1948
      verify_legal_field_name(name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1949
      u2 extra_slot = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1950
      if (!isLVTT) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1951
        verify_legal_field_signature(name, sig, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1952
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1953
        // 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
  1954
        if (sig == vmSymbols::type_signature(T_DOUBLE) ||
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  1955
            sig == vmSymbols::type_signature(T_LONG)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1956
          extra_slot = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1957
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1958
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1959
      guarantee_property((index + extra_slot) < max_locals,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1960
                          "Invalid index %u in %s in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1961
                          index, tbl_name, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1962
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1963
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1964
  return localvariable_table_start;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1965
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1966
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1967
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1968
void ClassFileParser::parse_type_array(u2 array_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1969
                                       u4 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1970
                                       u4* const u1_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1971
                                       u4* const u2_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1972
                                       u1* const u1_array,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1973
                                       u2* const u2_array,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1974
                                       TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1975
  const ClassFileStream* const cfs = _stream;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1976
  u2 index = 0; // index in the array with long/double occupying two slots
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1977
  u4 i1 = *u1_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1978
  u4 i2 = *u2_index + 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1979
  for(int i = 0; i < array_length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1980
    const u1 tag = u1_array[i1++] = cfs->get_u1(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1981
    index++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1982
    if (tag == ITEM_Long || tag == ITEM_Double) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1983
      index++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1984
    } else if (tag == ITEM_Object) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1985
      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
  1986
      guarantee_property(valid_klass_reference_at(class_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1987
                         "Bad class index %u in StackMap in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1988
                         class_index, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1989
    } else if (tag == ITEM_Uninitialized) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  1990
      const u2 offset = u2_array[i2++] = cfs->get_u2(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1991
      guarantee_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1992
        offset < code_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1993
        "Bad uninitialized type offset %u in StackMap in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1994
        offset, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1995
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1996
      guarantee_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1997
        tag <= (u1)ITEM_Uninitialized,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1998
        "Unknown variable type %u in StackMap in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1999
        tag, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2000
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2001
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2002
  u2_array[*u2_index] = index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2003
  *u1_index = i1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2004
  *u2_index = i2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2005
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2006
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2007
static const u1* parse_stackmap_table(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2008
                                      u4 code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2009
                                      bool need_verify,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2010
                                      TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2011
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2012
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2013
  if (0 == code_attribute_length) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2014
    return NULL;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2015
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2016
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2017
  const u1* const stackmap_table_start = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2018
  assert(stackmap_table_start != NULL, "null stackmap table");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2019
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2020
  // check code_attribute_length first
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2021
  cfs->skip_u1(code_attribute_length, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2022
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2023
  if (!need_verify && !DumpSharedSpaces) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2024
    return NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2025
  }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2026
  return stackmap_table_start;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2027
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2028
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2029
const ClassFileParser::unsafe_u2* ClassFileParser::parse_checked_exceptions(const ClassFileStream* const cfs,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2030
                                                                            u2* const checked_exceptions_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2031
                                                                            u4 method_attribute_length,
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2032
                                                                            TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2033
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2034
  assert(checked_exceptions_length != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2035
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2036
  cfs->guarantee_more(2, CHECK_NULL);  // checked_exceptions_length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2037
  *checked_exceptions_length = cfs->get_u2_fast();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2038
  const unsigned int size =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2039
    (*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2);
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2040
  const unsafe_u2* const checked_exceptions_start = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2041
  assert(checked_exceptions_start != NULL, "null checked exceptions");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2042
  if (!_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2043
    cfs->skip_u2_fast(size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2044
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2045
    // Verify each value in the checked exception table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2046
    u2 checked_exception;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2047
    const u2 len = *checked_exceptions_length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2048
    cfs->guarantee_more(2 * len, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2049
    for (int i = 0; i < len; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2050
      checked_exception = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2051
      check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2052
        valid_klass_reference_at(checked_exception),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2053
        "Exception name has bad type at constant pool %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2054
        checked_exception, CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2055
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2056
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2057
  // check exceptions attribute length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2058
  if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2059
    guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) +
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2060
                                                   sizeof(u2) * size),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2061
                      "Exceptions attribute has wrong length in class file %s", CHECK_NULL);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2062
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2063
  return checked_exceptions_start;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2064
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2065
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2066
void ClassFileParser::throwIllegalSignature(const char* type,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2067
                                            const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2068
                                            const Symbol* sig,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2069
                                            TRAPS) const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2070
  assert(name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2071
  assert(sig != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2072
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  2073
  ResourceMark rm(THREAD);
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  2074
  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
  2075
      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
  2076
      "%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
  2077
      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
  2078
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2079
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2080
AnnotationCollector::ID
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2081
AnnotationCollector::annotation_index(const ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2082
                                      const Symbol* name) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2083
  const vmSymbols::SID sid = vmSymbols::find_sid(name);
15244
83447fffce1e 8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents: 15221
diff changeset
  2084
  // 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
  2085
  const bool privileged = loader_data->is_the_null_class_loader_data() ||
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  2086
                          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
  2087
                          loader_data->is_anonymous();
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2088
  switch (sid) {
37301
a936b4e01afb 8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents: 37242
diff changeset
  2089
    case vmSymbols::VM_SYMBOL_ENUM_NAME(reflect_CallerSensitive_signature): {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2090
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2091
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2092
      return _method_CallerSensitive;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2093
    }
35135
twisti
parents: 35099 35071
diff changeset
  2094
    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
  2095
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2096
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2097
      return _method_ForceInline;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2098
    }
35135
twisti
parents: 35099 35071
diff changeset
  2099
    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
  2100
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2101
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2102
      return _method_DontInline;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2103
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2104
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_InjectedProfile_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2105
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2106
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2107
      return _method_InjectedProfile;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2108
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2109
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2110
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2111
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2112
      return _method_LambdaForm_Compiled;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2113
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2114
    case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2115
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2116
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2117
      return _method_LambdaForm_Hidden;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2118
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2119
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_HotSpotIntrinsicCandidate_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2120
      if (_location != _in_method)  break;  // only allow for methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2121
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2122
      return _method_HotSpotIntrinsicCandidate;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2123
    }
35135
twisti
parents: 35099 35071
diff changeset
  2124
    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
  2125
      if (_location != _in_field)   break;  // only allow for fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2126
      if (!privileged)              break;  // only allow in privileged code
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2127
      return _field_Stable;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2128
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2129
    case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Contended_signature): {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2130
      if (_location != _in_field && _location != _in_class) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2131
        break;  // only allow for fields and classes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2132
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2133
      if (!EnableContended || (RestrictContended && !privileged)) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2134
        break;  // honor privileges
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2135
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2136
      return _jdk_internal_vm_annotation_Contended;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2137
    }
35071
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2138
    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
  2139
      if (_location != _in_method)  break;  // only allow for methods
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2140
      if (RestrictReservedStack && !privileged) break; // honor privileges
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2141
      return _jdk_internal_vm_annotation_ReservedStackAccess;
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2142
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2143
    default: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2144
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2145
    }
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2146
  }
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2147
  return AnnotationCollector::_unknown;
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2148
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2149
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2150
void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) {
15193
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  2151
  if (is_contended())
8e6b5694267f 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 15185
diff changeset
  2152
    f->set_contended_group(contended_group());
19770
7cb9f982ea81 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 19681
diff changeset
  2153
  if (is_stable())
7cb9f982ea81 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 19681
diff changeset
  2154
    f->set_stable(true);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2155
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2156
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2157
ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2158
  // 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
  2159
  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
  2160
  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
  2161
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2162
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
  2163
void MethodAnnotationCollector::apply_to(const methodHandle& m) {
16617
6235d2c7549f 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 15935
diff changeset
  2164
  if (has_annotation(_method_CallerSensitive))
6235d2c7549f 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 15935
diff changeset
  2165
    m->set_caller_sensitive(true);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2166
  if (has_annotation(_method_ForceInline))
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2167
    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
  2168
  if (has_annotation(_method_DontInline))
30245956af37 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 13296
diff changeset
  2169
    m->set_dont_inline(true);
31228
8e427370cdd1 8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents: 30764
diff changeset
  2170
  if (has_annotation(_method_InjectedProfile))
8e427370cdd1 8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents: 30764
diff changeset
  2171
    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
  2172
  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
  2173
    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
  2174
  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
  2175
    m->set_hidden(true);
31587
e48945b7849c 8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents: 31402
diff changeset
  2176
  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
  2177
    m->set_intrinsic_candidate(true);
35071
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2178
  if (has_annotation(_jdk_internal_vm_annotation_ReservedStackAccess))
a0910b1d3e0d 8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents: 34666
diff changeset
  2179
    m->set_has_reserved_stack_access(true);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2180
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2181
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2182
void ClassFileParser::ClassAnnotationCollector::apply_to(InstanceKlass* ik) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2183
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2184
  ik->set_is_contended(is_contended());
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2185
}
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2186
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2187
#define MAX_ARGS_SIZE 255
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2188
#define MAX_CODE_SIZE 65535
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2189
#define INITIAL_MAX_LVT_NUMBER 256
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2190
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2191
/* Copy class file LVT's/LVTT's into the HotSpot internal LVT.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2192
 *
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2193
 * Rules for LVT's and LVTT's are:
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2194
 *   - There can be any number of LVT's and LVTT's.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2195
 *   - 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
  2196
 *     one LVT containing all the entries from the n LVT's.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2197
 *   - There may be no more than one LVT entry per local variable.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2198
 *     Two LVT entries are 'equal' if these fields are the same:
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2199
 *        start_pc, length, name, slot
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2200
 *   - There may be no more than one LVTT entry per each LVT entry.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2201
 *     Each LVTT entry has to match some LVT entry.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2202
 *   - HotSpot internal LVT keeps natural ordering of class file LVT entries.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2203
 */
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2204
void ClassFileParser::copy_localvariable_table(const ConstMethod* cm,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2205
                                               int lvt_cnt,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2206
                                               u2* const localvariable_table_length,
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2207
                                               const unsafe_u2** const localvariable_table_start,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2208
                                               int lvtt_cnt,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2209
                                               u2* const localvariable_type_table_length,
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2210
                                               const unsafe_u2** const localvariable_type_table_start,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2211
                                               TRAPS) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2212
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2213
  ResourceMark rm(THREAD);
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2214
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2215
  typedef ResourceHashtable<LocalVariableTableElement, LocalVariableTableElement*,
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2216
                            &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
  2217
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2218
  LVT_HashTable* const table = new LVT_HashTable();
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2219
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2220
  // To fill LocalVariableTable in
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2221
  const Classfile_LVT_Element* cf_lvt;
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2222
  LocalVariableTableElement* lvt = cm->localvariable_table_start();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2223
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2224
  for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2225
    cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no];
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2226
    for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2227
      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
  2228
      // 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
  2229
      if (table->put(*lvt, lvt) == false
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2230
          && _need_verify
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2231
          && _major_version >= JAVA_1_5_VERSION) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2232
        classfile_parse_error("Duplicated LocalVariableTable attribute "
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2233
                              "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
  2234
                               _cp->symbol_at(lvt->name_cp_index)->as_utf8(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2235
                               CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2236
      }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2237
    }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2238
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2239
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2240
  // To merge LocalVariableTable and LocalVariableTypeTable
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2241
  const Classfile_LVT_Element* cf_lvtt;
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2242
  LocalVariableTableElement lvtt_elem;
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2243
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2244
  for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2245
    cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no];
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2246
    for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2247
      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
  2248
      LocalVariableTableElement** entry = table->get(lvtt_elem);
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2249
      if (entry == NULL) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2250
        if (_need_verify) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2251
          classfile_parse_error("LVTT entry for '%s' in class file %s "
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2252
                                "does not match any LVT entry",
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2253
                                 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2254
                                 CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2255
        }
28817
09a44329d68d 8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents: 28027
diff changeset
  2256
      } else if ((*entry)->signature_cp_index != 0 && _need_verify) {
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2257
        classfile_parse_error("Duplicated LocalVariableTypeTable attribute "
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2258
                              "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
  2259
                               _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2260
                               CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2261
      } else {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2262
        // 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
  2263
        (*entry)->signature_cp_index = lvtt_elem.descriptor_cp_index;
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2264
      }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2265
    }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2266
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2267
}
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2268
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2269
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2270
void ClassFileParser::copy_method_annotations(ConstMethod* cm,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2271
                                       const u1* runtime_visible_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2272
                                       int runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2273
                                       const u1* runtime_invisible_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2274
                                       int runtime_invisible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2275
                                       const u1* runtime_visible_parameter_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2276
                                       int runtime_visible_parameter_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2277
                                       const u1* runtime_invisible_parameter_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2278
                                       int runtime_invisible_parameter_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2279
                                       const u1* runtime_visible_type_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2280
                                       int runtime_visible_type_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2281
                                       const u1* runtime_invisible_type_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2282
                                       int runtime_invisible_type_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2283
                                       const u1* annotation_default,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2284
                                       int annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2285
                                       TRAPS) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2286
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2287
  AnnotationArray* a;
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2288
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2289
  if (runtime_visible_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2290
      runtime_invisible_annotations_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2291
     a = assemble_annotations(runtime_visible_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2292
                              runtime_visible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2293
                              runtime_invisible_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2294
                              runtime_invisible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2295
                              CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2296
     cm->set_method_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2297
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2298
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2299
  if (runtime_visible_parameter_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2300
      runtime_invisible_parameter_annotations_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2301
    a = assemble_annotations(runtime_visible_parameter_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2302
                             runtime_visible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2303
                             runtime_invisible_parameter_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2304
                             runtime_invisible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2305
                             CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2306
    cm->set_parameter_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2307
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2308
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2309
  if (annotation_default_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2310
    a = assemble_annotations(annotation_default,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2311
                             annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2312
                             NULL,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2313
                             0,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2314
                             CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2315
    cm->set_default_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2316
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2317
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2318
  if (runtime_visible_type_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2319
      runtime_invisible_type_annotations_length > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2320
    a = assemble_annotations(runtime_visible_type_annotations,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2321
                             runtime_visible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2322
                             runtime_invisible_type_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2323
                             runtime_invisible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2324
                             CHECK);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2325
    cm->set_type_annotations(a);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2326
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2327
}
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2328
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2329
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2330
// 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
  2331
// 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
  2332
// Method* to save footprint, so we only know the size of the resulting Method* when the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2333
// entire method attribute is parsed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2334
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2335
// The promoted_flags parameter is used to pass relevant access_flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2336
// from the method back up to the containing klass. These flag values
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2337
// are added to klass's access_flags.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2338
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2339
Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2340
                                      bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2341
                                      const ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2342
                                      AccessFlags* const promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2343
                                      TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2344
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2345
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2346
  assert(promoted_flags != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2347
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2348
  ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2349
  // Parse fixed parts:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2350
  // access_flags, name_index, descriptor_index, attributes_count
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2351
  cfs->guarantee_more(8, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2352
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2353
  int flags = cfs->get_u2_fast();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2354
  const u2 name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2355
  const int cp_size = cp->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2356
  check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2357
    valid_symbol_at(name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2358
    "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
  2359
    name_index, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2360
  const Symbol* const name = cp->symbol_at(name_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2361
  verify_legal_method_name(name, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2362
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2363
  const u2 signature_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2364
  guarantee_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2365
    valid_symbol_at(signature_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2366
    "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
  2367
    signature_index, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2368
  const Symbol* const signature = cp->symbol_at(signature_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2369
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2370
  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
  2371
    // 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
  2372
    // (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
  2373
    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
  2374
      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
  2375
    } 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
  2376
      flags &= JVM_ACC_STATIC | JVM_ACC_STRICT;
32824
3b686e54dece 8135208: VM permits illegal <clinit> access_flags, versions 51-52
hseigel
parents: 31867
diff changeset
  2377
    } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2378
      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
  2379
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2380
  } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2381
    verify_legal_method_modifiers(flags, is_interface, name, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2382
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2383
33207
edc4431940b2 8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents: 33105
diff changeset
  2384
  if (name == vmSymbols::object_initializer_name() && is_interface) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2385
    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
  2386
  }
edc4431940b2 8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents: 33105
diff changeset
  2387
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2388
  int args_size = -1;  // only used when _need_verify is true
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2389
  if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2390
    args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) +
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2391
                 verify_legal_method_signature(name, signature, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2392
    if (args_size > MAX_ARGS_SIZE) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2393
      classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2394
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2395
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2396
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2397
  AccessFlags access_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2398
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2399
  // Default values for code and exceptions attribute elements
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2400
  u2 max_stack = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2401
  u2 max_locals = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2402
  u4 code_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2403
  const u1* code_start = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2404
  u2 exception_table_length = 0;
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2405
  const unsafe_u2* exception_table_start = NULL; // (potentially unaligned) pointer to array of u2 elements
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2406
  Array<int>* exception_handlers = Universe::the_empty_int_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2407
  u2 checked_exceptions_length = 0;
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2408
  const unsafe_u2* checked_exceptions_start = NULL; // (potentially unaligned) pointer to array of u2 elements
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2409
  CompressedLineNumberWriteStream* linenumber_table = NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2410
  int linenumber_table_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2411
  int total_lvt_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2412
  u2 lvt_cnt = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2413
  u2 lvtt_cnt = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2414
  bool lvt_allocated = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2415
  u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2416
  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
  2417
  u2* localvariable_table_length = NULL;
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2418
  const unsafe_u2** localvariable_table_start = NULL; // (potentially unaligned) pointer to array of LVT attributes
31851
ec2f9350c499 8079825: Uninitialised variable in hotspot/src/share/vm & cpu/x86/vm (runtime)
ccheung
parents: 31778
diff changeset
  2419
  u2* localvariable_type_table_length = NULL;
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2420
  const unsafe_u2** localvariable_type_table_start = NULL; // (potentially unaligned) pointer to LVTT attributes
27612
7201412afbd0 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents: 27402
diff changeset
  2421
  int method_parameters_length = -1;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2422
  const u1* method_parameters_data = NULL;
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2423
  bool method_parameters_seen = false;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2424
  bool parsed_code_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2425
  bool parsed_checked_exceptions_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2426
  bool parsed_stackmap_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2427
  // stackmap attribute - JDK1.5
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2428
  const u1* stackmap_data = NULL;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2429
  int stackmap_data_length = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2430
  u2 generic_signature_index = 0;
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2431
  MethodAnnotationCollector parsed_annotations;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2432
  const u1* runtime_visible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2433
  int runtime_visible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2434
  const u1* runtime_invisible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2435
  int runtime_invisible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2436
  const u1* runtime_visible_parameter_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2437
  int runtime_visible_parameter_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2438
  const u1* runtime_invisible_parameter_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2439
  int runtime_invisible_parameter_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2440
  const u1* runtime_visible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2441
  int runtime_visible_type_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2442
  const u1* runtime_invisible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2443
  int runtime_invisible_type_annotations_length = 0;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2444
  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
  2445
  bool runtime_invisible_type_annotations_exists = false;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2446
  bool runtime_invisible_parameter_annotations_exists = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2447
  const u1* annotation_default = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2448
  int annotation_default_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2449
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2450
  // Parse code and exceptions attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2451
  u2 method_attributes_count = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2452
  while (method_attributes_count--) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2453
    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
  2454
    const u2 method_attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2455
    const u4 method_attribute_length = cfs->get_u4_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2456
    check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2457
      valid_symbol_at(method_attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2458
      "Invalid method attribute name index %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2459
      method_attribute_name_index, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2460
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2461
    const Symbol* const method_attribute_name = cp->symbol_at(method_attribute_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2462
    if (method_attribute_name == vmSymbols::tag_code()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2463
      // Parse Code attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2464
      if (_need_verify) {
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  2465
        guarantee_property(
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  2466
            !access_flags.is_native() && !access_flags.is_abstract(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2467
                        "Code attribute in native or abstract methods in class file %s",
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
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2470
      if (parsed_code_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2471
        classfile_parse_error("Multiple Code attributes in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2472
                              CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2473
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2474
      parsed_code_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2475
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2476
      // Stack size, locals size, and code size
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2477
      if (_major_version == 45 && _minor_version <= 2) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2478
        cfs->guarantee_more(4, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2479
        max_stack = cfs->get_u1_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2480
        max_locals = cfs->get_u1_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2481
        code_length = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2482
      } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2483
        cfs->guarantee_more(8, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2484
        max_stack = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2485
        max_locals = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2486
        code_length = cfs->get_u4_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2487
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2488
      if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2489
        guarantee_property(args_size <= max_locals,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2490
                           "Arguments can't fit into locals in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2491
                           CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2492
        guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2493
                           "Invalid method Code length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2494
                           code_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2495
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2496
      // Code pointer
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2497
      code_start = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2498
      assert(code_start != NULL, "null code start");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2499
      cfs->guarantee_more(code_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2500
      cfs->skip_u1_fast(code_length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2501
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2502
      // Exception handler table
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2503
      cfs->guarantee_more(2, CHECK_NULL);  // exception_table_length
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2504
      exception_table_length = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2505
      if (exception_table_length > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2506
        exception_table_start = parse_exception_table(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2507
                                                      code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2508
                                                      exception_table_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2509
                                                      CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2510
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2511
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2512
      // Parse additional attributes in code attribute
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2513
      cfs->guarantee_more(2, CHECK_NULL);  // code_attributes_count
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2514
      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
  2515
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2516
      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
  2517
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2518
      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
  2519
        calculated_attribute_length =
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2520
            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
  2521
      } else {
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2522
        // 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
  2523
        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
  2524
      }
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2525
      calculated_attribute_length +=
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2526
        code_length +
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2527
        sizeof(exception_table_length) +
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2528
        sizeof(code_attributes_count) +
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2529
        exception_table_length *
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2530
            ( sizeof(u2) +   // start_pc
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2531
              sizeof(u2) +   // end_pc
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2532
              sizeof(u2) +   // handler_pc
2d9c1e9e9f98 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 1
diff changeset
  2533
              sizeof(u2) );  // catch_type_index
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2534
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2535
      while (code_attributes_count--) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2536
        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
  2537
        const u2 code_attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2538
        const u4 code_attribute_length = cfs->get_u4_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2539
        calculated_attribute_length += code_attribute_length +
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2540
                                       sizeof(code_attribute_name_index) +
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2541
                                       sizeof(code_attribute_length);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2542
        check_property(valid_symbol_at(code_attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2543
                       "Invalid code attribute name index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2544
                       code_attribute_name_index,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2545
                       CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2546
        if (LoadLineNumberTables &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2547
            cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2548
          // Parse and compress line number table
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2549
          parse_linenumber_table(code_attribute_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2550
                                 code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2551
                                 &linenumber_table,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2552
                                 CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2553
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2554
        } else if (LoadLocalVariableTables &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2555
                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2556
          // Parse local variable table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2557
          if (!lvt_allocated) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2558
            localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2559
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2560
            localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2561
              THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2562
            localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2563
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2564
            localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2565
              THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2566
            lvt_allocated = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2567
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2568
          if (lvt_cnt == max_lvt_cnt) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2569
            max_lvt_cnt <<= 1;
20668
0d04d8ae0292 8023683: Enhance class file parsing
iklam
parents: 20667
diff changeset
  2570
            localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2571
            localvariable_table_start  = REALLOC_RESOURCE_ARRAY(const unsafe_u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2572
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2573
          localvariable_table_start[lvt_cnt] =
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2574
            parse_localvariable_table(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2575
                                      code_length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2576
                                      max_locals,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2577
                                      code_attribute_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2578
                                      &localvariable_table_length[lvt_cnt],
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2579
                                      false,    // is not LVTT
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2580
                                      CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2581
          total_lvt_length += localvariable_table_length[lvt_cnt];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2582
          lvt_cnt++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2583
        } else if (LoadLocalVariableTypeTables &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2584
                   _major_version >= JAVA_1_5_VERSION &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2585
                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2586
          if (!lvt_allocated) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2587
            localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2588
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2589
            localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2590
              THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2591
            localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2592
              THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2593
            localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2594
              THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2595
            lvt_allocated = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2596
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2597
          // Parse local variable type table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2598
          if (lvtt_cnt == max_lvtt_cnt) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2599
            max_lvtt_cnt <<= 1;
20668
0d04d8ae0292 8023683: Enhance class file parsing
iklam
parents: 20667
diff changeset
  2600
            localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
46513
c61eea516a0a 8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents: 46504
diff changeset
  2601
            localvariable_type_table_start  = REALLOC_RESOURCE_ARRAY(const unsafe_u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2602
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2603
          localvariable_type_table_start[lvtt_cnt] =
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2604
            parse_localvariable_table(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2605
                                      code_length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2606
                                      max_locals,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2607
                                      code_attribute_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2608
                                      &localvariable_type_table_length[lvtt_cnt],
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2609
                                      true,     // is LVTT
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2610
                                      CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2611
          lvtt_cnt++;
16445
cb44d5b3ad89 8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents: 15935
diff changeset
  2612
        } else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2613
                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2614
          // Stack map is only needed by the new verifier in JDK1.5.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2615
          if (parsed_stackmap_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2616
            classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2617
          }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2618
          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
  2619
          stackmap_data_length = code_attribute_length;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2620
          parsed_stackmap_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2621
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2622
          // Skip unknown attributes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2623
          cfs->skip_u1(code_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2624
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2625
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2626
      // check method attribute length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2627
      if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2628
        guarantee_property(method_attribute_length == calculated_attribute_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2629
                           "Code segment has wrong length in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2630
                           CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2631
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2632
    } else if (method_attribute_name == vmSymbols::tag_exceptions()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2633
      // Parse Exceptions attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2634
      if (parsed_checked_exceptions_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2635
        classfile_parse_error("Multiple Exceptions attributes in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2636
                              CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2637
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2638
      parsed_checked_exceptions_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2639
      checked_exceptions_start =
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2640
            parse_checked_exceptions(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2641
                                     &checked_exceptions_length,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2642
                                     method_attribute_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2643
                                     CHECK_NULL);
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2644
    } else if (method_attribute_name == vmSymbols::tag_method_parameters()) {
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2645
      // reject multiple method parameters
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2646
      if (method_parameters_seen) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2647
        classfile_parse_error("Multiple MethodParameters attributes in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2648
                              CHECK_NULL);
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2649
      }
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2650
      method_parameters_seen = true;
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2651
      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
  2652
      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
  2653
      if (method_attribute_length != real_length) {
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2654
        classfile_parse_error(
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2655
          "Invalid MethodParameters method attribute length %u in class file",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2656
          method_attribute_length, CHECK_NULL);
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2657
      }
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2658
      method_parameters_data = cfs->current();
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2659
      cfs->skip_u2_fast(method_parameters_length);
17080
9151a26f5888 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 17024
diff changeset
  2660
      cfs->skip_u2_fast(method_parameters_length);
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2661
      // ignore this attribute if it cannot be reflected
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2662
      if (!SystemDictionary::Parameter_klass_loaded())
27612
7201412afbd0 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents: 27402
diff changeset
  2663
        method_parameters_length = -1;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2664
    } else if (method_attribute_name == vmSymbols::tag_synthetic()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2665
      if (method_attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2666
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2667
          "Invalid Synthetic method attribute length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2668
          method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2669
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2670
      // Should we check that there hasn't already been a synthetic attribute?
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2671
      access_flags.set_is_synthetic();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2672
    } else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2673
      if (method_attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2674
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2675
          "Invalid Deprecated method attribute length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2676
          method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2677
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2678
    } else if (_major_version >= JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2679
      if (method_attribute_name == vmSymbols::tag_signature()) {
44243
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  2680
        if (generic_signature_index != 0) {
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  2681
          classfile_parse_error(
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  2682
            "Multiple Signature attributes for method in class file %s",
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  2683
            CHECK_NULL);
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  2684
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2685
        if (method_attribute_length != 2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2686
          classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2687
            "Invalid Signature attribute length %u in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2688
            method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2689
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2690
        generic_signature_index = parse_generic_signature_attribute(cfs, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2691
      } 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
  2692
        if (runtime_visible_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2693
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2694
            "Multiple RuntimeVisibleAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2695
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2696
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2697
        runtime_visible_annotations_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2698
        runtime_visible_annotations = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2699
        assert(runtime_visible_annotations != NULL, "null visible annotations");
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  2700
        cfs->guarantee_more(runtime_visible_annotations_length, CHECK_NULL);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2701
        parse_annotations(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2702
                          runtime_visible_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2703
                          runtime_visible_annotations_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2704
                          &parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2705
                          _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2706
                          CHECK_NULL);
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  2707
        cfs->skip_u1_fast(runtime_visible_annotations_length);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2708
      } 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
  2709
        if (runtime_invisible_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2710
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2711
            "Multiple RuntimeInvisibleAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2712
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2713
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2714
        runtime_invisible_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2715
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2716
          runtime_invisible_annotations_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2717
          runtime_invisible_annotations = cfs->current();
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2718
          assert(runtime_invisible_annotations != NULL, "null invisible annotations");
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2719
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2720
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2721
      } 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
  2722
        if (runtime_visible_parameter_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2723
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2724
            "Multiple RuntimeVisibleParameterAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2725
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2726
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2727
        runtime_visible_parameter_annotations_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2728
        runtime_visible_parameter_annotations = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2729
        assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2730
        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
  2731
      } 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
  2732
        if (runtime_invisible_parameter_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2733
          classfile_parse_error(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2734
            "Multiple RuntimeInvisibleParameterAnnotations attributes for method in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2735
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2736
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2737
        runtime_invisible_parameter_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2738
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2739
          runtime_invisible_parameter_annotations_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2740
          runtime_invisible_parameter_annotations = cfs->current();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2741
          assert(runtime_invisible_parameter_annotations != NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2742
            "null invisible parameter annotations");
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2743
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2744
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2745
      } 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
  2746
        if (annotation_default != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2747
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2748
            "Multiple AnnotationDefault attributes for method in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2749
            CHECK_NULL);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  2750
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2751
        annotation_default_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2752
        annotation_default = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2753
        assert(annotation_default != NULL, "null annotation default");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2754
        cfs->skip_u1(annotation_default_length, CHECK_NULL);
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2755
      } 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
  2756
        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
  2757
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2758
            "Multiple RuntimeVisibleTypeAnnotations attributes for method in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2759
            CHECK_NULL);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2760
        }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2761
        runtime_visible_type_annotations_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2762
        runtime_visible_type_annotations = cfs->current();
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2763
        assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2764
        // No need for the VM to parse Type annotations
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2765
        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
  2766
      } 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
  2767
        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
  2768
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2769
            "Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2770
            CHECK_NULL);
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2771
        } else {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2772
          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
  2773
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2774
        if (PreserveAllAnnotations) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2775
          runtime_invisible_type_annotations_length = method_attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2776
          runtime_invisible_type_annotations = cfs->current();
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  2777
          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
  2778
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2779
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2780
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2781
        // Skip unknown attributes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2782
        cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2783
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2784
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2785
      // Skip unknown attributes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2786
      cfs->skip_u1(method_attribute_length, CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2787
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2788
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2789
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2790
  if (linenumber_table != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2791
    linenumber_table->write_terminator();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2792
    linenumber_table_length = linenumber_table->position();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2793
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2794
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2795
  // Make sure there's at least one Code attribute in non-native/non-abstract method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2796
  if (_need_verify) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2797
    guarantee_property(access_flags.is_native() ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2798
                       access_flags.is_abstract() ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2799
                       parsed_code_attribute,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2800
                       "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
  2801
                       CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2802
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2803
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2804
  // All sizing information for a Method* is finally available, now create it
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2805
  InlineTableSizes sizes(
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2806
      total_lvt_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2807
      linenumber_table_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2808
      exception_table_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2809
      checked_exceptions_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2810
      method_parameters_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2811
      generic_signature_index,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2812
      runtime_visible_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2813
           runtime_invisible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2814
      runtime_visible_parameter_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2815
           runtime_invisible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2816
      runtime_visible_type_annotations_length +
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2817
           runtime_invisible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2818
      annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2819
      0);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2820
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2821
  Method* const m = Method::allocate(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2822
                                     code_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2823
                                     access_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2824
                                     &sizes,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2825
                                     ConstMethod::NORMAL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2826
                                     CHECK_NULL);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2827
35898
ddc274f0052f 8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents: 35495
diff changeset
  2828
  ClassLoadingService::add_class_method_size(m->size()*wordSize);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2829
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2830
  // 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
  2831
  m->set_constants(_cp);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2832
  m->set_name_index(name_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2833
  m->set_signature_index(signature_index);
37480
291ee208fb72 8132051: Better byte behavior
coleenp
parents: 37301
diff changeset
  2834
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2835
  ResultTypeFinder rtf(cp->symbol_at(signature_index));
37480
291ee208fb72 8132051: Better byte behavior
coleenp
parents: 37301
diff changeset
  2836
  m->constMethod()->set_result_type(rtf.type());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2837
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2838
  if (args_size >= 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2839
    m->set_size_of_parameters(args_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2840
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2841
    m->compute_size_of_parameters(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2842
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2843
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2844
  if (args_size >= 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2845
    m->compute_size_of_parameters(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2846
    assert(args_size == m->size_of_parameters(), "");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2847
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2848
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2849
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2850
  // Fill in code attribute information
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2851
  m->set_max_stack(max_stack);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2852
  m->set_max_locals(max_locals);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2853
  if (stackmap_data != NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2854
    m->constMethod()->copy_stackmap_data(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2855
                                         (u1*)stackmap_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2856
                                         stackmap_data_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2857
                                         CHECK_NULL);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2858
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2859
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2860
  // Copy byte codes
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2861
  m->set_code((u1*)code_start);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2862
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2863
  // Copy line number table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2864
  if (linenumber_table != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2865
    memcpy(m->compressed_linenumber_table(),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2866
           linenumber_table->buffer(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2867
           linenumber_table_length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2868
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2869
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2870
  // Copy exception table
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2871
  if (exception_table_length > 0) {
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2872
    Copy::conjoint_swap_if_needed<Endian::JAVA>(exception_table_start,
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2873
                                                m->exception_table_start(),
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2874
                                                exception_table_length * sizeof(ExceptionTableElement),
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2875
                                                sizeof(u2));
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2876
  }
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12772
diff changeset
  2877
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2878
  // Copy method parameters
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2879
  if (method_parameters_length > 0) {
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2880
    MethodParametersElement* elem = m->constMethod()->method_parameters_start();
15464
1f2cca0aa501 8006949: Update hotspot for MethodParameters format change
emc
parents: 15244
diff changeset
  2881
    for (int i = 0; i < method_parameters_length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2882
      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
  2883
      method_parameters_data += 2;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2884
      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
  2885
      method_parameters_data += 2;
15102
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2886
    }
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2887
  }
0a86564e5f61 8004728: Add hotspot support for parameter reflection
coleenp
parents: 15097
diff changeset
  2888
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2889
  // Copy checked exceptions
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2890
  if (checked_exceptions_length > 0) {
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2891
    Copy::conjoint_swap_if_needed<Endian::JAVA>(checked_exceptions_start,
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2892
                                                m->checked_exceptions_start(),
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2893
                                                checked_exceptions_length * sizeof(CheckedExceptionElement),
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  2894
                                                sizeof(u2));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2895
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2896
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2897
  // Copy class file LVT's/LVTT's into the HotSpot internal LVT.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2898
  if (total_lvt_length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2899
    promoted_flags->set_has_localvariable_table();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2900
    copy_localvariable_table(m->constMethod(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2901
                             lvt_cnt,
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2902
                             localvariable_table_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2903
                             localvariable_table_start,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2904
                             lvtt_cnt,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2905
                             localvariable_type_table_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2906
                             localvariable_type_table_start,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2907
                             CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2908
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2909
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2910
  if (parsed_annotations.has_any_annotations())
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  2911
    parsed_annotations.apply_to(m);
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2912
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2913
  // Copy annotations
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2914
  copy_method_annotations(m->constMethod(),
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2915
                          runtime_visible_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2916
                          runtime_visible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2917
                          runtime_invisible_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2918
                          runtime_invisible_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2919
                          runtime_visible_parameter_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2920
                          runtime_visible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2921
                          runtime_invisible_parameter_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2922
                          runtime_invisible_parameter_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2923
                          runtime_visible_type_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2924
                          runtime_visible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2925
                          runtime_invisible_type_annotations,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2926
                          runtime_invisible_type_annotations_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2927
                          annotation_default,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2928
                          annotation_default_length,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2929
                          CHECK_NULL);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2930
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2931
  if (name == vmSymbols::finalize_method_name() &&
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2932
      signature == vmSymbols::void_method_signature()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2933
    if (m->is_empty_method()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2934
      _has_empty_finalizer = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2935
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2936
      _has_finalizer = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2937
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2938
  }
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2939
  if (name == vmSymbols::object_initializer_name() &&
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  2940
      signature == vmSymbols::void_method_signature() &&
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2941
      m->is_vanilla_constructor()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2942
    _has_vanilla_constructor = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2943
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2944
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  2945
  NOT_PRODUCT(m->verify());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2946
  return m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2947
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2948
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2949
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2950
// The promoted_flags parameter is used to pass relevant access_flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2951
// from the methods back up to the containing klass. These flag values
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2952
// are added to klass's access_flags.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2953
// Side-effects: populates the _methods field in the parser
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2954
void ClassFileParser::parse_methods(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2955
                                    bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2956
                                    AccessFlags* promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2957
                                    bool* has_final_method,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2958
                                    bool* declares_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2959
                                    TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2960
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2961
  assert(promoted_flags != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2962
  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
  2963
  assert(declares_nonstatic_concrete_methods != NULL, "invariant");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2964
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2965
  assert(NULL == _methods, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2966
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2967
  cfs->guarantee_more(2, CHECK);  // length
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2968
  const u2 length = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2969
  if (length == 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  2970
    _methods = Universe::the_empty_method_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2971
  } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2972
    _methods = MetadataFactory::new_array<Method*>(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2973
                                                   length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2974
                                                   NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2975
                                                   CHECK);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2976
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2977
    for (int index = 0; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2978
      Method* method = parse_method(cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2979
                                    is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2980
                                    _cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2981
                                    promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2982
                                    CHECK);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  2983
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2984
      if (method->is_final()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2985
        *has_final_method = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2986
      }
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  2987
      // 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
  2988
      // 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
  2989
      if (is_interface && !(*declares_nonstatic_concrete_methods)
27402
5c4675ddc00c 8043275: Fix interface initialization for default methods.
acorn
parents: 27023
diff changeset
  2990
        && !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
  2991
        *declares_nonstatic_concrete_methods = true;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  2992
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  2993
      _methods->at_put(index, method);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2994
    }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  2995
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2996
    if (_need_verify && length > 1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2997
      // Check duplicated methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2998
      ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2999
      NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3000
        THREAD, NameSigHash*, HASH_ROW_SIZE);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3001
      initialize_hashtable(names_and_sigs);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3002
      bool dup = false;
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3003
      const Symbol* name = NULL;
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3004
      const Symbol* sig = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3005
      {
35492
c8c0273e6b91 8146690: Make all classes in GC follow the naming convention.
david
parents: 35220
diff changeset
  3006
        debug_only(NoSafepointVerifier nsv;)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3007
        for (int i = 0; i < length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3008
          const Method* const m = _methods->at(i);
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3009
          name = m->name();
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3010
          sig = m->signature();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3011
          // If no duplicates, add name/signature in hashtable names_and_sigs.
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3012
          if (!put_after_lookup(name, sig, names_and_sigs)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3013
            dup = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3014
            break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3015
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3016
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3017
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3018
      if (dup) {
46301
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3019
        classfile_parse_error("Duplicate method name \"%s\" with signature \"%s\" in class file %s",
57f01b1bd33c 8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents: 46289
diff changeset
  3020
                               name->as_C_string(), sig->as_klass_external_name(), CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3021
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3022
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3023
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3024
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3025
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3026
static const intArray* sort_methods(Array<Method*>* methods) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3027
  const int length = methods->length();
9172
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  3028
  // If JVMTI original method ordering or sharing is enabled we have to
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3029
  // remember the original class file ordering.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3030
  // We temporarily use the vtable_index field in the Method* to store the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3031
  // 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
  3032
  // Put the method ordering in the shared archive.
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  3033
  if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3034
    for (int index = 0; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3035
      Method* const m = methods->at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3036
      assert(!m->valid_vtable_index(), "vtable index should not be set");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3037
      m->set_vtable_index(index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3038
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3039
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3040
  // 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
  3041
  // Note that the ordering is not alphabetical, see Symbol::fast_compare
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15464
diff changeset
  3042
  Method::sort_methods(methods);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3043
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3044
  intArray* method_ordering = NULL;
9172
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  3045
  // 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
  3046
  // array remembering the original ordering
a4e13ccafc44 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 9117
diff changeset
  3047
  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
  3048
    method_ordering = new intArray(length, length, -1);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3049
    for (int index = 0; index < length; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3050
      Method* const m = methods->at(index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3051
      const int old_index = m->vtable_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3052
      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
  3053
      method_ordering->at_put(index, old_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3054
      m->set_vtable_index(Method::invalid_vtable_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3055
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3056
  }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3057
  return method_ordering;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3058
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3059
25507
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3060
// Parse generic_signature attribute for methods and fields
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3061
u2 ClassFileParser::parse_generic_signature_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3062
                                                      TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3063
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3064
25507
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3065
  cfs->guarantee_more(2, CHECK_0);  // generic_signature_index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3066
  const u2 generic_signature_index = cfs->get_u2_fast();
25507
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3067
  check_property(
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3068
    valid_symbol_at(generic_signature_index),
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3069
    "Invalid Signature attribute at constant pool index %u in class file %s",
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3070
    generic_signature_index, CHECK_0);
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3071
  return generic_signature_index;
37c0bd9e16a0 8037167: Better method signature resolution
acorn
parents: 25506
diff changeset
  3072
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3073
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3074
void ClassFileParser::parse_classfile_sourcefile_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3075
                                                           TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3076
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3077
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3078
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3079
  cfs->guarantee_more(2, CHECK);  // sourcefile_index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3080
  const u2 sourcefile_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3081
  check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3082
    valid_symbol_at(sourcefile_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3083
    "Invalid SourceFile attribute at constant pool index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3084
    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
  3085
  set_class_sourcefile_index(sourcefile_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3086
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3087
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3088
void ClassFileParser::parse_classfile_source_debug_extension_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3089
                                                                       int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3090
                                                                       TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3091
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3092
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  3093
  const u1* const sde_buffer = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3094
  assert(sde_buffer != NULL, "null sde buffer");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3095
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3096
  // Don't bother storing it if there is no way to retrieve it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3097
  if (JvmtiExport::can_get_source_debug_extension()) {
13295
kvn
parents: 13201 13291
diff changeset
  3098
    assert((length+1) > length, "Overflow checking");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3099
    u1* const sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1);
13295
kvn
parents: 13201 13291
diff changeset
  3100
    for (int i = 0; i < length; i++) {
kvn
parents: 13201 13291
diff changeset
  3101
      sde[i] = sde_buffer[i];
kvn
parents: 13201 13291
diff changeset
  3102
    }
kvn
parents: 13201 13291
diff changeset
  3103
    sde[length] = '\0';
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3104
    set_class_sde_buffer((const char*)sde, length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3105
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3106
  // Got utf8 string, set stream position forward
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3107
  cfs->skip_u1(length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3108
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3109
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3110
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3111
// 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
  3112
#define RECOGNIZED_INNER_CLASS_MODIFIERS ( JVM_RECOGNIZED_CLASS_MODIFIERS | \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3113
                                           JVM_ACC_PRIVATE |                \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3114
                                           JVM_ACC_PROTECTED |              \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3115
                                           JVM_ACC_STATIC                   \
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3116
                                         )
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3117
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3118
// Return number of classes in the inner classes attribute table
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3119
u2 ClassFileParser::parse_classfile_inner_classes_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3120
                                                            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
  3121
                                                            bool parsed_enclosingmethod_attribute,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3122
                                                            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
  3123
                                                            u2 enclosing_method_method_index,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3124
                                                            TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3125
  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
  3126
  u2 length = 0;
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3127
  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
  3128
    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
  3129
    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
  3130
    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
  3131
  }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3132
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3133
  // 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
  3134
  // method data:
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3135
  //   [inner_class_info_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3136
  //    outer_class_info_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3137
  //    inner_name_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3138
  //    inner_class_access_flags,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3139
  //    ...
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3140
  //    enclosing_method_class_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3141
  //    enclosing_method_method_index]
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3142
  const int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3143
  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
  3144
  _inner_classes = inner_classes;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3145
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3146
  int index = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3147
  const int cp_size = _cp->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3148
  cfs->guarantee_more(8 * length, CHECK_0);  // 4-tuples of u2
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3149
  for (int n = 0; n < length; n++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3150
    // Inner class index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3151
    const u2 inner_class_info_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3152
    check_property(
31776
70dd826a47b5 8130183: InnerClasses: VM permits wrong inner_class_info_index value of zero
hseigel
parents: 31402
diff changeset
  3153
      valid_klass_reference_at(inner_class_info_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3154
      "inner_class_info_index %u has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3155
      inner_class_info_index, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3156
    // Outer class index
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3157
    const u2 outer_class_info_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3158
    check_property(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3159
      outer_class_info_index == 0 ||
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3160
        valid_klass_reference_at(outer_class_info_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3161
      "outer_class_info_index %u has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3162
      outer_class_info_index, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3163
    // Inner class name
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3164
    const u2 inner_name_index = cfs->get_u2_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3165
    check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3166
      inner_name_index == 0 || valid_symbol_at(inner_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3167
      "inner_name_index %u has bad constant type in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3168
      inner_name_index, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3169
    if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3170
      guarantee_property(inner_class_info_index != outer_class_info_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3171
                         "Class is both outer and inner class in class file %s", CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3172
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3173
    // Access flags
43977
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3174
    jint flags;
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3175
    // JVM_ACC_MODULE is defined in JDK-9 and later.
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3176
    if (_major_version >= JAVA_9_VERSION) {
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3177
      flags = cfs->get_u2_fast() & (RECOGNIZED_INNER_CLASS_MODIFIERS | JVM_ACC_MODULE);
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3178
    } else {
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3179
      flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS;
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  3180
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3181
    if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3182
      // Set abstract bit for old class files for backward compatibility
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3183
      flags |= JVM_ACC_ABSTRACT;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3184
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3185
    verify_legal_class_modifiers(flags, CHECK_0);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3186
    AccessFlags inner_access_flags(flags);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3187
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3188
    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
  3189
    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
  3190
    inner_classes->at_put(index++, inner_name_index);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3191
    inner_classes->at_put(index++, inner_access_flags.as_short());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3192
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3193
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3194
  // 4347400: make sure there's no duplicate entry in the classes array
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3195
  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
  3196
    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
  3197
      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
  3198
        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
  3199
                            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
  3200
                            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
  3201
                            inner_classes->at(i+3) != inner_classes->at(j+3)),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3202
                            "Duplicate entry in InnerClasses in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3203
                            CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3204
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3205
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3206
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3207
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3208
  // 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
  3209
  if (parsed_enclosingmethod_attribute) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3210
    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
  3211
    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
  3212
  }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3213
  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
  3214
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3215
  // 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
  3216
  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
  3217
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3218
  return length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3219
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3220
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3221
void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) {
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3222
  set_class_synthetic_flag(true);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3223
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3224
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3225
void ClassFileParser::parse_classfile_signature_attribute(const ClassFileStream* const cfs, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3226
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3227
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3228
  const u2 signature_index = cfs->get_u2(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3229
  check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3230
    valid_symbol_at(signature_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3231
    "Invalid constant pool index %u in Signature attribute in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3232
    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
  3233
  set_class_generic_signature_index(signature_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3234
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3235
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3236
void ClassFileParser::parse_classfile_bootstrap_methods_attribute(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3237
                                                                  ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3238
                                                                  u4 attribute_byte_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3239
                                                                  TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3240
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3241
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3242
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3243
  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
  3244
25506
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3245
  guarantee_property(attribute_byte_length >= sizeof(u2),
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3246
                     "Invalid BootstrapMethods attribute length %u in class file %s",
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3247
                     attribute_byte_length,
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3248
                     CHECK);
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3249
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3250
  cfs->guarantee_more(attribute_byte_length, CHECK);
fb0b78b7bca6 8036800: Attribute OOM to correct part of code
hseigel
parents: 25470
diff changeset
  3251
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3252
  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
  3253
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3254
  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
  3255
                     "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
  3256
                     CHECK);
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3257
23840
a1963807bff5 8034926: Attribute classes properly
hseigel
parents: 22752
diff changeset
  3258
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3259
  // 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
  3260
  // represending bootstrap specifiers:
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3261
  //    length*{bootstrap_method_index, argument_count*{argument_index}}
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3262
  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
  3263
  // 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
  3264
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3265
  // 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
  3266
  // 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
  3267
  const int index_size = (attribute_array_length * 2);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3268
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3269
  Array<u2>* const operands =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3270
    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
  3271
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3272
  // 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
  3273
  // pool if there is an error.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3274
  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
  3275
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3276
  int operand_fill_index = index_size;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3277
  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
  3278
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3279
  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
  3280
    // 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
  3281
    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
  3282
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3283
    // 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
  3284
    cfs->guarantee_more(sizeof(u2) * 2, CHECK);  // bsm, argc
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3285
    const u2 bootstrap_method_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3286
    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
  3287
    check_property(
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3288
      valid_cp_range(bootstrap_method_index, cp_size) &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3289
      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
  3290
      "bootstrap_method_index %u has bad constant type in class file %s",
7709
8e90b245b989 7008165: Garbage in ClassFormatError message
twisti
parents: 7436
diff changeset
  3291
      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
  3292
      CHECK);
27023
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3293
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3294
    guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3295
      "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
  3296
      CHECK);
818f8a0c5d9d 8041717: Issue with class file parser
hseigel
parents: 26135
diff changeset
  3297
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3298
    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
  3299
    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
  3300
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3301
    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
  3302
    for (int j = 0; j < argument_count; j++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3303
      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
  3304
      check_property(
7709
8e90b245b989 7008165: Garbage in ClassFormatError message
twisti
parents: 7436
diff changeset
  3305
        valid_cp_range(argument_index, cp_size) &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3306
        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
  3307
        "argument_index %u has bad constant type in class file %s",
7709
8e90b245b989 7008165: Garbage in ClassFormatError message
twisti
parents: 7436
diff changeset
  3308
        argument_index,
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3309
        CHECK);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3310
      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
  3311
    }
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3312
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3313
  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
  3314
                     "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
  3315
                     CHECK);
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3316
}
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3317
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3318
void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cfs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3319
                                                 ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3320
                 ClassFileParser::ClassAnnotationCollector* parsed_annotations,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3321
                                                 TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3322
  assert(cfs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3323
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3324
  assert(parsed_annotations != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3325
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3326
  // 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
  3327
  _inner_classes = Universe::the_empty_short_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3328
  cfs->guarantee_more(2, CHECK);  // attributes_count
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3329
  u2 attributes_count = cfs->get_u2_fast();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3330
  bool parsed_sourcefile_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3331
  bool parsed_innerclasses_attribute = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3332
  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
  3333
  bool parsed_bootstrap_methods_attribute = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3334
  const u1* runtime_visible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3335
  int runtime_visible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3336
  const u1* runtime_invisible_annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3337
  int runtime_invisible_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3338
  const u1* runtime_visible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3339
  int runtime_visible_type_annotations_length = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3340
  const u1* runtime_invisible_type_annotations = NULL;
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3341
  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
  3342
  bool runtime_invisible_type_annotations_exists = false;
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3343
  bool runtime_invisible_annotations_exists = false;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3344
  bool parsed_source_debug_ext_annotations_exist = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3345
  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
  3346
  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
  3347
  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
  3348
  u2  enclosing_method_method_index = 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3349
  // Iterate over attributes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3350
  while (attributes_count--) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3351
    cfs->guarantee_more(6, CHECK);  // attribute_name_index, attribute_length
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3352
    const u2 attribute_name_index = cfs->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3353
    const u4 attribute_length = cfs->get_u4_fast();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3354
    check_property(
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3355
      valid_symbol_at(attribute_name_index),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3356
      "Attribute name has bad constant pool index %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3357
      attribute_name_index, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3358
    const Symbol* const tag = cp->symbol_at(attribute_name_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3359
    if (tag == vmSymbols::tag_source_file()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3360
      // Check for SourceFile tag
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3361
      if (_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3362
        guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3363
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3364
      if (parsed_sourcefile_attribute) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3365
        classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3366
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3367
        parsed_sourcefile_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3368
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3369
      parse_classfile_sourcefile_attribute(cfs, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3370
    } else if (tag == vmSymbols::tag_source_debug_extension()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3371
      // Check for SourceDebugExtension tag
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3372
      if (parsed_source_debug_ext_annotations_exist) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3373
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3374
            "Multiple SourceDebugExtension attributes in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3375
      }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3376
      parsed_source_debug_ext_annotations_exist = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3377
      parse_classfile_source_debug_extension_attribute(cfs, (int)attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3378
    } else if (tag == vmSymbols::tag_inner_classes()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3379
      // Check for InnerClasses tag
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3380
      if (parsed_innerclasses_attribute) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3381
        classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3382
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3383
        parsed_innerclasses_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3384
      }
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  3385
      inner_classes_attribute_start = cfs->current();
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3386
      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
  3387
      cfs->skip_u1(inner_classes_attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3388
    } else if (tag == vmSymbols::tag_synthetic()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3389
      // Check for Synthetic tag
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3390
      // Shouldn't we check that the synthetic flags wasn't already set? - not required in spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3391
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3392
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3393
          "Invalid Synthetic classfile attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3394
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3395
      }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3396
      parse_classfile_synthetic_attribute(CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3397
    } else if (tag == vmSymbols::tag_deprecated()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3398
      // Check for Deprecatd tag - 4276120
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3399
      if (attribute_length != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3400
        classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3401
          "Invalid Deprecated classfile attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3402
          attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3403
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3404
    } else if (_major_version >= JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3405
      if (tag == vmSymbols::tag_signature()) {
44243
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  3406
        if (_generic_signature_index != 0) {
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  3407
          classfile_parse_error(
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  3408
            "Multiple Signature attributes in class file %s", CHECK);
bd6ac32eb679 8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents: 44239
diff changeset
  3409
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3410
        if (attribute_length != 2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3411
          classfile_parse_error(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3412
            "Wrong Signature attribute length %u in class file %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3413
            attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3414
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3415
        parse_classfile_signature_attribute(cfs, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3416
      } else if (tag == vmSymbols::tag_runtime_visible_annotations()) {
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3417
        if (runtime_visible_annotations != NULL) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3418
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3419
            "Multiple RuntimeVisibleAnnotations attributes in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3420
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3421
        runtime_visible_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  3422
        runtime_visible_annotations = cfs->current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3423
        assert(runtime_visible_annotations != NULL, "null visible annotations");
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  3424
        cfs->guarantee_more(runtime_visible_annotations_length, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3425
        parse_annotations(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3426
                          runtime_visible_annotations,
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3427
                          runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3428
                          parsed_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3429
                          _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3430
                          CHECK);
43177
2158f6c730aa 8159507: RuntimeVisibleAnnotation validation
rprotacio
parents: 42656
diff changeset
  3431
        cfs->skip_u1_fast(runtime_visible_annotations_length);
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3432
      } else if (tag == vmSymbols::tag_runtime_invisible_annotations()) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3433
        if (runtime_invisible_annotations_exists) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3434
          classfile_parse_error(
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3435
            "Multiple RuntimeInvisibleAnnotations attributes in class file %s", CHECK);
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3436
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3437
        runtime_invisible_annotations_exists = true;
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3438
        if (PreserveAllAnnotations) {
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3439
          runtime_invisible_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  3440
          runtime_invisible_annotations = cfs->current();
24432
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3441
          assert(runtime_invisible_annotations != NULL, "null invisible annotations");
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3442
        }
482afb00f089 8040292: Annotation attributes must not appear more than once
hseigel
parents: 24322
diff changeset
  3443
        cfs->skip_u1(attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3444
      } else if (tag == vmSymbols::tag_enclosing_method()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3445
        if (parsed_enclosingmethod_attribute) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3446
          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
  3447
        } else {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3448
          parsed_enclosingmethod_attribute = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3449
        }
25054
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3450
        guarantee_property(attribute_length == 4,
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3451
          "Wrong EnclosingMethod attribute length %u in class file %s",
8a12137a8422 8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents: 24828
diff changeset
  3452
          attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3453
        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
  3454
        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
  3455
        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
  3456
        if (enclosing_method_class_index == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3457
          classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3458
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3459
        // 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
  3460
        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
  3461
          "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
  3462
        if (enclosing_method_method_index != 0 &&
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3463
            (!cp->is_within_bounds(enclosing_method_method_index) ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3464
             !cp->tag_at(enclosing_method_method_index).is_name_and_type())) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3465
          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
  3466
        }
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3467
      } 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
  3468
                 _major_version >= Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
38658
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  3469
        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
  3470
          classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK);
38658
34f9c45625d8 8140594: Various minor code improvements (compiler)
goetz
parents: 38177
diff changeset
  3471
        }
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3472
        parsed_bootstrap_methods_attribute = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3473
        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
  3474
      } 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
  3475
        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
  3476
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3477
            "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
  3478
        }
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3479
        runtime_visible_type_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  3480
        runtime_visible_type_annotations = cfs->current();
15097
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3481
        assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3482
        // No need for the VM to parse Type annotations
9db149412e0e 8004823: Add VM support for type annotation reflection
stefank
parents: 14590
diff changeset
  3483
        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
  3484
      } 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
  3485
        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
  3486
          classfile_parse_error(
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3487
            "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
  3488
        } else {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3489
          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
  3490
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3491
        if (PreserveAllAnnotations) {
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3492
          runtime_invisible_type_annotations_length = attribute_length;
46504
38048d4d20e7 8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents: 46502
diff changeset
  3493
          runtime_invisible_type_annotations = cfs->current();
19954
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3494
          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
  3495
        }
1642109d1a2c 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 19681
diff changeset
  3496
        cfs->skip_u1(attribute_length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3497
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3498
        // Unknown attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3499
        cfs->skip_u1(attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3500
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3501
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3502
      // Unknown attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3503
      cfs->skip_u1(attribute_length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3504
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3505
  }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3506
  _annotations = assemble_annotations(runtime_visible_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3507
                                      runtime_visible_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3508
                                      runtime_invisible_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3509
                                      runtime_invisible_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3510
                                      CHECK);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3511
  _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
  3512
                                           runtime_visible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3513
                                           runtime_invisible_type_annotations,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3514
                                           runtime_invisible_type_annotations_length,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3515
                                           CHECK);
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3516
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3517
  if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3518
    const u2 num_of_classes = parse_classfile_inner_classes_attribute(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3519
                            cfs,
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3520
                            inner_classes_attribute_start,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3521
                            parsed_innerclasses_attribute,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3522
                            enclosing_method_class_index,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3523
                            enclosing_method_method_index,
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3524
                            CHECK);
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3525
    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
  3526
      guarantee_property(
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3527
        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
  3528
        "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
  3529
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3530
  }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11423
diff changeset
  3531
7436
dbc43da3d512 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 7397
diff changeset
  3532
  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
  3533
    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
  3534
                       "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
  3535
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3536
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3537
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3538
void ClassFileParser::apply_parsed_class_attributes(InstanceKlass* k) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3539
  assert(k != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3540
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3541
  if (_synthetic_flag)
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3542
    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
  3543
  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
  3544
    k->set_source_file_name_index(_sourcefile_index);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3545
  }
19326
14cb6cf26a96 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 18940
diff changeset
  3546
  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
  3547
    k->set_generic_signature_index(_generic_signature_index);
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3548
  }
13295
kvn
parents: 13201 13291
diff changeset
  3549
  if (_sde_buffer != NULL) {
kvn
parents: 13201 13291
diff changeset
  3550
    k->set_source_debug_extension(_sde_buffer, _sde_length);
kvn
parents: 13201 13291
diff changeset
  3551
  }
13291
9de3b1387cb8 6711908: JVM needs direct access to some annotations
jrose
parents: 12772
diff changeset
  3552
}
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3553
28027
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3554
// Create the Annotations object that will
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3555
// hold the annotations array for the Klass.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3556
void ClassFileParser::create_combined_annotations(TRAPS) {
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3557
    if (_annotations == NULL &&
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3558
        _type_annotations == NULL &&
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3559
        _fields_annotations == NULL &&
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3560
        _fields_type_annotations == NULL) {
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3561
      // Don't create the Annotations object unnecessarily.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3562
      return;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3563
    }
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3564
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3565
    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
  3566
    annotations->set_class_annotations(_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3567
    annotations->set_class_type_annotations(_type_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3568
    annotations->set_fields_annotations(_fields_annotations);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3569
    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
  3570
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3571
    // 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
  3572
    // assigned to InstanceKlass being constructed.
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3573
    _combined_annotations = annotations;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3574
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3575
    // 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
  3576
    // _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
  3577
    _annotations             = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3578
    _type_annotations        = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3579
    _fields_annotations      = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3580
    _fields_type_annotations = NULL;
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3581
}
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3582
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3583
// 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
  3584
void ClassFileParser::apply_parsed_class_metadata(
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3585
                                            InstanceKlass* this_klass,
28027
c63d0bb0101c 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 27685
diff changeset
  3586
                                            int java_fields_count, TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3587
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3588
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3589
  _cp->set_pool_holder(this_klass);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3590
  this_klass->set_constants(_cp);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3591
  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
  3592
  this_klass->set_methods(_methods);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3593
  this_klass->set_inner_classes(_inner_classes);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3594
  this_klass->set_local_interfaces(_local_interfaces);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3595
  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
  3596
  this_klass->set_annotations(_combined_annotations);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3597
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3598
  // 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
  3599
  clear_class_metadata();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3600
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3601
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3602
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
  3603
                                                       int runtime_visible_annotations_length,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3604
                                                       const u1* const runtime_invisible_annotations,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3605
                                                       int runtime_invisible_annotations_length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3606
                                                       TRAPS) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3607
  AnnotationArray* annotations = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3608
  if (runtime_visible_annotations != NULL ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3609
      runtime_invisible_annotations != NULL) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3610
    annotations = MetadataFactory::new_array<u1>(_loader_data,
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3611
                                          runtime_visible_annotations_length +
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3612
                                          runtime_invisible_annotations_length,
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3613
                                          CHECK_(annotations));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3614
    if (runtime_visible_annotations != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3615
      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
  3616
        annotations->at_put(i, runtime_visible_annotations[i]);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3617
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3618
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3619
    if (runtime_invisible_annotations != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3620
      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
  3621
        int append = runtime_visible_annotations_length+i;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3622
        annotations->at_put(append, runtime_invisible_annotations[i]);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  3623
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3624
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3625
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3626
  return annotations;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3627
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3628
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3629
const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3630
                                                        const int super_class_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3631
                                                        const bool need_verify,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3632
                                                        TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3633
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3634
  const InstanceKlass* super_klass = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3635
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3636
  if (super_class_index == 0) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3637
    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
  3638
                   "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
  3639
                   super_class_index,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3640
                   CHECK_NULL);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3641
  } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3642
    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
  3643
                   "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
  3644
                   super_class_index,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3645
                   CHECK_NULL);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3646
    // 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
  3647
    // 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
  3648
    bool is_array = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3649
    if (cp->tag_at(super_class_index).is_klass()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3650
      super_klass = InstanceKlass::cast(cp->resolved_klass_at(super_class_index));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3651
      if (need_verify)
33611
9abd65805e19 8139203: Consistent naming for klass type predicates
coleenp
parents: 33602
diff changeset
  3652
        is_array = super_klass->is_array_klass();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3653
    } else if (need_verify) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3654
      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
  3655
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3656
    if (need_verify) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3657
      guarantee_property(!is_array,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3658
                        "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
  3659
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3660
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3661
  return super_klass;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3662
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3663
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3664
static unsigned int compute_oop_map_count(const InstanceKlass* super,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3665
                                          unsigned int nonstatic_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3666
                                          int first_nonstatic_oop_offset) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3667
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3668
  unsigned int map_count =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3669
    NULL == super ? 0 : super->nonstatic_oop_map_count();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3670
  if (nonstatic_oop_map_count > 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3671
    // We have oops to add to map
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3672
    if (map_count == 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3673
      map_count = nonstatic_oop_map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3674
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3675
    else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3676
      // 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
  3677
      // be extended
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3678
      const OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3679
      const OopMapBlock* const last_map = first_map + map_count - 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3680
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3681
      const int next_offset = last_map->offset() + last_map->count() * heapOopSize;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3682
      if (next_offset == first_nonstatic_oop_offset) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3683
        // There is no gap bettwen superklass's last oop field and first
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3684
        // local oop field, merge maps.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3685
        nonstatic_oop_map_count -= 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3686
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3687
      else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3688
        // Superklass didn't end with a oop field, add extra maps
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3689
        assert(next_offset < first_nonstatic_oop_offset, "just checking");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3690
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3691
      map_count += nonstatic_oop_map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3692
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3693
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3694
  return map_count;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3695
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3696
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3697
#ifndef PRODUCT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3698
static void print_field_layout(const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3699
                               Array<u2>* fields,
46727
6e4a84748e2c 8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents: 46701
diff changeset
  3700
                               const constantPoolHandle& cp,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3701
                               int instance_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3702
                               int instance_fields_start,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3703
                               int instance_fields_end,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3704
                               int static_fields_end) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3705
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3706
  assert(name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3707
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3708
  tty->print("%s: field layout\n", name->as_klass_external_name());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3709
  tty->print("  @%3d %s\n", instance_fields_start, "--- instance fields start ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3710
  for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3711
    if (!fs.access_flags().is_static()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3712
      tty->print("  @%3d \"%s\" %s\n",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3713
        fs.offset(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3714
        fs.name()->as_klass_external_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3715
        fs.signature()->as_klass_external_name());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3716
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3717
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3718
  tty->print("  @%3d %s\n", instance_fields_end, "--- instance fields end ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3719
  tty->print("  @%3d %s\n", instance_size * wordSize, "--- instance ends ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3720
  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
  3721
  for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3722
    if (fs.access_flags().is_static()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3723
      tty->print("  @%3d \"%s\" %s\n",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3724
        fs.offset(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3725
        fs.name()->as_klass_external_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3726
        fs.signature()->as_klass_external_name());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3727
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3728
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3729
  tty->print("  @%3d %s\n", static_fields_end, "--- static fields end ---");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3730
  tty->print("\n");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3731
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3732
#endif
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3733
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3734
// Values needed for oopmap and InstanceKlass creation
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3735
class ClassFileParser::FieldLayoutInfo : public ResourceObj {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3736
 public:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3737
  int*          nonstatic_oop_offsets;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3738
  unsigned int* nonstatic_oop_counts;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3739
  unsigned int  nonstatic_oop_map_count;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3740
  unsigned int  total_oop_map_count;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3741
  int           instance_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3742
  int           nonstatic_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3743
  int           static_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3744
  bool          has_nonstatic_fields;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3745
};
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
// Layout fields and fill in FieldLayoutInfo.  Could use more refactoring!
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3748
void ClassFileParser::layout_fields(ConstantPool* cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3749
                                    const FieldAllocationCount* fac,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3750
                                    const ClassAnnotationCollector* parsed_annotations,
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3751
                                    FieldLayoutInfo* info,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3752
                                    TRAPS) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3753
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3754
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3755
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3756
  // Field size and offset computation
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3757
  int nonstatic_field_size = _super_klass == NULL ? 0 :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3758
                               _super_klass->nonstatic_field_size();
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3759
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3760
  // Count the contended fields by type.
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3761
  //
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3762
  // We ignore static fields, because @Contended is not supported for them.
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3763
  // 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
  3764
  int nonstatic_contended_count = 0;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3765
  FieldAllocationCount fac_contended;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3766
  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
  3767
    FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3768
    if (fs.is_contended()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3769
      fac_contended.count[atype]++;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3770
      if (!fs.access_flags().is_static()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3771
        nonstatic_contended_count++;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3772
      }
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
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3776
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3777
  // Calculate the starting byte offsets
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3778
  int next_static_oop_offset    = InstanceMirrorKlass::offset_of_static_fields();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3779
  int next_static_double_offset = next_static_oop_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3780
                                      ((fac->count[STATIC_OOP]) * heapOopSize);
49359
59f6547e151f 8199264: Remove universe.inline.hpp to simplify include dependencies
stefank
parents: 49348
diff changeset
  3781
  if (fac->count[STATIC_DOUBLE]) {
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  3782
    next_static_double_offset = align_up(next_static_double_offset, BytesPerLong);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3783
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3784
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3785
  int next_static_word_offset   = next_static_double_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3786
                                    ((fac->count[STATIC_DOUBLE]) * BytesPerLong);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3787
  int next_static_short_offset  = next_static_word_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3788
                                    ((fac->count[STATIC_WORD]) * BytesPerInt);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3789
  int next_static_byte_offset   = next_static_short_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3790
                                  ((fac->count[STATIC_SHORT]) * BytesPerShort);
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
  int nonstatic_fields_start  = instanceOopDesc::base_offset_in_bytes() +
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3793
                                nonstatic_field_size * heapOopSize;
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3794
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3795
  int next_nonstatic_field_offset = nonstatic_fields_start;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3796
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3797
  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
  3798
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3799
  // Class is contended, pad before all the fields
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3800
  if (is_contended_class) {
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3801
    next_nonstatic_field_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3802
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3803
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3804
  // Compute the non-contended fields count.
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3805
  // 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
  3806
  // 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
  3807
  // exempt from that.
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3808
  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
  3809
  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
  3810
  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
  3811
  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
  3812
  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
  3813
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3814
  // Total non-static fields count, including every contended field
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3815
  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
  3816
                                        fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] +
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3817
                                        fac->count[NONSTATIC_OOP];
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3818
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3819
  const bool super_has_nonstatic_fields =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3820
          (_super_klass != NULL && _super_klass->has_nonstatic_fields());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3821
  const bool has_nonstatic_fields =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3822
    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
  3823
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3824
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3825
  // Prepare list of oops for oop map generation.
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3826
  //
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3827
  // "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
  3828
  // 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
  3829
  // 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
  3830
  // 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
  3831
  // distinct regions.
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3832
  //
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3833
  // 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
  3834
  // 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
  3835
  unsigned int nonstatic_oop_map_count = 0;
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  3836
  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
  3837
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3838
  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
  3839
            THREAD, int, max_nonstatic_oop_maps);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3840
  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
  3841
            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
  3842
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3843
  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
  3844
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3845
  bool compact_fields   = CompactFields;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3846
  int allocation_style = FieldsAllocationStyle;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3847
  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
  3848
    assert(false, "0 <= FieldsAllocationStyle <= 2");
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3849
    allocation_style = 1; // Optimistic
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
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3852
  // 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
  3853
  // (see in JavaClasses::compute_hard_coded_offsets()).
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3854
  // Use default fields allocation order for them.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3855
  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
  3856
      (_class_name == vmSymbols::java_lang_AssertionStatusDirectives() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3857
       _class_name == vmSymbols::java_lang_Class() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3858
       _class_name == vmSymbols::java_lang_ClassLoader() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3859
       _class_name == vmSymbols::java_lang_ref_Reference() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3860
       _class_name == vmSymbols::java_lang_ref_SoftReference() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3861
       _class_name == vmSymbols::java_lang_StackTraceElement() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3862
       _class_name == vmSymbols::java_lang_String() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3863
       _class_name == vmSymbols::java_lang_Throwable() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3864
       _class_name == vmSymbols::java_lang_Boolean() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3865
       _class_name == vmSymbols::java_lang_Character() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3866
       _class_name == vmSymbols::java_lang_Float() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3867
       _class_name == vmSymbols::java_lang_Double() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3868
       _class_name == vmSymbols::java_lang_Byte() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3869
       _class_name == vmSymbols::java_lang_Short() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3870
       _class_name == vmSymbols::java_lang_Integer() ||
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3871
       _class_name == vmSymbols::java_lang_Long())) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3872
    allocation_style = 0;     // Allocate oops first
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3873
    compact_fields   = false; // Don't compact fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3874
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3875
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3876
  int next_nonstatic_oop_offset = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3877
  int next_nonstatic_double_offset = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3878
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3879
  // 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
  3880
  if( allocation_style == 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3881
    // 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
  3882
    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
  3883
    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
  3884
                                    (nonstatic_oop_count * heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3885
  } else if( allocation_style == 1 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3886
    // 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
  3887
    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
  3888
  } else if( allocation_style == 2 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3889
    // Fields allocation: oops fields in super and sub classes are together.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3890
    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
  3891
        _super_klass->nonstatic_oop_map_size() > 0 ) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3892
      const unsigned int map_count = _super_klass->nonstatic_oop_map_count();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3893
      const OopMapBlock* const first_map = _super_klass->start_of_nonstatic_oop_maps();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3894
      const OopMapBlock* const last_map = first_map + map_count - 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3895
      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
  3896
      if (next_offset == next_nonstatic_field_offset) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3897
        allocation_style = 0;   // allocate oops first
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3898
        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
  3899
        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
  3900
                                       (nonstatic_oop_count * heapOopSize);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3901
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3902
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3903
    if( allocation_style == 2 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3904
      allocation_style = 1;     // allocate oops last
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3905
      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
  3906
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3907
  } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3908
    ShouldNotReachHere();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3909
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3910
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3911
  int nonstatic_oop_space_count   = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3912
  int nonstatic_word_space_count  = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3913
  int nonstatic_short_space_count = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3914
  int nonstatic_byte_space_count  = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3915
  int nonstatic_oop_space_offset = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3916
  int nonstatic_word_space_offset = 0;
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33230
diff changeset
  3917
  int nonstatic_short_space_offset = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3918
  int nonstatic_byte_space_offset = 0;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3919
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  3920
  // 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
  3921
  // long/double alignment.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3922
  if (nonstatic_double_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3923
    int offset = next_nonstatic_double_offset;
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  3924
    next_nonstatic_double_offset = align_up(offset, BytesPerLong);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3925
    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
  3926
      // 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
  3927
      int length = next_nonstatic_double_offset - offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3928
      assert(length == BytesPerInt, "");
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3929
      nonstatic_word_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3930
      if (nonstatic_word_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3931
        nonstatic_word_count      -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3932
        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
  3933
        length -= BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3934
        offset += BytesPerInt;
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
      nonstatic_short_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3937
      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
  3938
        nonstatic_short_count       -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3939
        nonstatic_short_space_count += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3940
        length -= BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3941
        offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3942
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3943
      nonstatic_byte_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3944
      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
  3945
        nonstatic_byte_count       -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3946
        nonstatic_byte_space_count += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3947
        length -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3948
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3949
      // 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
  3950
      nonstatic_oop_space_offset = offset;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3951
      if (length >= heapOopSize && nonstatic_oop_count > 0 &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3952
          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
  3953
        nonstatic_oop_count      -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3954
        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
  3955
        length -= heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3956
        offset += heapOopSize;
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
    }
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
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3961
  int next_nonstatic_word_offset = next_nonstatic_double_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3962
                                     (nonstatic_double_count * BytesPerLong);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3963
  int next_nonstatic_short_offset = next_nonstatic_word_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3964
                                      (nonstatic_word_count * BytesPerInt);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3965
  int next_nonstatic_byte_offset = next_nonstatic_short_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3966
                                     (nonstatic_short_count * BytesPerShort);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3967
  int next_nonstatic_padded_offset = next_nonstatic_byte_offset +
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3968
                                       nonstatic_byte_count;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3969
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3970
  // 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
  3971
  if( allocation_style == 1 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3972
    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
  3973
    if( nonstatic_oop_count > 0 ) {
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  3974
      next_nonstatic_oop_offset = align_up(next_nonstatic_oop_offset, heapOopSize);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3975
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3976
    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
  3977
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3978
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3979
  // 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
  3980
  // 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
  3981
  // 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
  3982
  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
  3983
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3984
    // skip already laid out fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3985
    if (fs.is_offset_set()) continue;
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
    // contended instance fields are handled below
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3988
    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
  3989
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33230
diff changeset
  3990
    int real_offset = 0;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  3991
    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
  3992
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3993
    // pack the rest of the fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3994
    switch (atype) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3995
      case STATIC_OOP:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3996
        real_offset = next_static_oop_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3997
        next_static_oop_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3998
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  3999
      case STATIC_BYTE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4000
        real_offset = next_static_byte_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4001
        next_static_byte_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4002
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4003
      case STATIC_SHORT:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4004
        real_offset = next_static_short_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4005
        next_static_short_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4006
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4007
      case STATIC_WORD:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4008
        real_offset = next_static_word_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4009
        next_static_word_offset += BytesPerInt;
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
      case STATIC_DOUBLE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4012
        real_offset = next_static_double_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4013
        next_static_double_offset += BytesPerLong;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4014
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4015
      case NONSTATIC_OOP:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4016
        if( nonstatic_oop_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4017
          real_offset = nonstatic_oop_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4018
          nonstatic_oop_space_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4019
          nonstatic_oop_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4020
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4021
          real_offset = next_nonstatic_oop_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4022
          next_nonstatic_oop_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4023
        }
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4024
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4025
        // 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
  4026
        if( nonstatic_oop_map_count > 0 &&
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4027
            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
  4028
            real_offset -
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4029
            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
  4030
            heapOopSize ) {
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4031
          // 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
  4032
          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
  4033
          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
  4034
        } else {
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4035
          // 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
  4036
          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
  4037
          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
  4038
          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
  4039
          nonstatic_oop_map_count += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4040
          if( first_nonstatic_oop_offset == 0 ) { // Undefined
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4041
            first_nonstatic_oop_offset = real_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4042
          }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4043
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4044
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4045
      case NONSTATIC_BYTE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4046
        if( nonstatic_byte_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4047
          real_offset = nonstatic_byte_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4048
          nonstatic_byte_space_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4049
          nonstatic_byte_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4050
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4051
          real_offset = next_nonstatic_byte_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4052
          next_nonstatic_byte_offset += 1;
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
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4055
      case NONSTATIC_SHORT:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4056
        if( nonstatic_short_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4057
          real_offset = nonstatic_short_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4058
          nonstatic_short_space_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4059
          nonstatic_short_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4060
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4061
          real_offset = next_nonstatic_short_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4062
          next_nonstatic_short_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4063
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4064
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4065
      case NONSTATIC_WORD:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4066
        if( nonstatic_word_space_count > 0 ) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4067
          real_offset = nonstatic_word_space_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4068
          nonstatic_word_space_offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4069
          nonstatic_word_space_count  -= 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4070
        } else {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4071
          real_offset = next_nonstatic_word_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4072
          next_nonstatic_word_offset += BytesPerInt;
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
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4075
      case NONSTATIC_DOUBLE:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4076
        real_offset = next_nonstatic_double_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4077
        next_nonstatic_double_offset += BytesPerLong;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4078
        break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4079
      default:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4080
        ShouldNotReachHere();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4081
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4082
    fs.set_offset(real_offset);
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
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4085
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4086
  // Handle the contended cases.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4087
  //
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4088
  // 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
  4089
  // 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
  4090
  // the fields with full-width padding.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4091
  //
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4092
  // 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
  4093
  // for each field.
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4094
  if (nonstatic_contended_count > 0) {
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4095
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4096
    // 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
  4097
    next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4098
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4099
    // collect all contended groups
38177
b0c9cb06506b 8141501: Problems with BitMap buffer management
stefank
parents: 38151
diff changeset
  4100
    ResourceBitMap bm(cp->size());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4101
    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
  4102
      // skip already laid out fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4103
      if (fs.is_offset_set()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4104
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4105
      if (fs.is_contended()) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4106
        bm.set_bit(fs.contended_group());
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4107
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4108
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4109
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4110
    int current_group = -1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4111
    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
  4112
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4113
      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
  4114
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4115
        // skip already laid out fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4116
        if (fs.is_offset_set()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4117
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4118
        // 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
  4119
        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
  4120
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4121
        // handle statics below
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4122
        if (fs.access_flags().is_static()) continue;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4123
33589
7cbd1b2c139b 8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents: 33230
diff changeset
  4124
        int real_offset = 0;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4125
        FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4126
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4127
        switch (atype) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4128
          case NONSTATIC_BYTE:
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4129
            next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, 1);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4130
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4131
            next_nonstatic_padded_offset += 1;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4132
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4133
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4134
          case NONSTATIC_SHORT:
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4135
            next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, BytesPerShort);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4136
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4137
            next_nonstatic_padded_offset += BytesPerShort;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4138
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4139
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4140
          case NONSTATIC_WORD:
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4141
            next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, BytesPerInt);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4142
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4143
            next_nonstatic_padded_offset += BytesPerInt;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4144
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4145
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4146
          case NONSTATIC_DOUBLE:
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4147
            next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, BytesPerLong);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4148
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4149
            next_nonstatic_padded_offset += BytesPerLong;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4150
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4151
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4152
          case NONSTATIC_OOP:
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4153
            next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, heapOopSize);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4154
            real_offset = next_nonstatic_padded_offset;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4155
            next_nonstatic_padded_offset += heapOopSize;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4156
27616
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4157
            // 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
  4158
            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
  4159
                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
  4160
                real_offset -
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4161
                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
  4162
                heapOopSize ) {
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4163
              // 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
  4164
              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
  4165
              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
  4166
            } else {
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4167
              // 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
  4168
              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
  4169
              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
  4170
              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
  4171
              nonstatic_oop_map_count += 1;
6a63de6a8276 8015272: Make @Contended within the same group to use the same oop map
shade
parents: 27612
diff changeset
  4172
              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
  4173
                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
  4174
              }
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4175
            }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4176
            break;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4177
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4178
          default:
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4179
            ShouldNotReachHere();
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4180
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4181
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4182
        if (fs.contended_group() == 0) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4183
          // 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
  4184
          // 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
  4185
          // 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
  4186
          // equivalence, and so requires intra-padding.
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4187
          next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4188
        }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4189
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4190
        fs.set_offset(real_offset);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4191
      } // for
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4192
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4193
      // Start laying out the next group.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4194
      // 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
  4195
      // 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
  4196
      // subclass fields and/or adjacent object.
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4197
      // 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
  4198
      if (current_group != 0) {
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4199
        next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4200
      }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4201
    }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4202
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4203
    // handle static fields
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4204
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4205
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4206
  // 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
  4207
  // 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
  4208
  // and/or adjacent object.
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4209
  if (is_contended_class) {
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4210
    next_nonstatic_padded_offset += ContendedPaddingWidth;
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4211
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4212
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4213
  int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset;
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4214
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4215
  int nonstatic_fields_end      = align_up(notaligned_nonstatic_fields_end, heapOopSize);
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4216
  int instance_end              = align_up(notaligned_nonstatic_fields_end, wordSize);
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4217
  int static_fields_end         = align_up(next_static_byte_offset, wordSize);
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4218
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4219
  int static_field_size         = (static_fields_end -
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4220
                                   InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4221
  nonstatic_field_size          = nonstatic_field_size +
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4222
                                  (nonstatic_fields_end - nonstatic_fields_start) / heapOopSize;
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4223
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4224
  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
  4225
46619
a3919f5e8d2b 8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents: 46513
diff changeset
  4226
  assert(instance_size == align_object_size(align_up(
17601
0db4dfbb42ca 8012939: @Contended doesn't work correctly with inheritance
shade
parents: 17374
diff changeset
  4227
         (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
  4228
          wordSize) / wordSize), "consistent layout helper value");
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4229
17831
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4230
  // 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
  4231
  // 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
  4232
  // 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
  4233
  // assert without actually having the fields.
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4234
  assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) ||
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4235
         is_contended_class ||
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4236
         (nonstatic_fields_count > 0), "double-check nonstatic start/end");
d8112d90739f 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 17826
diff changeset
  4237
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4238
  // 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
  4239
  const unsigned int total_oop_map_count =
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4240
    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
  4241
                          first_nonstatic_oop_offset);
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4242
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4243
#ifndef PRODUCT
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4244
  if (PrintFieldLayout) {
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4245
    print_field_layout(_class_name,
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4246
          _fields,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4247
          cp,
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4248
          instance_size,
17612
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4249
          nonstatic_fields_start,
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4250
          nonstatic_fields_end,
1b6801b0796c 8014878: Clean up class field layout code
shade
parents: 17608
diff changeset
  4251
          static_fields_end);
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4252
  }
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4253
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4254
#endif
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4255
  // Pass back information needed for InstanceKlass creation
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4256
  info->nonstatic_oop_offsets = nonstatic_oop_offsets;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4257
  info->nonstatic_oop_counts = nonstatic_oop_counts;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4258
  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
  4259
  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
  4260
  info->instance_size = instance_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4261
  info->static_field_size = static_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4262
  info->nonstatic_field_size = nonstatic_field_size;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4263
  info->has_nonstatic_fields = has_nonstatic_fields;
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4264
}
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4265
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4266
static void fill_oop_maps(const InstanceKlass* k,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4267
                          unsigned int nonstatic_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4268
                          const int* nonstatic_oop_offsets,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4269
                          const unsigned int* nonstatic_oop_counts) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4270
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4271
  assert(k != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4272
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4273
  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
  4274
  const InstanceKlass* const super = k->superklass();
3694
942b7bc7f28c 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 3693
diff changeset
  4275
  const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0;
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4276
  if (super_count > 0) {
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4277
    // Copy maps from superklass
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4278
    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
  4279
    for (unsigned int i = 0; i < super_count; ++i) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4280
      *this_oop_map++ = *super_oop_map++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4281
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4282
  }
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4283
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4284
  if (nonstatic_oop_map_count > 0) {
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4285
    if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) {
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4286
      // The counts differ because there is no gap between superklass's last oop
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4287
      // field and the first local oop field.  Extend the last oop map copied
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4288
      // from the superklass instead of creating new one.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4289
      nonstatic_oop_map_count--;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4290
      nonstatic_oop_offsets++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4291
      this_oop_map--;
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4292
      this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4293
      this_oop_map++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4294
    }
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4295
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4296
    // Add new map blocks, fill them
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4297
    while (nonstatic_oop_map_count-- > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4298
      this_oop_map->set_offset(*nonstatic_oop_offsets++);
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4299
      this_oop_map->set_count(*nonstatic_oop_counts++);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4300
      this_oop_map++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4301
    }
3693
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4302
    assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() ==
af387bf37e8d 6861660: OopMapBlock count/size confusion
jcoomes
parents: 3579
diff changeset
  4303
           this_oop_map, "sanity");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4304
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4305
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4306
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4307
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4308
void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4309
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4310
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4311
  const Klass* const super = ik->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4312
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4313
  // Check if this klass has an empty finalize method (i.e. one with return bytecode only),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4314
  // in which case we don't have to register objects as finalizable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4315
  if (!_has_empty_finalizer) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4316
    if (_has_finalizer ||
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4317
        (super != NULL && super->has_finalizer())) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4318
      ik->set_has_finalizer();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4319
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4320
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4321
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4322
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4323
  bool f = false;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4324
  const Method* const m = ik->lookup_method(vmSymbols::finalize_method_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4325
                                           vmSymbols::void_method_signature());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4326
  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
  4327
      f = true;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4328
  }
24828
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4329
dd5406c950a1 6904403: assert(f == k-&gt;has_finalizer(),&quot;inconsistent has_finalizer&quot;) with debug VM
dsamersoff
parents: 24454
diff changeset
  4330
  // 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
  4331
  // 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
  4332
  // 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
  4333
  if (!ik->has_redefined_this_or_super()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4334
    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
  4335
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4336
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4337
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4338
  // 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
  4339
  if (SystemDictionary::Cloneable_klass_loaded()) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4340
    if (ik->is_subtype_of(SystemDictionary::Cloneable_klass())) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4341
      ik->set_is_cloneable();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4342
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4343
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4344
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4345
  // Check if this klass has a vanilla default constructor
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4346
  if (super == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4347
    // java.lang.Object has empty default constructor
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4348
    ik->set_has_vanilla_constructor();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4349
  } else {
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  4350
    if (super->has_vanilla_constructor() &&
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4351
        _has_vanilla_constructor) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4352
      ik->set_has_vanilla_constructor();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4353
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4354
#ifdef ASSERT
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4355
    bool v = false;
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  4356
    if (super->has_vanilla_constructor()) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4357
      const Method* const constructor =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4358
        ik->find_method(vmSymbols::object_initializer_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4359
                       vmSymbols::void_method_signature());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4360
      if (constructor != NULL && constructor->is_vanilla_constructor()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4361
        v = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4362
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4363
    }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4364
    assert(v == ik->has_vanilla_constructor(), "inconsistent has_vanilla_constructor");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4365
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4366
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4367
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4368
  // 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
  4369
  // See documentation of InstanceKlass::can_be_fastpath_allocated().
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4370
  assert(ik->size_helper() > 0, "layout_helper is initialized");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4371
  if ((!RegisterFinalizersAtInit && ik->has_finalizer())
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4372
      || ik->is_abstract() || ik->is_interface()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4373
      || (ik->name() == vmSymbols::java_lang_Class() && ik->class_loader() == NULL)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4374
      || ik->size_helper() >= FastAllocateSizeLimit) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4375
    // Forbid fast-path allocation.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4376
    const jint lh = Klass::instance_layout_helper(ik->size_helper(), true);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4377
    ik->set_layout_helper(lh);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4378
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4379
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4380
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4381
// Attach super classes and interface classes to class loader data
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4382
static void record_defined_class_dependencies(const InstanceKlass* defined_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4383
                                              TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4384
  assert(defined_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4385
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4386
  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
  4387
  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
  4388
      // Dependencies to null class loader data are implicit.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4389
      return;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4390
  } else {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4391
    // add super class dependency
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4392
    Klass* const super = defined_klass->super();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4393
    if (super != NULL) {
49348
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  4394
      defining_loader_data->record_dependency(super);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4395
    }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4396
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4397
    // add super interface dependencies
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4398
    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
  4399
    if (local_interfaces != NULL) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4400
      const int length = local_interfaces->length();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4401
      for (int i = 0; i < length; i++) {
49348
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  4402
        defining_loader_data->record_dependency(local_interfaces->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4403
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4404
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4405
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4406
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4407
15935
50da9e5eb858 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 15932
diff changeset
  4408
// 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
  4409
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4410
static void append_interfaces(GrowableArray<Klass*>* result,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4411
                              const Array<Klass*>* const ifs) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4412
  // iterate over new interfaces
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4413
  for (int i = 0; i < ifs->length(); i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4414
    Klass* const e = ifs->at(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4415
    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
  4416
    // add new interface
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4417
    result->append_if_missing(e);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4418
  }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4419
}
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4420
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4421
static Array<Klass*>* compute_transitive_interfaces(const InstanceKlass* super,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4422
                                                    Array<Klass*>* local_ifs,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4423
                                                    ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4424
                                                    TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4425
  assert(local_ifs != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4426
  assert(loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4427
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4428
  // Compute maximum size for transitive interfaces
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4429
  int max_transitive_size = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4430
  int super_size = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4431
  // Add superclass transitive interfaces size
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4432
  if (super != NULL) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4433
    super_size = super->transitive_interfaces()->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4434
    max_transitive_size += super_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4435
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4436
  // Add local interfaces' super interfaces
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4437
  const int local_size = local_ifs->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4438
  for (int i = 0; i < local_size; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4439
    Klass* const l = local_ifs->at(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4440
    max_transitive_size += InstanceKlass::cast(l)->transitive_interfaces()->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4441
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4442
  // Finally add local interfaces
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4443
  max_transitive_size += local_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4444
  // Construct array
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4445
  if (max_transitive_size == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4446
    // no interfaces, use canonicalized array
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4447
    return Universe::the_empty_klass_array();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4448
  } else if (max_transitive_size == super_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4449
    // 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
  4450
    return super->transitive_interfaces();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4451
  } else if (max_transitive_size == local_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4452
    // 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
  4453
    return local_ifs;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4454
  } else {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4455
    ResourceMark rm;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4456
    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
  4457
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4458
    // Copy down from superclass
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4459
    if (super != NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4460
      append_interfaces(result, super->transitive_interfaces());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4461
    }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4462
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4463
    // Copy down from local interfaces' superinterfaces
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4464
    for (int i = 0; i < local_size; i++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4465
      Klass* const l = local_ifs->at(i);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4466
      append_interfaces(result, InstanceKlass::cast(l)->transitive_interfaces());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4467
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4468
    // Finally add local interfaces
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4469
    append_interfaces(result, local_ifs);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4470
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4471
    // 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
  4472
    const int length = result->length();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4473
    assert(length <= max_transitive_size, "just checking");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4474
    Array<Klass*>* const new_result =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4475
      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
  4476
    for (int i = 0; i < length; i++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4477
      Klass* const e = result->at(i);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4478
      assert(e != NULL, "just checking");
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4479
      new_result->at_put(i, e);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4480
    }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4481
    return new_result;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4482
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4483
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4484
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4485
static void check_super_class_access(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4486
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4487
  const Klass* const super = this_klass->super();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4488
  if (super != NULL) {
42574
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4489
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4490
    // 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
  4491
    // 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
  4492
    // special reflection class loader
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4493
    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
  4494
      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
  4495
      PackageEntry* super_package = super->package();
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4496
      if (super_package != NULL &&
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4497
          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
  4498
          !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
  4499
        ResourceMark rm(THREAD);
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4500
        Exceptions::fthrow(
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4501
          THREAD_AND_LOCATION,
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4502
          vmSymbols::java_lang_IllegalAccessError(),
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4503
          "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
  4504
          this_klass->external_name(),
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4505
          this_klass->class_loader_data()->loader_name(),
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4506
          super->external_name());
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4507
        return;
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4508
      }
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4509
    }
25ff9171b28b 8166304: Skipping access check for classes generated by core reflection
hseigel
parents: 41744
diff changeset
  4510
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4511
    Reflection::VerifyClassAccessResults vca_result =
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4512
      Reflection::verify_class_access(this_klass, InstanceKlass::cast(super), false);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4513
    if (vca_result != Reflection::ACCESS_OK) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4514
      ResourceMark rm(THREAD);
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4515
      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
  4516
                                                      InstanceKlass::cast(super),
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4517
                                                      vca_result);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4518
      if (msg == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4519
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4520
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4521
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4522
          "class %s cannot access its superclass %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4523
          this_klass->external_name(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4524
          super->external_name());
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4525
      } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4526
        // Add additional message content.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4527
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4528
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4529
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4530
          "superclass access check failed: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4531
          msg);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4532
      }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4533
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4534
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4535
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4536
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4537
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4538
static void check_super_interface_access(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4539
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4540
  const Array<Klass*>* const local_interfaces = this_klass->local_interfaces();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4541
  const int lng = local_interfaces->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4542
  for (int i = lng - 1; i >= 0; i--) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4543
    Klass* const k = local_interfaces->at(i);
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 14391
diff changeset
  4544
    assert (k != NULL && k->is_interface(), "invalid interface");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4545
    Reflection::VerifyClassAccessResults vca_result =
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4546
      Reflection::verify_class_access(this_klass, InstanceKlass::cast(k), false);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4547
    if (vca_result != Reflection::ACCESS_OK) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4548
      ResourceMark rm(THREAD);
46262
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4549
      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
  4550
                                                      InstanceKlass::cast(k),
83280d968b96 8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents: 42656
diff changeset
  4551
                                                      vca_result);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4552
      if (msg == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4553
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4554
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4555
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4556
          "class %s cannot access its superinterface %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4557
          this_klass->external_name(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4558
          k->external_name());
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4559
      } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4560
        // Add additional message content.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4561
        Exceptions::fthrow(
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4562
          THREAD_AND_LOCATION,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4563
          vmSymbols::java_lang_IllegalAccessError(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4564
          "superinterface check failed: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4565
          msg);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4566
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4567
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4568
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4569
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4570
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4571
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4572
static void check_final_method_override(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4573
  assert(this_klass != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4574
  const Array<Method*>* const methods = this_klass->methods();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4575
  const int num_methods = methods->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4576
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4577
  // go thru each method and check if it overrides a final method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4578
  for (int index = 0; index < num_methods; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4579
    const Method* const m = methods->at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4580
21765
e2c19a9f1039 8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents: 21556
diff changeset
  4581
    // 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
  4582
    if ((!m->is_private() && !m->is_static()) &&
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4583
        (m->name() != vmSymbols::object_initializer_name())) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4584
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4585
      const Symbol* const name = m->name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4586
      const Symbol* const signature = m->signature();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4587
      const Klass* k = this_klass->super();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4588
      const Method* super_m = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4589
      while (k != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4590
        // 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
  4591
        if (k->has_final_method()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4592
          // 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
  4593
          super_m = InstanceKlass::cast(k)->lookup_method(name, signature);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4594
          if (super_m == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4595
            break; // didn't find any match; get out
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4596
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4597
22534
520f7a937396 8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents: 22485
diff changeset
  4598
          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
  4599
              // matching method in super is final, and not static
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4600
              (Reflection::verify_field_access(this_klass,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4601
                                               super_m->method_holder(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4602
                                               super_m->method_holder(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4603
                                               super_m->access_flags(), false))
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4604
            // this class can access super final method and therefore override
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4605
            ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4606
            ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4607
            Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4608
              THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4609
              vmSymbols::java_lang_VerifyError(),
25470
4e69740b1547 8026894: Improve VerifyError message about overriding a final method
hseigel
parents: 25326
diff changeset
  4610
              "class %s overrides final method %s.%s%s",
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4611
              this_klass->external_name(),
25470
4e69740b1547 8026894: Improve VerifyError message about overriding a final method
hseigel
parents: 25326
diff changeset
  4612
              super_m->method_holder()->external_name(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4613
              name->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4614
              signature->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4615
            );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4616
            return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4617
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4618
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4619
          // 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
  4620
          k = super_m->method_holder()->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4621
          continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4622
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4623
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13391
diff changeset
  4624
        k = k->super();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4625
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4626
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4627
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4628
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4629
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4630
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4631
// assumes that this_klass is an interface
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4632
static void check_illegal_static_method(const InstanceKlass* this_klass, TRAPS) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4633
  assert(this_klass != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4634
  assert(this_klass->is_interface(), "not an interface");
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4635
  const Array<Method*>* methods = this_klass->methods();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4636
  const int num_methods = methods->length();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4637
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4638
  for (int index = 0; index < num_methods; index++) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4639
    const Method* const m = methods->at(index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4640
    // if m is static and not the init method, throw a verify error
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4641
    if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4642
      ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4643
      Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4644
        THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4645
        vmSymbols::java_lang_VerifyError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4646
        "Illegal static method %s in interface %s",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4647
        m->name()->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4648
        this_klass->external_name()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4649
      );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4650
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4651
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4652
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4653
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4654
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4655
// utility methods for format checking
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4656
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4657
void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) const {
43977
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4658
  const bool is_module = (flags & JVM_ACC_MODULE) != 0;
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4659
  assert(_major_version >= JAVA_9_VERSION || !is_module, "JVM_ACC_MODULE should not be set");
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4660
  if (is_module) {
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4661
    ResourceMark rm(THREAD);
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4662
    Exceptions::fthrow(
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4663
      THREAD_AND_LOCATION,
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4664
      vmSymbols::java_lang_NoClassDefFoundError(),
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4665
      "%s is not a class because access_flag ACC_MODULE is set",
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4666
      _class_name->as_C_string());
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4667
    return;
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4668
  }
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4669
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4670
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4671
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4672
  const bool is_interface  = (flags & JVM_ACC_INTERFACE)  != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4673
  const bool is_abstract   = (flags & JVM_ACC_ABSTRACT)   != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4674
  const bool is_final      = (flags & JVM_ACC_FINAL)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4675
  const bool is_super      = (flags & JVM_ACC_SUPER)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4676
  const bool is_enum       = (flags & JVM_ACC_ENUM)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4677
  const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4678
  const bool major_gte_15  = _major_version >= JAVA_1_5_VERSION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4679
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4680
  if ((is_abstract && is_final) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4681
      (is_interface && !is_abstract) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4682
      (is_interface && major_gte_15 && (is_super || is_enum)) ||
43977
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  4683
      (!is_interface && major_gte_15 && is_annotation)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4684
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4685
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4686
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4687
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4688
      "Illegal class modifiers in class %s: 0x%X",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4689
      _class_name->as_C_string(), flags
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4690
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4691
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4692
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4693
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4694
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4695
static bool has_illegal_visibility(jint flags) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4696
  const bool is_public    = (flags & JVM_ACC_PUBLIC)    != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4697
  const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4698
  const bool is_private   = (flags & JVM_ACC_PRIVATE)   != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4699
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4700
  return ((is_public && is_protected) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4701
          (is_public && is_private) ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4702
          (is_protected && is_private));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4703
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4704
49716
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4705
// A legal major_version.minor_version must be one of the following:
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4706
//
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4707
//   Major_version = 45, any minor_version.
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4708
//   Major_version >= 46 and major_version <= current_major_version and minor_version = 0.
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4709
//   Major_version = current_major_version and minor_version = 65535 and --enable-preview is present.
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4710
//
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4711
static void verify_class_version(u2 major, u2 minor, Symbol* class_name, TRAPS){
48355
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48081
diff changeset
  4712
  const u2 max_version = JVM_CLASSFILE_MAJOR_VERSION;
49716
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4713
  if (major != JAVA_MIN_SUPPORTED_VERSION) { // All 45.* are ok including 45.65535
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4714
    if (minor == JAVA_PREVIEW_MINOR_VERSION) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4715
      if (major != max_version) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4716
        ResourceMark rm(THREAD);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4717
        Exceptions::fthrow(
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4718
          THREAD_AND_LOCATION,
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4719
          vmSymbols::java_lang_UnsupportedClassVersionError(),
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4720
          "%s (class file version %u.%u) was compiled with preview features that are unsupported. "
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4721
          "This version of the Java Runtime only recognizes preview features for class file version %u.%u",
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4722
          class_name->as_C_string(), major, minor, JVM_CLASSFILE_MAJOR_VERSION, JAVA_PREVIEW_MINOR_VERSION);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4723
        return;
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4724
      }
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4725
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4726
      if (!Arguments::enable_preview()) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4727
        ResourceMark rm(THREAD);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4728
        Exceptions::fthrow(
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4729
          THREAD_AND_LOCATION,
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4730
          vmSymbols::java_lang_UnsupportedClassVersionError(),
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4731
          "Preview features are not enabled for %s (class file version %u.%u). Try running with '--enable-preview'",
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4732
          class_name->as_C_string(), major, minor);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4733
        return;
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4734
      }
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4735
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4736
    } else { // minor != JAVA_PREVIEW_MINOR_VERSION
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4737
      if (major > max_version) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4738
        ResourceMark rm(THREAD);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4739
        Exceptions::fthrow(
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4740
          THREAD_AND_LOCATION,
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4741
          vmSymbols::java_lang_UnsupportedClassVersionError(),
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4742
          "%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), "
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4743
          "this version of the Java Runtime only recognizes class file versions up to %u.0",
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4744
          class_name->as_C_string(), major, minor, JVM_CLASSFILE_MAJOR_VERSION);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4745
      } else if (major < JAVA_MIN_SUPPORTED_VERSION) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4746
        ResourceMark rm(THREAD);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4747
        Exceptions::fthrow(
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4748
          THREAD_AND_LOCATION,
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4749
          vmSymbols::java_lang_UnsupportedClassVersionError(),
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4750
          "%s (class file version %u.%u) was compiled with an invalid major version",
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4751
          class_name->as_C_string(), major, minor);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4752
      } else if (minor != 0) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4753
        ResourceMark rm(THREAD);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4754
        Exceptions::fthrow(
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4755
          THREAD_AND_LOCATION,
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4756
          vmSymbols::java_lang_UnsupportedClassVersionError(),
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4757
          "%s (class file version %u.%u) was compiled with an invalid non-zero minor version",
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4758
          class_name->as_C_string(), major, minor);
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4759
      }
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4760
    }
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  4761
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4762
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4763
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4764
void ClassFileParser::verify_legal_field_modifiers(jint flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4765
                                                   bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4766
                                                   TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4767
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4768
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4769
  const bool is_public    = (flags & JVM_ACC_PUBLIC)    != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4770
  const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4771
  const bool is_private   = (flags & JVM_ACC_PRIVATE)   != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4772
  const bool is_static    = (flags & JVM_ACC_STATIC)    != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4773
  const bool is_final     = (flags & JVM_ACC_FINAL)     != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4774
  const bool is_volatile  = (flags & JVM_ACC_VOLATILE)  != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4775
  const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4776
  const bool is_enum      = (flags & JVM_ACC_ENUM)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4777
  const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4778
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4779
  bool is_illegal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4780
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4781
  if (is_interface) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4782
    if (!is_public || !is_static || !is_final || is_private ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4783
        is_protected || is_volatile || is_transient ||
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4784
        (major_gte_15 && is_enum)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4785
      is_illegal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4786
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4787
  } else { // not interface
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4788
    if (has_illegal_visibility(flags) || (is_final && is_volatile)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4789
      is_illegal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4790
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4791
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4792
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4793
  if (is_illegal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4794
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4795
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4796
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4797
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4798
      "Illegal field modifiers in class %s: 0x%X",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4799
      _class_name->as_C_string(), flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4800
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4801
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4802
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4803
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4804
void ClassFileParser::verify_legal_method_modifiers(jint flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4805
                                                    bool is_interface,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4806
                                                    const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4807
                                                    TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4808
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4809
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4810
  const bool is_public       = (flags & JVM_ACC_PUBLIC)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4811
  const bool is_private      = (flags & JVM_ACC_PRIVATE)      != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4812
  const bool is_static       = (flags & JVM_ACC_STATIC)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4813
  const bool is_final        = (flags & JVM_ACC_FINAL)        != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4814
  const bool is_native       = (flags & JVM_ACC_NATIVE)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4815
  const bool is_abstract     = (flags & JVM_ACC_ABSTRACT)     != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4816
  const bool is_bridge       = (flags & JVM_ACC_BRIDGE)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4817
  const bool is_strict       = (flags & JVM_ACC_STRICT)       != 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4818
  const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0;
15185
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4819
  const bool is_protected    = (flags & JVM_ACC_PROTECTED)    != 0;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4820
  const bool major_gte_15    = _major_version >= JAVA_1_5_VERSION;
14385
959bbcc16725 7200776: Implement default methods in interfaces
kamg
parents: 14081
diff changeset
  4821
  const bool major_gte_8     = _major_version >= JAVA_8_VERSION;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4822
  const bool is_initializer  = (name == vmSymbols::object_initializer_name());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4823
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4824
  bool is_illegal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4825
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4826
  if (is_interface) {
15185
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4827
    if (major_gte_8) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4828
      // Class file version is JAVA_8_VERSION or later Methods of
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4829
      // interfaces may set any of the flags except ACC_PROTECTED,
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4830
      // ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4831
      // 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
  4832
      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
  4833
          (is_native || is_protected || is_final || is_synchronized) ||
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4834
          // If a specific method of a class or interface has its
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4835
          // ACC_ABSTRACT flag set, it must not have any of its
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4836
          // ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC,
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4837
          // ACC_STRICT, or ACC_SYNCHRONIZED flags set.  No need to
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4838
          // check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4839
          // 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
  4840
          (is_abstract && (is_private || is_static || is_strict))) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4841
        is_illegal = true;
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4842
      }
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4843
    } else if (major_gte_15) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4844
      // 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
  4845
      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
  4846
          is_synchronized || is_native || !is_abstract || is_strict) {
15185
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4847
        is_illegal = true;
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4848
      }
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4849
    } else {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4850
      // Class file version is pre-JAVA_1_5_VERSION
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4851
      if (!is_public || is_static || is_final || is_native || !is_abstract) {
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4852
        is_illegal = true;
1ce0205b9a47 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 15102
diff changeset
  4853
      }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4854
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4855
  } else { // not interface
30136
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4856
    if (has_illegal_visibility(flags)) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4857
      is_illegal = true;
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4858
    } else {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4859
      if (is_initializer) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4860
        if (is_static || is_final || is_synchronized || is_native ||
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4861
            is_abstract || (major_gte_15 && is_bridge)) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4862
          is_illegal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4863
        }
30136
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4864
      } else { // not initializer
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4865
        if (is_abstract) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4866
          if ((is_final || is_native || is_private || is_static ||
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4867
              (major_gte_15 && (is_synchronized || is_strict)))) {
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4868
            is_illegal = true;
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4869
          }
1c5202fa105b 8076236: VM permits illegal flags for class init method
hseigel
parents: 29201
diff changeset
  4870
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4871
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4872
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4873
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4874
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4875
  if (is_illegal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4876
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4877
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4878
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  4879
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4880
      "Method %s in class %s has illegal modifiers: 0x%X",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4881
      name->as_C_string(), _class_name->as_C_string(), flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4882
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4883
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4884
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4885
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4886
void ClassFileParser::verify_legal_utf8(const unsigned char* buffer,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4887
                                        int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4888
                                        TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4889
  assert(_need_verify, "only called when _need_verify is true");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4890
  if (!UTF8::is_legal_utf8(buffer, length, _major_version <= 47)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4891
    classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4892
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4893
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  4894
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4895
// 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
  4896
// 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
  4897
// Method names also may not contain the characters '<' or '>', unless <init>
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4898
// 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
  4899
// method.  Because these names have been checked as special cases before
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4900
// calling this method in verify_legal_method_name.
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4901
//
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4902
// This method is also called from the modular system APIs in modules.cpp
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4903
// to verify the validity of module and package names.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4904
bool ClassFileParser::verify_unqualified_name(const char* name,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4905
                                              unsigned int length,
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4906
                                              int type) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4907
  for (const char* p = name; p != name + length;) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4908
    jchar ch = *p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4909
    if (ch < 128) {
42630
ae91fbc4b59f 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41744
diff changeset
  4910
      if (ch == '.' || ch == ';' || ch == '[' ) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4911
        return false;   // do not permit '.', ';', or '['
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4912
      }
39218
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4913
      if (ch == '/') {
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4914
        // 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
  4915
        // 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
  4916
        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
  4917
          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
  4918
           return false;
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4919
          }
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4920
        } else {
43ac06a5ee4f 8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents: 38701
diff changeset
  4921
          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
  4922
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4923
      }
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4924
      if (type == ClassFileParser::LegalMethod && (ch == '<' || ch == '>')) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4925
        return false;   // do not permit '<' or '>' in method names
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4926
      }
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4927
      p++;
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  4928
    } else {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4929
      char* tmp_p = UTF8::next(p, &ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4930
      p = tmp_p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4931
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4932
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4933
  return true;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4934
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4935
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4936
// 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
  4937
// be taken as a fieldname. Allow '/' if slash_ok is true.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4938
// Return a pointer to just past the fieldname.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4939
// 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
  4940
// being true, we saw consecutive slashes (meaning we were looking for a
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4941
// qualified path but found something that was badly-formed).
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4942
static const char* skip_over_field_name(const char* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4943
                                        bool slash_ok,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4944
                                        unsigned int length) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4945
  const char* p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4946
  jboolean last_is_slash = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4947
  jboolean not_first_ch = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4948
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4949
  for (p = name; p != name + length; not_first_ch = true) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4950
    const char* old_p = p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4951
    jchar ch = *p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4952
    if (ch < 128) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4953
      p++;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4954
      // quick check for ascii
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4955
      if ((ch >= 'a' && ch <= 'z') ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4956
        (ch >= 'A' && ch <= 'Z') ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4957
        (ch == '_' || ch == '$') ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4958
        (not_first_ch && ch >= '0' && ch <= '9')) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4959
        last_is_slash = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4960
        continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4961
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4962
      if (slash_ok && ch == '/') {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4963
        if (last_is_slash) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4964
          return NULL;  // Don't permit consecutive slashes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4965
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4966
        last_is_slash = true;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4967
        continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4968
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4969
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4970
    else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4971
      jint unicode_ch;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4972
      char* tmp_p = UTF8::next_character(p, &unicode_ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4973
      p = tmp_p;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4974
      last_is_slash = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4975
      // Check if ch is Java identifier start or is Java identifier part
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4976
      // 4672820: call java.lang.Character methods directly without generating separate tables.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4977
      EXCEPTION_MARK;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4978
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4979
      // return value
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4980
      JavaValue result(T_BOOLEAN);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4981
      // Set up the arguments to isJavaIdentifierStart and isJavaIdentifierPart
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4982
      JavaCallArguments args;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4983
      args.push_int(unicode_ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4984
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4985
      // public static boolean isJavaIdentifierStart(char ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4986
      JavaCalls::call_static(&result,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4987
        SystemDictionary::Character_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4988
        vmSymbols::isJavaIdentifierStart_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4989
        vmSymbols::int_bool_signature(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4990
        &args,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4991
        THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4992
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4993
      if (HAS_PENDING_EXCEPTION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4994
        CLEAR_PENDING_EXCEPTION;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4995
        return 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4996
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4997
      if (result.get_jboolean()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4998
        continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  4999
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5000
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5001
      if (not_first_ch) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5002
        // public static boolean isJavaIdentifierPart(char ch);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5003
        JavaCalls::call_static(&result,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5004
          SystemDictionary::Character_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5005
          vmSymbols::isJavaIdentifierPart_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5006
          vmSymbols::int_bool_signature(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5007
          &args,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5008
          THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5009
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5010
        if (HAS_PENDING_EXCEPTION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5011
          CLEAR_PENDING_EXCEPTION;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5012
          return 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5013
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5014
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5015
        if (result.get_jboolean()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5016
          continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5017
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5018
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5019
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5020
    return (not_first_ch) ? old_p : NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5021
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5022
  return (not_first_ch) ? p : NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5023
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5024
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5025
// 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
  5026
// be taken as a field signature. Allow "void" if void_ok.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5027
// Return a pointer to just past the signature.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5028
// Return NULL if no legal signature is found.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5029
const char* ClassFileParser::skip_over_field_signature(const char* signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5030
                                                       bool void_ok,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5031
                                                       unsigned int length,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5032
                                                       TRAPS) const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5033
  unsigned int array_dim = 0;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5034
  while (length > 0) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5035
    switch (signature[0]) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5036
    case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5037
    case JVM_SIGNATURE_BOOLEAN:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5038
    case JVM_SIGNATURE_BYTE:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5039
    case JVM_SIGNATURE_CHAR:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5040
    case JVM_SIGNATURE_SHORT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5041
    case JVM_SIGNATURE_INT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5042
    case JVM_SIGNATURE_FLOAT:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5043
    case JVM_SIGNATURE_LONG:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5044
    case JVM_SIGNATURE_DOUBLE:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5045
      return signature + 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5046
    case JVM_SIGNATURE_CLASS: {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5047
      if (_major_version < JAVA_1_5_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5048
        // Skip over the class name if one is there
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5049
        const char* const p = skip_over_field_name(signature + 1, true, --length);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5050
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5051
        // The next character better be a semicolon
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5052
        if (p && (p - signature) > 1 && p[0] == ';') {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5053
          return p + 1;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5054
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5055
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5056
      else {
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5057
        // Skip leading 'L' and ignore first appearance of ';'
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5058
        length--;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5059
        signature++;
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5060
        char* c = strchr((char*) signature, ';');
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5061
        // Format check signature
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5062
        if (c != NULL) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5063
          ResourceMark rm(THREAD);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5064
          int newlen = c - (char*) signature;
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5065
          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
  5066
          strncpy(sig, signature, newlen);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5067
          sig[newlen] = '\0';
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5068
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5069
          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
  5070
          if (!legal) {
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5071
            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
  5072
                                  "in descriptor in class file %s",
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5073
                                  CHECK_0);
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5074
            return NULL;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5075
          }
40920
8fcd156236e6 8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents: 40633
diff changeset
  5076
          return signature + newlen + 1;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5077
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5078
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5079
      return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5080
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5081
    case JVM_SIGNATURE_ARRAY:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5082
      array_dim++;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5083
      if (array_dim > 255) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5084
        // 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
  5085
        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
  5086
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5087
      // The rest of what's there better be a legal signature
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5088
      signature++;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5089
      length--;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5090
      void_ok = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5091
      break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5092
    default:
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5093
      return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5094
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5095
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5096
  return NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5097
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5098
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5099
// Checks if name is a legal class name.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5100
void ClassFileParser::verify_legal_class_name(const Symbol* name, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5101
  if (!_need_verify || _relax_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5102
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5103
  char buf[fixed_buffer_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5104
  char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5105
  unsigned int length = name->utf8_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5106
  bool legal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5107
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5108
  if (length > 0) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5109
    const char* p;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5110
    if (bytes[0] == JVM_SIGNATURE_ARRAY) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5111
      p = skip_over_field_signature(bytes, false, length, CHECK);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5112
      legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5113
    } else if (_major_version < JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5114
      if (bytes[0] != '<') {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5115
        p = skip_over_field_name(bytes, true, length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5116
        legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5117
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5118
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5119
      // 4900761: relax the constraints based on JSR202 spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5120
      // Class names may be drawn from the entire Unicode character set.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5121
      // Identifiers between '/' must be unqualified names.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5122
      // The utf8 string has been verified when parsing cpool entries.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5123
      legal = verify_unqualified_name(bytes, length, LegalClass);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5124
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5125
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5126
  if (!legal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5127
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5128
    assert(_class_name != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5129
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5130
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  5131
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5132
      "Illegal class name \"%s\" in class file %s", bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5133
      _class_name->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5134
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5135
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5136
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5137
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5138
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5139
// Checks if name is a legal field name.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5140
void ClassFileParser::verify_legal_field_name(const Symbol* name, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5141
  if (!_need_verify || _relax_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5142
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5143
  char buf[fixed_buffer_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5144
  char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5145
  unsigned int length = name->utf8_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5146
  bool legal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5147
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5148
  if (length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5149
    if (_major_version < JAVA_1_5_VERSION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5150
      if (bytes[0] != '<') {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5151
        const char* p = skip_over_field_name(bytes, false, length);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5152
        legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5153
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5154
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5155
      // 4881221: relax the constraints based on JSR202 spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5156
      legal = verify_unqualified_name(bytes, length, LegalField);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5157
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5158
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5159
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5160
  if (!legal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5161
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5162
    assert(_class_name != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5163
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5164
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  5165
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5166
      "Illegal field name \"%s\" in class %s", bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5167
      _class_name->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5168
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5169
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5170
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5171
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5172
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5173
// Checks if name is a legal method name.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5174
void ClassFileParser::verify_legal_method_name(const Symbol* name, TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5175
  if (!_need_verify || _relax_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5176
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  5177
  assert(name != NULL, "method name is null");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5178
  char buf[fixed_buffer_size];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5179
  char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5180
  unsigned int length = name->utf8_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5181
  bool legal = false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5182
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5183
  if (length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5184
    if (bytes[0] == '<') {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5185
      if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5186
        legal = true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5187
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5188
    } else if (_major_version < JAVA_1_5_VERSION) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5189
      const char* p;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5190
      p = skip_over_field_name(bytes, false, length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5191
      legal = (p != NULL) && ((p - bytes) == (int)length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5192
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5193
      // 4881221: relax the constraints based on JSR202 spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5194
      legal = verify_unqualified_name(bytes, length, LegalMethod);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5195
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5196
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5197
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5198
  if (!legal) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5199
    ResourceMark rm(THREAD);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5200
    assert(_class_name != NULL, "invariant");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5201
    Exceptions::fthrow(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5202
      THREAD_AND_LOCATION,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7709
diff changeset
  5203
      vmSymbols::java_lang_ClassFormatError(),
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5204
      "Illegal method name \"%s\" in class %s", bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5205
      _class_name->as_C_string()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5206
    );
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5207
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5208
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5209
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5210
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5211
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5212
// Checks if signature is a legal field signature.
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5213
void ClassFileParser::verify_legal_field_signature(const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5214
                                                   const Symbol* signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5215
                                                   TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5216
  if (!_need_verify) { return; }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5217
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5218
  char buf[fixed_buffer_size];
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5219
  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
  5220
  const unsigned int length = signature->utf8_length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5221
  const char* const p = skip_over_field_signature(bytes, false, length, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5222
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5223
  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
  5224
    throwIllegalSignature("Field", name, signature, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5225
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5226
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5227
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5228
// Checks if signature is a legal method signature.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5229
// Returns number of parameters
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5230
int ClassFileParser::verify_legal_method_signature(const Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5231
                                                   const Symbol* signature,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5232
                                                   TRAPS) const {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5233
  if (!_need_verify) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5234
    // make sure caller's args_size will be less than 0 even for non-static
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5235
    // method so it will be recomputed in compute_size_of_parameters().
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5236
    return -2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5237
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5238
33799
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5239
  // 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
  5240
  if (name == vmSymbols::class_initializer_name() &&
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5241
      signature != vmSymbols::void_method_signature() &&
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5242
      _major_version >= JAVA_7_VERSION) {
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5243
    throwIllegalSignature("Method", name, signature, CHECK_0);
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5244
    return 0;
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5245
  }
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5246
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5247
  unsigned int args_size = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5248
  char buf[fixed_buffer_size];
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5249
  const char* p = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5250
  unsigned int length = signature->utf8_length();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5251
  const char* nextp;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5252
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5253
  // The first character must be a '('
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5254
  if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5255
    length--;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5256
    // Skip over legal field signatures
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5257
    nextp = skip_over_field_signature(p, false, length, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5258
    while ((length > 0) && (nextp != NULL)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5259
      args_size++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5260
      if (p[0] == 'J' || p[0] == 'D') {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5261
        args_size++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5262
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5263
      length -= nextp - p;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5264
      p = nextp;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5265
      nextp = skip_over_field_signature(p, false, length, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5266
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5267
    // The first non-signature thing better be a ')'
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5268
    if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5269
      length--;
33799
77ebbd9b0ecc 8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents: 33612
diff changeset
  5270
      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
  5271
        // All internal methods must return void
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5272
        if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5273
          return args_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5274
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5275
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5276
        // Now we better just have a return value
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5277
        nextp = skip_over_field_signature(p, true, length, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5278
        if (nextp && ((int)length == (nextp - p))) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5279
          return args_size;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5280
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5281
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5282
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5283
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5284
  // Report error
5709
3b5307e27c1d 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 5426
diff changeset
  5285
  throwIllegalSignature("Method", name, signature, CHECK_0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5286
  return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5287
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5288
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5289
int ClassFileParser::static_field_size() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5290
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5291
  return _field_info->static_field_size;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5292
}
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
int ClassFileParser::total_oop_map_count() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5295
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5296
  return _field_info->total_oop_map_count;
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
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5299
jint ClassFileParser::layout_size() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5300
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5301
  return _field_info->instance_size;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5302
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5303
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5304
static void check_methods_for_intrinsics(const InstanceKlass* ik,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5305
                                         const Array<Method*>* methods) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5306
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5307
  assert(methods != NULL, "invariant");
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
  // 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
  5310
  // (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
  5311
  // 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
  5312
  // when everything is fresh in memory.)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5313
  const vmSymbols::SID klass_id = Method::klass_id_for_intrinsics(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
  if (klass_id != vmSymbols::NO_SID) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5316
    for (int j = 0; j < methods->length(); ++j) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5317
      Method* method = methods->at(j);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5318
      method->init_intrinsic_id();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5319
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5320
      if (CheckIntrinsics) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5321
        // Check if an intrinsic is defined for method 'method',
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5322
        // but the method is not annotated with @HotSpotIntrinsicCandidate.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5323
        if (method->intrinsic_id() != vmIntrinsics::_none &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5324
            !method->intrinsic_candidate()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5325
              tty->print("Compiler intrinsic is defined for method [%s], "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5326
              "but the method is not annotated with @HotSpotIntrinsicCandidate.%s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5327
              method->name_and_sig_as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5328
              NOT_DEBUG(" Method will not be inlined.") DEBUG_ONLY(" Exiting.")
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
          tty->cr();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5331
          DEBUG_ONLY(vm_exit(1));
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
        // Check is the method 'method' is annotated with @HotSpotIntrinsicCandidate,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5334
        // but there is no intrinsic available for it.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5335
        if (method->intrinsic_candidate() &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5336
          method->intrinsic_id() == vmIntrinsics::_none) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5337
            tty->print("Method [%s] is annotated with @HotSpotIntrinsicCandidate, "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5338
              "but no compiler intrinsic is defined for the method.%s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5339
              method->name_and_sig_as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5340
              NOT_DEBUG("") DEBUG_ONLY(" Exiting.")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5341
            );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5342
          tty->cr();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5343
          DEBUG_ONLY(vm_exit(1));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5344
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5345
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5346
    } // end for
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5347
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5348
#ifdef ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5349
    if (CheckIntrinsics) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5350
      // Check for orphan methods in the current class. A method m
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5351
      // 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
  5352
      // but class C does not declare m.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5353
      // The check is potentially expensive, therefore it is available
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5354
      // only in debug builds.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5355
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5356
      for (int id = vmIntrinsics::FIRST_ID; id < (int)vmIntrinsics::ID_LIMIT; ++id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5357
        if (vmIntrinsics::_compiledLambdaForm == id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5358
          // The _compiledLamdbdaForm intrinsic is a special marker for bytecode
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5359
          // generated for the JVM from a LambdaForm and therefore no method
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5360
          // is defined for it.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5361
          continue;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5362
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5363
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5364
        if (vmIntrinsics::class_for(vmIntrinsics::ID_from(id)) == klass_id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5365
          // Check if the current class contains a method with the same
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5366
          // name, flags, signature.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5367
          bool match = false;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5368
          for (int j = 0; j < methods->length(); ++j) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5369
            const Method* method = methods->at(j);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5370
            if (method->intrinsic_id() == id) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5371
              match = true;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5372
              break;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5373
            }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5374
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5375
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5376
          if (!match) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5377
            char buf[1000];
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5378
            tty->print("Compiler intrinsic is defined for method [%s], "
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5379
                       "but the method is not available in class [%s].%s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5380
                        vmIntrinsics::short_name_as_C_string(vmIntrinsics::ID_from(id),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5381
                                                             buf, sizeof(buf)),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5382
                        ik->name()->as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5383
                        NOT_DEBUG("") DEBUG_ONLY(" Exiting.")
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5384
            );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5385
            tty->cr();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5386
            DEBUG_ONLY(vm_exit(1));
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5387
          }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5388
        }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5389
      } // end for
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5390
    } // CheckIntrinsics
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5391
#endif // ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5392
  }
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
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5395
InstanceKlass* ClassFileParser::create_instance_klass(bool changed_by_loadhook, TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5396
  if (_klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5397
    return _klass;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5398
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5399
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5400
  InstanceKlass* const ik =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5401
    InstanceKlass::allocate_instance_klass(*this, CHECK_NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5402
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5403
  fill_instance_klass(ik, changed_by_loadhook, CHECK_NULL);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5404
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5405
  assert(_klass == ik, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5406
42650
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5407
  ik->set_has_passed_fingerprint_check(false);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5408
  if (UseAOT && ik->supers_have_passed_fingerprint_checks()) {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5409
    uint64_t aot_fp = AOTLoader::get_saved_fingerprint(ik);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5410
    if (aot_fp != 0 && aot_fp == _stream->compute_fingerprint()) {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5411
      // This class matches with a class saved in an AOT library
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5412
      ik->set_has_passed_fingerprint_check(true);
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5413
    } else {
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5414
      ResourceMark rm;
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5415
      log_info(class, fingerprint)("%s :  expected = " PTR64_FORMAT " actual = " PTR64_FORMAT,
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5416
                                 ik->external_name(), aot_fp, _stream->compute_fingerprint());
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5417
    }
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5418
  }
1f304d0c888b 8171008: Integrate AOT compiler into JDK
kvn
parents: 42639
diff changeset
  5419
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5420
  return ik;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5421
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5422
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5423
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
  5424
  assert(ik != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5425
49348
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5426
  // Set name and CLD before adding to CLD
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5427
  ik->set_class_loader_data(_loader_data);
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5428
  ik->set_name(_class_name);
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5429
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5430
  // Add all classes to our internal class loader list here,
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5431
  // including classes in the bootstrap (NULL) class loader.
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5432
  const bool publicize = !is_internal();
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5433
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5434
  _loader_data->add_class(ik, publicize);
fde3feaaa4ed 8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents: 49340
diff changeset
  5435
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5436
  set_klass_to_deallocate(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5437
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5438
  assert(_field_info != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5439
  assert(ik->static_field_size() == _field_info->static_field_size, "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5440
  assert(ik->nonstatic_oop_map_count() == _field_info->total_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5441
    "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5442
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5443
  assert(ik->is_instance_klass(), "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5444
  assert(ik->size_helper() == _field_info->instance_size, "sanity");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5445
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5446
  // Fill in information already parsed
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5447
  ik->set_should_verify_class(_need_verify);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5448
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5449
  // 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
  5450
  ik->set_nonstatic_field_size(_field_info->nonstatic_field_size);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5451
  ik->set_has_nonstatic_fields(_field_info->has_nonstatic_fields);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5452
  assert(_fac != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5453
  ik->set_static_oop_field_count(_fac->count[STATIC_OOP]);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5454
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5455
  // this transfers ownership of a lot of arrays from
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5456
  // the parser onto the InstanceKlass*
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5457
  apply_parsed_class_metadata(ik, _java_fields_count, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5458
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5459
  // 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
  5460
  assert(NULL == _cp, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5461
  assert(NULL == _fields, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5462
  assert(NULL == _methods, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5463
  assert(NULL == _inner_classes, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5464
  assert(NULL == _local_interfaces, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5465
  assert(NULL == _transitive_interfaces, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5466
  assert(NULL == _combined_annotations, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5467
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5468
  if (_has_final_method) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5469
    ik->set_has_final_method();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5470
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5471
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5472
  ik->copy_method_ordering(_method_ordering, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5473
  // The InstanceKlass::_methods_jmethod_ids cache
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5474
  // is managed on the assumption that the initial cache
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5475
  // size is equal to the number of methods in the class. If
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5476
  // that changes, then InstanceKlass::idnum_can_increment()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5477
  // has to be changed accordingly.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5478
  ik->set_initial_method_idnum(ik->methods()->length());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5479
49677
a1a7456dd8b9 8200261: Regression with JVM anonymous class
hseigel
parents: 49594
diff changeset
  5480
  ik->set_this_class_index(_this_class_index);
a1a7456dd8b9 8200261: Regression with JVM anonymous class
hseigel
parents: 49594
diff changeset
  5481
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5482
  if (is_anonymous()) {
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5483
    // _this_class_index is a CONSTANT_Class entry that refers to this
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5484
    // anonymous class itself. If this class needs to refer to its own methods or
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5485
    // fields, it would use a CONSTANT_MethodRef, etc, which would reference
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5486
    // _this_class_index. However, because this class is anonymous (it's
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5487
    // not stored in SystemDictionary), _this_class_index cannot be resolved
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5488
    // with ConstantPool::klass_at_impl, which does a SystemDictionary lookup.
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5489
    // Therefore, we must eagerly resolve _this_class_index now.
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5490
    ik->constants()->klass_at_put(_this_class_index, ik);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5491
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5492
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5493
  ik->set_minor_version(_minor_version);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5494
  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
  5495
  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
  5496
  ik->set_declares_nonstatic_concrete_methods(_declares_nonstatic_concrete_methods);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5497
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5498
  if (_host_klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5499
    assert (ik->is_anonymous(), "should be the same");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5500
    ik->set_host_klass(_host_klass);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5501
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5502
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5503
  // Set PackageEntry for this_klass
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5504
  oop cl = ik->class_loader();
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5505
  Handle clh = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(cl));
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5506
  ClassLoaderData* cld = ClassLoaderData::class_loader_data_or_null(clh());
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5507
  ik->set_package(cld, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5508
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5509
  const Array<Method*>* const methods = ik->methods();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5510
  assert(methods != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5511
  const int methods_len = methods->length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5512
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5513
  check_methods_for_intrinsics(ik, methods);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5514
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5515
  // Fill in field values obtained by parse_classfile_attributes
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5516
  if (_parsed_annotations->has_any_annotations()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5517
    _parsed_annotations->apply_to(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5518
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5519
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5520
  apply_parsed_class_attributes(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5521
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5522
  // Miranda methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5523
  if ((_num_miranda_methods > 0) ||
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5524
      // if this class introduced new miranda methods or
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5525
      (_super_klass != NULL && _super_klass->has_miranda_methods())
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5526
        // super class exists and this class inherited miranda methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5527
     ) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5528
       ik->set_has_miranda_methods(); // then set a flag
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5529
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5530
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5531
  // Fill in information needed to compute superclasses.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5532
  ik->initialize_supers(const_cast<InstanceKlass*>(_super_klass), CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5533
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5534
  // Initialize itable offset tables
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5535
  klassItable::setup_itable_offset_table(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5536
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5537
  // Compute transitive closure of interfaces this class implements
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5538
  // Do final class setup
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5539
  fill_oop_maps(ik,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5540
                _field_info->nonstatic_oop_map_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5541
                _field_info->nonstatic_oop_offsets,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5542
                _field_info->nonstatic_oop_counts);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5543
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5544
  // Fill in has_finalizer, has_vanilla_constructor, and layout_helper
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5545
  set_precomputed_flags(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5546
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5547
  // check if this class can access its super class
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5548
  check_super_class_access(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5549
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5550
  // check if this class can access its superinterfaces
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5551
  check_super_interface_access(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5552
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5553
  // check if this class overrides any final method
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5554
  check_final_method_override(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5555
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5556
  // 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
  5557
  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
  5558
    check_illegal_static_method(ik, CHECK);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5559
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5560
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5561
  // Obtain this_klass' module entry
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5562
  ModuleEntry* module_entry = ik->module();
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5563
  assert(module_entry != NULL, "module_entry should always be set");
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5564
44520
0553e129e0ec 8177530: Module system implementation refresh (4/2017)
alanb
parents: 44243
diff changeset
  5565
  // Obtain java.lang.Module
46773
fb17cc9a6847 8185717: Make ModuleEntry->module() return an oop not a jobject
hseigel
parents: 46727
diff changeset
  5566
  Handle module_handle(THREAD, module_entry->module());
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5567
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5568
  // Allocate mirror and initialize static fields
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5569
  // The create_mirror() call will also call compute_modifiers()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5570
  java_lang_Class::create_mirror(ik,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  5571
                                 Handle(THREAD, _loader_data->class_loader()),
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5572
                                 module_handle,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5573
                                 _protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5574
                                 CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5575
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5576
  assert(_all_mirandas != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5577
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5578
  // 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
  5579
  // 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
  5580
  if (_has_nonstatic_concrete_methods) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5581
    DefaultMethods::generate_default_methods(ik,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5582
                                             _all_mirandas,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5583
                                             CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5584
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5585
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5586
  // Add read edges to the unnamed modules of the bootstrap and app class loaders.
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5587
  if (changed_by_loadhook && !module_handle.is_null() && module_entry->is_named() &&
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5588
      !module_entry->has_default_read_edges()) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5589
    if (!module_entry->set_has_default_read_edges()) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5590
      // We won a potential race
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5591
      JvmtiExport::add_default_read_edges(module_handle, THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5592
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5593
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5594
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5595
  // Update the loader_data graph.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5596
  record_defined_class_dependencies(ik, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5597
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5598
  ClassLoadingService::notify_class_loaded(ik, false /* not shared class */);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5599
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5600
  if (!is_internal()) {
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5601
    if (log_is_enabled(Info, class, load)) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents: 36384
diff changeset
  5602
      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
  5603
      const char* module_name = (module_entry->name() == NULL) ? UNNAMED_MODULE : module_entry->name()->as_C_string();
46444
677be3444372 8154791: Xlog classload too redundant msgs info/debug
rprotacio
parents: 46427
diff changeset
  5604
      ik->print_class_load_logging(_loader_data, module_name, _stream);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5605
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5606
49716
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5607
    if (ik->minor_version() == JAVA_PREVIEW_MINOR_VERSION &&
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5608
        ik->major_version() != JAVA_MIN_SUPPORTED_VERSION &&
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5609
        log_is_enabled(Info, class, preview)) {
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5610
      ResourceMark rm;
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5611
      log_info(class, preview)("Loading preview feature type %s", ik->external_name());
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5612
    }
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5613
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5614
    if (log_is_enabled(Debug, class, resolve))  {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5615
      ResourceMark rm;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5616
      // print out the superclass.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5617
      const char * from = ik->external_name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5618
      if (ik->java_super() != NULL) {
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5619
        log_debug(class, resolve)("%s %s (super)",
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5620
                   from,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5621
                   ik->java_super()->external_name());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5622
      }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5623
      // print out each of the interface classes referred to by this class.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5624
      const Array<Klass*>* const local_interfaces = ik->local_interfaces();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5625
      if (local_interfaces != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5626
        const int length = local_interfaces->length();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5627
        for (int i = 0; i < length; i++) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5628
          const Klass* const k = local_interfaces->at(i);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5629
          const char * to = k->external_name();
38151
fffedc5e5cf8 8154110: Update class* and safepoint* logging subsystems
mockner
parents: 38147
diff changeset
  5630
          log_debug(class, resolve)("%s %s (interface)", from, to);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5631
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5632
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5633
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5634
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5635
42639
762117d57d05 8170672: Event-based tracing to support classloader instances
mgronlun
parents: 42574
diff changeset
  5636
  TRACE_INIT_ID(ik);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5637
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5638
  // If we reach here, all is well.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5639
  // Now remove the InstanceKlass* from the _klass_to_deallocate field
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5640
  // in order for it to not be destroyed in the ClassFileParser destructor.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5641
  set_klass_to_deallocate(NULL);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5642
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5643
  // it's official
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5644
  set_klass(ik);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5645
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5646
  debug_only(ik->verify();)
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
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5649
// 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
  5650
// 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
  5651
// its _class_name field.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5652
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
  5653
  ResourceMark rm(THREAD);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5654
  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
  5655
         "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
  5656
  const char* host_pkg_name =
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5657
    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
  5658
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5659
  if (host_pkg_name != NULL) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5660
    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
  5661
    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
  5662
    char* new_anon_name =
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5663
      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
  5664
    // Copy host package name and trailing /.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5665
    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
  5666
    new_anon_name[host_pkg_len] = '/';
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5667
    // 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
  5668
    // 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
  5669
    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
  5670
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5671
    // 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
  5672
    _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
  5673
                                          (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
  5674
                                          CHECK);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5675
  }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5676
}
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5677
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5678
// 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
  5679
// 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
  5680
// 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
  5681
// exception.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5682
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
  5683
  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
  5684
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5685
  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
  5686
                                               _class_name->utf8_length(), '/');
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5687
  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
  5688
    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
  5689
  } else {
46697
2fdbdc5e0765 8077203: Avoid unnecessary stripping of package names from FQN's in is_same_class_package() methods
hseigel
parents: 46625
diff changeset
  5690
    if (!_host_klass->is_same_class_package(_host_klass->class_loader(), _class_name)) {
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5691
      ResourceMark rm(THREAD);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5692
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5693
        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
  5694
        _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
  5695
    }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5696
  }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5697
}
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5698
40856
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5699
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
  5700
  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
  5701
                  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
  5702
  bool need_verify =
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5703
    // verifyAll
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5704
    (BytecodeVerificationLocal && BytecodeVerificationRemote) ||
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5705
    // verifyRemote
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5706
    (!BytecodeVerificationLocal && BytecodeVerificationRemote && !trusted);
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5707
  return !need_verify;
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5708
}
3378947a95e6 8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents: 40633
diff changeset
  5709
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5710
ClassFileParser::ClassFileParser(ClassFileStream* stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5711
                                 Symbol* name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5712
                                 ClassLoaderData* loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5713
                                 Handle protection_domain,
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  5714
                                 const InstanceKlass* host_klass,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5715
                                 GrowableArray<Handle>* cp_patches,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5716
                                 Publicity pub_level,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5717
                                 TRAPS) :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5718
  _stream(stream),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5719
  _requested_name(name),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5720
  _loader_data(loader_data),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5721
  _host_klass(host_klass),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5722
  _cp_patches(cp_patches),
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5723
  _num_patched_klasses(0),
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5724
  _max_num_patched_klasses(0),
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5725
  _orig_cp_size(0),
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5726
  _first_patched_klass_resolved_index(0),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5727
  _super_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5728
  _cp(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5729
  _fields(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5730
  _methods(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5731
  _inner_classes(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5732
  _local_interfaces(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5733
  _transitive_interfaces(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5734
  _combined_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5735
  _annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5736
  _type_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5737
  _fields_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5738
  _fields_type_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5739
  _klass(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5740
  _klass_to_deallocate(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5741
  _parsed_annotations(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5742
  _fac(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5743
  _field_info(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5744
  _method_ordering(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5745
  _all_mirandas(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5746
  _vtable_size(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5747
  _itable_size(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5748
  _num_miranda_methods(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5749
  _rt(REF_NONE),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5750
  _protection_domain(protection_domain),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5751
  _access_flags(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5752
  _pub_level(pub_level),
44239
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5753
  _bad_constant_seen(0),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5754
  _synthetic_flag(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5755
  _sde_length(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5756
  _sde_buffer(NULL),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5757
  _sourcefile_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5758
  _generic_signature_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5759
  _major_version(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5760
  _minor_version(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5761
  _this_class_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5762
  _super_class_index(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5763
  _itfs_len(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5764
  _java_fields_count(0),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5765
  _need_verify(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5766
  _relax_verify(false),
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5767
  _has_nonstatic_concrete_methods(false),
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  5768
  _declares_nonstatic_concrete_methods(false),
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5769
  _has_final_method(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5770
  _has_finalizer(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5771
  _has_empty_finalizer(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5772
  _has_vanilla_constructor(false),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5773
  _max_bootstrap_specifier_index(-1) {
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
  _class_name = name != NULL ? name : vmSymbols::unknown_class_name();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5776
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5777
  assert(THREAD->is_Java_thread(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5778
  assert(_loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5779
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5780
  assert(_stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5781
  assert(_stream->buffer() == _stream->current(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5782
  assert(_class_name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5783
  assert(0 == _access_flags.as_int(), "invariant");
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
  // Figure out whether we can skip format checking (matching classic VM behavior)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5786
  if (DumpSharedSpaces) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5787
    // 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
  5788
    // Verification decision is based on BytecodeVerificationRemote flag
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5789
    // for those classes.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5790
    _need_verify = (stream->need_verify()) ? BytecodeVerificationRemote :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5791
                                              BytecodeVerificationLocal;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5792
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5793
  else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5794
    _need_verify = Verifier::should_verify_for(_loader_data->class_loader(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5795
                                               stream->need_verify());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5796
  }
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5797
  if (_cp_patches != NULL) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5798
    int len = _cp_patches->length();
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5799
    for (int i=0; i<len; i++) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5800
      if (has_cp_patch_at(i)) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5801
        Handle patch = cp_patch_at(i);
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5802
        if (java_lang_String::is_instance(patch()) || java_lang_Class::is_instance(patch())) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5803
          // We need to append the names of the patched classes to the end of the constant pool,
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5804
          // because a patched class may have a Utf8 name that's not already included in the
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5805
          // original constant pool. These class names are used when patch_constant_pool()
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5806
          // calls patch_class().
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5807
          //
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5808
          // Note that a String in cp_patch_at(i) may be used to patch a Utf8, a String, or a Class.
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5809
          // At this point, we don't know the tag for index i yet, because we haven't parsed the
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5810
          // constant pool. So we can only assume the worst -- every String is used to patch a Class.
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5811
          _max_num_patched_klasses++;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5812
        }
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5813
      }
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5814
    }
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5815
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5816
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5817
  // synch back verification state to stream
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5818
  stream->set_verify(_need_verify);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5819
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5820
  // Check if verification needs to be relaxed for this class file
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5821
  // 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
  5822
  _relax_verify = relax_format_check_for(_loader_data);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5823
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5824
  parse_stream(stream, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5825
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5826
  post_process_parsed_stream(stream, _cp, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5827
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5828
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5829
void ClassFileParser::clear_class_metadata() {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5830
  // metadata created before the instance klass is created.  Must be
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5831
  // deallocated if classfile parsing returns an error.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5832
  _cp = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5833
  _fields = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5834
  _methods = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5835
  _inner_classes = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5836
  _local_interfaces = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5837
  _transitive_interfaces = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5838
  _combined_annotations = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5839
  _annotations = _type_annotations = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5840
  _fields_annotations = _fields_type_annotations = NULL;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5841
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5842
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5843
// Destructor to clean up
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5844
ClassFileParser::~ClassFileParser() {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5845
  if (_cp != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5846
    MetadataFactory::free_metadata(_loader_data, _cp);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5847
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5848
  if (_fields != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5849
    MetadataFactory::free_array<u2>(_loader_data, _fields);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5850
  }
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
  if (_methods != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5853
    // Free methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5854
    InstanceKlass::deallocate_methods(_loader_data, _methods);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5855
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5856
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5857
  // beware of the Universe::empty_blah_array!!
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5858
  if (_inner_classes != NULL && _inner_classes != Universe::the_empty_short_array()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5859
    MetadataFactory::free_array<u2>(_loader_data, _inner_classes);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5860
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5861
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5862
  // Free interfaces
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5863
  InstanceKlass::deallocate_interfaces(_loader_data, _super_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5864
                                       _local_interfaces, _transitive_interfaces);
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
  if (_combined_annotations != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5867
    // After all annotations arrays have been created, they are installed into the
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5868
    // Annotations object that will be assigned to the InstanceKlass being created.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5869
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5870
    // Deallocate the Annotations object and the installed annotations arrays.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5871
    _combined_annotations->deallocate_contents(_loader_data);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5872
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5873
    // If the _combined_annotations pointer is non-NULL,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5874
    // then the other annotations fields should have been cleared.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5875
    assert(_annotations             == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5876
    assert(_type_annotations        == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5877
    assert(_fields_annotations      == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5878
    assert(_fields_type_annotations == NULL, "Should have been cleared");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5879
  } else {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5880
    // If the annotations arrays were not installed into the Annotations object,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5881
    // then they have to be deallocated explicitly.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5882
    MetadataFactory::free_array<u1>(_loader_data, _annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5883
    MetadataFactory::free_array<u1>(_loader_data, _type_annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5884
    Annotations::free_contents(_loader_data, _fields_annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5885
    Annotations::free_contents(_loader_data, _fields_type_annotations);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5886
  }
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
  clear_class_metadata();
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
  // deallocate the klass if already created.  Don't directly deallocate, but add
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5891
  // 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
  5892
  // at a safepoint.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5893
  if (_klass_to_deallocate != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5894
    _loader_data->add_to_deallocate_list(_klass_to_deallocate);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5895
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5896
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  5897
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5898
void ClassFileParser::parse_stream(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5899
                                   TRAPS) {
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
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5902
  assert(_class_name != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5903
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5904
  // BEGIN STREAM PARSING
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5905
  stream->guarantee_more(8, CHECK);  // magic, major, minor
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5906
  // Magic value
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5907
  const u4 magic = stream->get_u4_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5908
  guarantee_property(magic == JAVA_CLASSFILE_MAGIC,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5909
                     "Incompatible magic value %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5910
                     magic, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5911
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5912
  // Version numbers
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5913
  _minor_version = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5914
  _major_version = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5915
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5916
  if (DumpSharedSpaces && _major_version < JAVA_1_5_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5917
    ResourceMark rm;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5918
    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
  5919
            _major_version,  _minor_version, _class_name->as_C_string());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5920
    Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5921
      THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5922
      vmSymbols::java_lang_UnsupportedClassVersionError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5923
      "Unsupported major.minor version for dump time %u.%u",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5924
      _major_version,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5925
      _minor_version);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5926
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5927
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5928
  // Check version numbers - we check this even with verifier off
49716
450d709262c1 8198908: Add JVM support for preview features
hseigel
parents: 49677
diff changeset
  5929
  verify_class_version(_major_version, _minor_version, _class_name, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5930
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5931
  stream->guarantee_more(3, CHECK); // length, first cp tag
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5932
  u2 cp_size = stream->get_u2_fast();
34666
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
  guarantee_property(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5935
    cp_size >= 1, "Illegal constant pool size %u in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5936
    cp_size, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5937
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5938
  _orig_cp_size = cp_size;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5939
  if (int(cp_size) + _max_num_patched_klasses > 0xffff) {
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5940
    THROW_MSG(vmSymbols::java_lang_InternalError(), "not enough space for patched classes");
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5941
  }
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5942
  cp_size += _max_num_patched_klasses;
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5943
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5944
  _cp = ConstantPool::allocate(_loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5945
                               cp_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5946
                               CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5947
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5948
  ConstantPool* const cp = _cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5949
46427
54713555867e 8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents: 46388
diff changeset
  5950
  parse_constant_pool(stream, cp, _orig_cp_size, CHECK);
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5951
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5952
  assert(cp_size == (const u2)cp->length(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5953
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5954
  // ACCESS FLAGS
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5955
  stream->guarantee_more(8, CHECK);  // flags, this_class, super_class, infs_len
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
  // Access flags
43977
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5958
  jint flags;
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5959
  // JVM_ACC_MODULE is defined in JDK-9 and later.
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5960
  if (_major_version >= JAVA_9_VERSION) {
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5961
    flags = stream->get_u2_fast() & (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_MODULE);
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5962
  } else {
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5963
    flags = stream->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS;
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5964
  }
34666
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
  if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5967
    // Set abstract bit for old class files for backward compatibility
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5968
    flags |= JVM_ACC_ABSTRACT;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5969
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5970
43977
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5971
  verify_legal_class_modifiers(flags, CHECK);
bf59cd83ea95 8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents: 43177
diff changeset
  5972
44239
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5973
  short bad_constant = class_bad_constant_seen();
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5974
  if (bad_constant != 0) {
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5975
    // Do not throw CFE until after the access_flags are checked because if
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5976
    // ACC_MODULE is set in the access flags, then NCDFE must be thrown, not CFE.
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5977
    classfile_parse_error("Unknown constant tag %u in class file %s", bad_constant, CHECK);
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5978
  }
fdd97dc2367b 8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents: 43977
diff changeset
  5979
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5980
  _access_flags.set_flags(flags);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5981
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5982
  // This class and superclass
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5983
  _this_class_index = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5984
  check_property(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5985
    valid_cp_range(_this_class_index, cp_size) &&
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5986
      cp->tag_at(_this_class_index).is_unresolved_klass(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5987
    "Invalid this class index %u in constant pool in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5988
    _this_class_index, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5989
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5990
  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
  5991
  assert(class_name_in_cp != NULL, "class_name can't be null");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5992
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5993
  // Update _class_name which could be null previously
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5994
  // to reflect the name in the constant pool
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5995
  _class_name = class_name_in_cp;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5996
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5997
  // 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
  5998
  // It has been checked when constant pool is parsed.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  5999
  // However, make sure it is not an array type.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6000
  if (_need_verify) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6001
    guarantee_property(_class_name->byte_at(0) != JVM_SIGNATURE_ARRAY,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6002
                       "Bad class name in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6003
                       CHECK);
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
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6006
  // Checks if name in class file matches requested name
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6007
  if (_requested_name != NULL && _requested_name != _class_name) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6008
    ResourceMark rm(THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6009
    Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6010
      THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6011
      vmSymbols::java_lang_NoClassDefFoundError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6012
      "%s (wrong name: %s)",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6013
      _class_name->as_C_string(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6014
      _requested_name != NULL ? _requested_name->as_C_string() : "NoName"
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
    return;
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
40923
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  6019
  // 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
  6020
  // 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
  6021
  // its host class.
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  6022
  if (_host_klass != NULL) {
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  6023
    fix_anonymous_class_name(CHECK);
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  6024
  }
10fe1c28b9f6 8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents: 40921
diff changeset
  6025
40016
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6026
  // Verification prevents us from creating names with dots in them, this
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6027
  // asserts that that's the case.
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6028
  assert(is_internal_format(_class_name), "external class name format used internally");
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6029
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6030
  if (!is_internal()) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
  6031
    LogTarget(Debug, class, preorder) lt;
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
  6032
    if (lt.is_enabled()){
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  6033
      ResourceMark rm(THREAD);
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
  6034
      LogStream ls(lt);
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
  6035
      ls.print("%s", _class_name->as_klass_external_name());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6036
      if (stream->source() != NULL) {
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
  6037
        ls.print(" source: %s", stream->source());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6038
      }
46701
f559541c0daa 8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents: 46697
diff changeset
  6039
      ls.cr();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6040
    }
37094
c12f414936a1 8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents: 37078
diff changeset
  6041
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6042
#if INCLUDE_CDS
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6043
    if (DumpLoadedClassList != NULL && stream->source() != NULL && classlist_file->is_open()) {
47673
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6044
      if (!ClassLoader::has_jrt_entry()) {
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6045
        warning("DumpLoadedClassList and CDS are not supported in exploded build");
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6046
        DumpLoadedClassList = NULL;
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6047
      } else if (SystemDictionaryShared::is_sharing_possible(_loader_data) &&
38313
615905db3fe4 8149977: DumpLoadedClassList should not include generated classes.
jiangli
parents: 38177
diff changeset
  6048
          _host_klass == NULL) {
47673
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6049
        // Only dump the classes that can be stored into CDS archive.
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6050
        // Anonymous classes such as generated LambdaForm classes are also not included.
41741
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  6051
        oop class_loader = _loader_data->class_loader();
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6052
        ResourceMark rm(THREAD);
47673
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6053
        bool skip = false;
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6054
        if (class_loader == NULL || SystemDictionary::is_platform_class_loader(class_loader)) {
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6055
          // For the boot and platform class loaders, skip classes that are not found in the
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6056
          // java runtime image, such as those found in the --patch-module entries.
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6057
          // These classes can't be loaded from the archive during runtime.
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6058
          if (!ClassLoader::is_modules_image(stream->source()) && strncmp(stream->source(), "jrt:", 4) != 0) {
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6059
            skip = true;
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6060
          }
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6061
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6062
          if (class_loader == NULL && ClassLoader::contains_append_entry(stream->source())) {
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6063
            // .. but don't skip the boot classes that are loaded from -Xbootclasspath/a
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6064
            // as they can be loaded from the archive during runtime.
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6065
            skip = false;
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6066
          }
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6067
        }
6126617b8508 8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents: 47216
diff changeset
  6068
        if (skip) {
41741
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  6069
          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
  6070
            _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
  6071
        } else {
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  6072
          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
  6073
          classlist_file->flush();
2f5b8bbcb18c 8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents: 41669
diff changeset
  6074
        }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6075
      }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6076
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6077
#endif
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6078
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6079
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6080
  // SUPERKLASS
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6081
  _super_class_index = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6082
  _super_klass = parse_super_class(cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6083
                                   _super_class_index,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6084
                                   _need_verify,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6085
                                   CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6086
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6087
  // Interfaces
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6088
  _itfs_len = stream->get_u2_fast();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6089
  parse_interfaces(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6090
                   _itfs_len,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6091
                   cp,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  6092
                   &_has_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6093
                   CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6094
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6095
  assert(_local_interfaces != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6096
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6097
  // Fields (offsets are filled in later)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6098
  _fac = new FieldAllocationCount();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6099
  parse_fields(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6100
               _access_flags.is_interface(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6101
               _fac,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6102
               cp,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6103
               cp_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6104
               &_java_fields_count,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6105
               CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6106
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6107
  assert(_fields != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6108
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6109
  // Methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6110
  AccessFlags promoted_flags;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6111
  parse_methods(stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6112
                _access_flags.is_interface(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6113
                &promoted_flags,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6114
                &_has_final_method,
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  6115
                &_declares_nonstatic_concrete_methods,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6116
                CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6117
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6118
  assert(_methods != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6119
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6120
  // promote flags from parse_methods() to the klass' flags
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6121
  _access_flags.add_promoted_flags(promoted_flags.as_int());
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6122
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  6123
  if (_declares_nonstatic_concrete_methods) {
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  6124
    _has_nonstatic_concrete_methods = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6125
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6126
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6127
  // Additional attributes/annotations
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6128
  _parsed_annotations = new ClassAnnotationCollector();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6129
  parse_classfile_attributes(stream, cp, _parsed_annotations, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6130
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6131
  assert(_inner_classes != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6132
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6133
  // Finalize the Annotations metadata object,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6134
  // now that all annotation arrays have been created.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6135
  create_combined_annotations(CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6136
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6137
  // Make sure this is the end of class file stream
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6138
  guarantee_property(stream->at_eos(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6139
                     "Extra bytes at the end of class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6140
                     CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6141
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6142
  // all bytes in stream read and parsed
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6143
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6144
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6145
void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const stream,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6146
                                                 ConstantPool* cp,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  6147
                                                 TRAPS) {
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6148
  assert(stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6149
  assert(stream->at_eos(), "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6150
  assert(cp != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6151
  assert(_loader_data != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6152
41544
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  6153
  if (_class_name == vmSymbols::java_lang_Object()) {
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  6154
    check_property(_local_interfaces == Universe::the_empty_klass_array(),
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  6155
                   "java.lang.Object cannot implement an interface in class file %s",
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  6156
                   CHECK);
d77997d3a28b 8159503: Amend Annotation Actions
rprotacio
parents: 40923
diff changeset
  6157
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6158
  // 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
  6159
  if (_super_class_index > 0 && NULL ==_super_klass) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6160
    Symbol* const super_class_name = cp->klass_name_at(_super_class_index);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6161
    if (_access_flags.is_interface()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6162
      // Before attempting to resolve the superclass, check for class format
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6163
      // errors not checked yet.
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6164
      guarantee_property(super_class_name == vmSymbols::java_lang_Object(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6165
        "Interfaces must have java.lang.Object as superclass in class file %s",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6166
        CHECK);
38147
c020feaafdcb 8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream
ecaspole
parents: 38060
diff changeset
  6167
    }
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  6168
    Handle loader(THREAD, _loader_data->class_loader());
38147
c020feaafdcb 8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream
ecaspole
parents: 38060
diff changeset
  6169
    _super_klass = (const InstanceKlass*)
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6170
                       SystemDictionary::resolve_super_or_fail(_class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6171
                                                               super_class_name,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  6172
                                                               loader,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6173
                                                               _protection_domain,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6174
                                                               true,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6175
                                                               CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6176
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6177
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6178
  if (_super_klass != NULL) {
41669
2091069b6851 8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents: 40923
diff changeset
  6179
    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
  6180
      _has_nonstatic_concrete_methods = true;
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6181
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6182
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6183
    if (_super_klass->is_interface()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6184
      ResourceMark rm(THREAD);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6185
      Exceptions::fthrow(
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6186
        THREAD_AND_LOCATION,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6187
        vmSymbols::java_lang_IncompatibleClassChangeError(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6188
        "class %s has interface %s as super class",
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6189
        _class_name->as_klass_external_name(),
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6190
        _super_klass->external_name()
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6191
      );
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6192
      return;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6193
    }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6194
    // Make sure super class is not final
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6195
    if (_super_klass->is_final()) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6196
      THROW_MSG(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  6197
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  6198
  }
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6199
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6200
  // Compute the transitive list of all unique interfaces implemented by this class
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6201
  _transitive_interfaces =
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6202
    compute_transitive_interfaces(_super_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6203
                                  _local_interfaces,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6204
                                  _loader_data,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6205
                                  CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6206
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6207
  assert(_transitive_interfaces != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6208
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6209
  // sort methods
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6210
  _method_ordering = sort_methods(_methods);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6211
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6212
  _all_mirandas = new GrowableArray<Method*>(20);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6213
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  6214
  Handle loader(THREAD, _loader_data->class_loader());
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6215
  klassVtable::compute_vtable_size_and_num_mirandas(&_vtable_size,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6216
                                                    &_num_miranda_methods,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6217
                                                    _all_mirandas,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6218
                                                    _super_klass,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6219
                                                    _methods,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6220
                                                    _access_flags,
40633
c33ad2ff51de 8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents: 40016
diff changeset
  6221
                                                    _major_version,
46271
979ebd346ecf 8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents: 46262
diff changeset
  6222
                                                    loader,
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6223
                                                    _class_name,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6224
                                                    _local_interfaces,
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6225
                                                    CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6226
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6227
  // Size of Java itable (in words)
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6228
  _itable_size = _access_flags.is_interface() ? 0 :
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6229
    klassItable::compute_itable_size(_transitive_interfaces);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6230
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6231
  assert(_fac != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6232
  assert(_parsed_annotations != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6233
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6234
  _field_info = new FieldLayoutInfo();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6235
  layout_fields(cp, _fac, _parsed_annotations, _field_info, CHECK);
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6236
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6237
  // Compute reference typ
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6238
  _rt = (NULL ==_super_klass) ? REF_NONE : _super_klass->reference_type();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6239
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  6240
}
34666
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6241
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6242
void ClassFileParser::set_klass(InstanceKlass* klass) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6243
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6244
#ifdef ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6245
  if (klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6246
    assert(NULL == _klass, "leaking?");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6247
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6248
#endif
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6249
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6250
  _klass = klass;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6251
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6252
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6253
void ClassFileParser::set_klass_to_deallocate(InstanceKlass* klass) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6254
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6255
#ifdef ASSERT
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6256
  if (klass != NULL) {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6257
    assert(NULL == _klass_to_deallocate, "leaking?");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6258
  }
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6259
#endif
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6260
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6261
  _klass_to_deallocate = klass;
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6262
}
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6263
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6264
// Caller responsible for ResourceMark
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6265
// clone stream with rewound position
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6266
const ClassFileStream* ClassFileParser::clone_stream() const {
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6267
  assert(_stream != NULL, "invariant");
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6268
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6269
  return _stream->clone();
1c7168ea0034 8140485: Class load and creation cleanup
mgronlun
parents: 34272
diff changeset
  6270
}
40016
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6271
// ----------------------------------------------------------------------------
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6272
// debugging
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6273
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6274
#ifdef ASSERT
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6275
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6276
// return true if class_name contains no '.' (internal format is '/')
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6277
bool ClassFileParser::is_internal_format(Symbol* class_name) {
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6278
  if (class_name != NULL) {
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6279
    ResourceMark rm;
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6280
    char* name = class_name->as_C_string();
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6281
    return strchr(name, '.') == NULL;
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6282
  } else {
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6283
    return true;
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6284
  }
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6285
}
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6286
bf6fcd467a7b 8162340: Better class stream parsing
acorn
parents: 39277
diff changeset
  6287
#endif