annotate src/share/vm/classfile/classFileParser.cpp @ 21526:1da7aef31a08

created com.oracle.graal.hotspot.jvmci package and moved classes destined for future JVMCI module into it (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Tue, 19 May 2015 23:16:07 +0200
parents 7848fc12602b
children 5324104ac4f3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1 /*
17640
4638c4d7ff10 8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents: 13398
diff changeset
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a61af66fc99e Initial load
duke
parents:
diff changeset
4 *
a61af66fc99e Initial load
duke
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
a61af66fc99e Initial load
duke
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
a61af66fc99e Initial load
duke
parents:
diff changeset
7 * published by the Free Software Foundation.
a61af66fc99e Initial load
duke
parents:
diff changeset
8 *
a61af66fc99e Initial load
duke
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
a61af66fc99e Initial load
duke
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a61af66fc99e Initial load
duke
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a61af66fc99e Initial load
duke
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
a61af66fc99e Initial load
duke
parents:
diff changeset
13 * accompanied this code).
a61af66fc99e Initial load
duke
parents:
diff changeset
14 *
a61af66fc99e Initial load
duke
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
a61af66fc99e Initial load
duke
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
a61af66fc99e Initial load
duke
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a61af66fc99e Initial load
duke
parents:
diff changeset
18 *
1552
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1513
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1513
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1513
diff changeset
21 * questions.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
22 *
a61af66fc99e Initial load
duke
parents:
diff changeset
23 */
a61af66fc99e Initial load
duke
parents:
diff changeset
24
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
25 #include "precompiled.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
26 #include "classfile/classFileParser.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
27 #include "classfile/classLoader.hpp"
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
28 #include "classfile/classLoaderData.hpp"
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
29 #include "classfile/classLoaderData.inline.hpp"
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
30 #include "classfile/defaultMethods.hpp"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
31 #include "classfile/javaClasses.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
32 #include "classfile/symbolTable.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
33 #include "classfile/systemDictionary.hpp"
20375
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
34 #if INCLUDE_CDS
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
35 #include "classfile/systemDictionaryShared.hpp"
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
36 #endif
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
37 #include "classfile/verificationType.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
38 #include "classfile/verifier.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
39 #include "classfile/vmSymbols.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
40 #include "memory/allocation.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
41 #include "memory/gcLocker.hpp"
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
42 #include "memory/metadataFactory.hpp"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
43 #include "memory/oopFactory.hpp"
10405
f2110083203d 8005849: JEP 167: Event-Based JVM Tracing
sla
parents: 10348
diff changeset
44 #include "memory/referenceType.hpp"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
45 #include "memory/universe.inline.hpp"
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
46 #include "oops/constantPool.hpp"
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
47 #include "oops/fieldStreams.hpp"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
48 #include "oops/instanceKlass.hpp"
2376
c7f3d0b4570f 7017732: move static fields into Class to prepare for perm gen removal
never
parents: 2357
diff changeset
49 #include "oops/instanceMirrorKlass.hpp"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
50 #include "oops/klass.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
51 #include "oops/klassVtable.hpp"
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
52 #include "oops/method.hpp"
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
53 #include "oops/symbol.hpp"
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
54 #include "prims/jvm.h"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
55 #include "prims/jvmtiExport.hpp"
4731
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
56 #include "prims/jvmtiThreadState.hpp"
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
57 #include "runtime/javaCalls.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
58 #include "runtime/perfData.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
59 #include "runtime/reflection.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
60 #include "runtime/signature.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
61 #include "runtime/timer.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
62 #include "services/classLoadingService.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1922
diff changeset
63 #include "services/threadService.hpp"
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
64 #include "utilities/array.hpp"
7588
f9eb431c3efe 8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents: 7579
diff changeset
65 #include "utilities/globalDefinitions.hpp"
20375
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
66 #include "utilities/ostream.hpp"
0
a61af66fc99e Initial load
duke
parents:
diff changeset
67
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
68 // We generally try to create the oops directly when parsing, rather than
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
69 // allocating temporary data structures and copying the bytes twice. A
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
70 // temporary area is only needed when parsing utf8 entries in the constant
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
71 // pool and when parsing line number tables.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
72
a61af66fc99e Initial load
duke
parents:
diff changeset
73 // We add assert in debug mode when class format is not checked.
a61af66fc99e Initial load
duke
parents:
diff changeset
74
a61af66fc99e Initial load
duke
parents:
diff changeset
75 #define JAVA_CLASSFILE_MAGIC 0xCAFEBABE
a61af66fc99e Initial load
duke
parents:
diff changeset
76 #define JAVA_MIN_SUPPORTED_VERSION 45
6868
48a75d2640a5 7054345: Support version 52.0 class file in HotSpot
kamg
parents: 6831
diff changeset
77 #define JAVA_MAX_SUPPORTED_VERSION 52
0
a61af66fc99e Initial load
duke
parents:
diff changeset
78 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
a61af66fc99e Initial load
duke
parents:
diff changeset
79
a61af66fc99e Initial load
duke
parents:
diff changeset
80 // Used for two backward compatibility reasons:
a61af66fc99e Initial load
duke
parents:
diff changeset
81 // - to check for new additions to the class file format in JDK1.5
a61af66fc99e Initial load
duke
parents:
diff changeset
82 // - to check for bug fixes in the format checker in JDK1.5
a61af66fc99e Initial load
duke
parents:
diff changeset
83 #define JAVA_1_5_VERSION 49
a61af66fc99e Initial load
duke
parents:
diff changeset
84
a61af66fc99e Initial load
duke
parents:
diff changeset
85 // Used for backward compatibility reasons:
a61af66fc99e Initial load
duke
parents:
diff changeset
86 // - to check for javac bug fixes that happened after 1.5
176
6b648fefb395 6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents: 136
diff changeset
87 // - also used as the max version when running in jdk6
0
a61af66fc99e Initial load
duke
parents:
diff changeset
88 #define JAVA_6_VERSION 50
a61af66fc99e Initial load
duke
parents:
diff changeset
89
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
90 // Used for backward compatibility reasons:
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
91 // - to check NameAndType_info signatures more aggressively
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
92 #define JAVA_7_VERSION 51
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
93
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
94 // Extension method support.
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
95 #define JAVA_8_VERSION 52
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
96
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
97 void ClassFileParser::parse_constant_pool_entries(int length, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
98 // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize
a61af66fc99e Initial load
duke
parents:
diff changeset
99 // this function (_current can be allocated in a register, with scalar
a61af66fc99e Initial load
duke
parents:
diff changeset
100 // replacement of aggregates). The _current pointer is copied back to
a61af66fc99e Initial load
duke
parents:
diff changeset
101 // stream() when this function returns. DON'T call another method within
a61af66fc99e Initial load
duke
parents:
diff changeset
102 // this method that uses stream().
a61af66fc99e Initial load
duke
parents:
diff changeset
103 ClassFileStream* cfs0 = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
104 ClassFileStream cfs1 = *cfs0;
a61af66fc99e Initial load
duke
parents:
diff changeset
105 ClassFileStream* cfs = &cfs1;
a61af66fc99e Initial load
duke
parents:
diff changeset
106 #ifdef ASSERT
1685
0e35fa8ebccd 6973963: SEGV in ciBlock::start_bci() with EA
kvn
parents: 1660
diff changeset
107 assert(cfs->allocated_on_stack(),"should be local");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
108 u1* old_current = cfs0->current();
a61af66fc99e Initial load
duke
parents:
diff changeset
109 #endif
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
110 Handle class_loader(THREAD, _loader_data->class_loader());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
111
a61af66fc99e Initial load
duke
parents:
diff changeset
112 // Used for batching symbol allocations.
a61af66fc99e Initial load
duke
parents:
diff changeset
113 const char* names[SymbolTable::symbol_alloc_batch_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
114 int lengths[SymbolTable::symbol_alloc_batch_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
115 int indices[SymbolTable::symbol_alloc_batch_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
116 unsigned int hashValues[SymbolTable::symbol_alloc_batch_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
117 int names_count = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
118
a61af66fc99e Initial load
duke
parents:
diff changeset
119 // parsing Index 0 is unused
a61af66fc99e Initial load
duke
parents:
diff changeset
120 for (int index = 1; index < length; index++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
121 // Each of the following case guarantees one more byte in the stream
a61af66fc99e Initial load
duke
parents:
diff changeset
122 // for the following tag or the access_flags following constant pool,
a61af66fc99e Initial load
duke
parents:
diff changeset
123 // so we don't need bounds-check for reading tag.
a61af66fc99e Initial load
duke
parents:
diff changeset
124 u1 tag = cfs->get_u1_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
125 switch (tag) {
a61af66fc99e Initial load
duke
parents:
diff changeset
126 case JVM_CONSTANT_Class :
a61af66fc99e Initial load
duke
parents:
diff changeset
127 {
a61af66fc99e Initial load
duke
parents:
diff changeset
128 cfs->guarantee_more(3, CHECK); // name_index, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
129 u2 name_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
130 _cp->klass_index_at_put(index, name_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
131 }
a61af66fc99e Initial load
duke
parents:
diff changeset
132 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
133 case JVM_CONSTANT_Fieldref :
a61af66fc99e Initial load
duke
parents:
diff changeset
134 {
a61af66fc99e Initial load
duke
parents:
diff changeset
135 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
136 u2 class_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
137 u2 name_and_type_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
138 _cp->field_at_put(index, class_index, name_and_type_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
139 }
a61af66fc99e Initial load
duke
parents:
diff changeset
140 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
141 case JVM_CONSTANT_Methodref :
a61af66fc99e Initial load
duke
parents:
diff changeset
142 {
a61af66fc99e Initial load
duke
parents:
diff changeset
143 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
144 u2 class_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
145 u2 name_and_type_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
146 _cp->method_at_put(index, class_index, name_and_type_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
147 }
a61af66fc99e Initial load
duke
parents:
diff changeset
148 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
149 case JVM_CONSTANT_InterfaceMethodref :
a61af66fc99e Initial load
duke
parents:
diff changeset
150 {
a61af66fc99e Initial load
duke
parents:
diff changeset
151 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
152 u2 class_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
153 u2 name_and_type_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
154 _cp->interface_method_at_put(index, class_index, name_and_type_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
155 }
a61af66fc99e Initial load
duke
parents:
diff changeset
156 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
157 case JVM_CONSTANT_String :
a61af66fc99e Initial load
duke
parents:
diff changeset
158 {
a61af66fc99e Initial load
duke
parents:
diff changeset
159 cfs->guarantee_more(3, CHECK); // string_index, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
160 u2 string_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
161 _cp->string_index_at_put(index, string_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
162 }
a61af66fc99e Initial load
duke
parents:
diff changeset
163 break;
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
164 case JVM_CONSTANT_MethodHandle :
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
165 case JVM_CONSTANT_MethodType :
2356
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
166 if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
167 classfile_parse_error(
2356
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
168 "Class file version does not support constant tag %u in class file %s",
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
169 tag, CHECK);
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
170 }
2416
38fea01eb669 6817525: turn on method handle functionality by default for JSR 292
twisti
parents: 2376
diff changeset
171 if (!EnableInvokeDynamic) {
2356
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
172 classfile_parse_error(
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
173 "This JVM does not support constant tag %u in class file %s",
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
174 tag, CHECK);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
175 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
176 if (tag == JVM_CONSTANT_MethodHandle) {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
177 cfs->guarantee_more(4, CHECK); // ref_kind, method_index, tag/access_flags
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
178 u1 ref_kind = cfs->get_u1_fast();
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
179 u2 method_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
180 _cp->method_handle_index_at_put(index, ref_kind, method_index);
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
181 } else if (tag == JVM_CONSTANT_MethodType) {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
182 cfs->guarantee_more(3, CHECK); // signature_index, tag/access_flags
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
183 u2 signature_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
184 _cp->method_type_index_at_put(index, signature_index);
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
185 } else {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
186 ShouldNotReachHere();
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
187 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
188 break;
1660
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
189 case JVM_CONSTANT_InvokeDynamic :
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
190 {
2356
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
191 if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
1660
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
192 classfile_parse_error(
2356
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
193 "Class file version does not support constant tag %u in class file %s",
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
194 tag, CHECK);
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
195 }
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
196 if (!EnableInvokeDynamic) {
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
197 classfile_parse_error(
72dee110246f 6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents: 2334
diff changeset
198 "This JVM does not support constant tag %u in class file %s",
1660
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
199 tag, CHECK);
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
200 }
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
201 cfs->guarantee_more(5, CHECK); // bsm_index, nt, tag/access_flags
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
202 u2 bootstrap_specifier_index = cfs->get_u2_fast();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
203 u2 name_and_type_index = cfs->get_u2_fast();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
204 if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index)
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
205 _max_bootstrap_specifier_index = (int) bootstrap_specifier_index; // collect for later
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
206 _cp->invoke_dynamic_at_put(index, bootstrap_specifier_index, name_and_type_index);
1660
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
207 }
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
208 break;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
209 case JVM_CONSTANT_Integer :
a61af66fc99e Initial load
duke
parents:
diff changeset
210 {
a61af66fc99e Initial load
duke
parents:
diff changeset
211 cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
212 u4 bytes = cfs->get_u4_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
213 _cp->int_at_put(index, (jint) bytes);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
214 }
a61af66fc99e Initial load
duke
parents:
diff changeset
215 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
216 case JVM_CONSTANT_Float :
a61af66fc99e Initial load
duke
parents:
diff changeset
217 {
a61af66fc99e Initial load
duke
parents:
diff changeset
218 cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
219 u4 bytes = cfs->get_u4_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
220 _cp->float_at_put(index, *(jfloat*)&bytes);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
221 }
a61af66fc99e Initial load
duke
parents:
diff changeset
222 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
223 case JVM_CONSTANT_Long :
a61af66fc99e Initial load
duke
parents:
diff changeset
224 // A mangled type might cause you to overrun allocated memory
a61af66fc99e Initial load
duke
parents:
diff changeset
225 guarantee_property(index+1 < length,
a61af66fc99e Initial load
duke
parents:
diff changeset
226 "Invalid constant pool entry %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
227 index, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
228 {
a61af66fc99e Initial load
duke
parents:
diff changeset
229 cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
230 u8 bytes = cfs->get_u8_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
231 _cp->long_at_put(index, bytes);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
232 }
a61af66fc99e Initial load
duke
parents:
diff changeset
233 index++; // Skip entry following eigth-byte constant, see JVM book p. 98
a61af66fc99e Initial load
duke
parents:
diff changeset
234 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
235 case JVM_CONSTANT_Double :
a61af66fc99e Initial load
duke
parents:
diff changeset
236 // A mangled type might cause you to overrun allocated memory
a61af66fc99e Initial load
duke
parents:
diff changeset
237 guarantee_property(index+1 < length,
a61af66fc99e Initial load
duke
parents:
diff changeset
238 "Invalid constant pool entry %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
239 index, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
240 {
a61af66fc99e Initial load
duke
parents:
diff changeset
241 cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
242 u8 bytes = cfs->get_u8_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
243 _cp->double_at_put(index, *(jdouble*)&bytes);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
244 }
a61af66fc99e Initial load
duke
parents:
diff changeset
245 index++; // Skip entry following eigth-byte constant, see JVM book p. 98
a61af66fc99e Initial load
duke
parents:
diff changeset
246 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
247 case JVM_CONSTANT_NameAndType :
a61af66fc99e Initial load
duke
parents:
diff changeset
248 {
a61af66fc99e Initial load
duke
parents:
diff changeset
249 cfs->guarantee_more(5, CHECK); // name_index, signature_index, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
250 u2 name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
251 u2 signature_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
252 _cp->name_and_type_at_put(index, name_index, signature_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
253 }
a61af66fc99e Initial load
duke
parents:
diff changeset
254 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
255 case JVM_CONSTANT_Utf8 :
a61af66fc99e Initial load
duke
parents:
diff changeset
256 {
a61af66fc99e Initial load
duke
parents:
diff changeset
257 cfs->guarantee_more(2, CHECK); // utf8_length
a61af66fc99e Initial load
duke
parents:
diff changeset
258 u2 utf8_length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
259 u1* utf8_buffer = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
260 assert(utf8_buffer != NULL, "null utf8 buffer");
a61af66fc99e Initial load
duke
parents:
diff changeset
261 // Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward.
a61af66fc99e Initial load
duke
parents:
diff changeset
262 cfs->guarantee_more(utf8_length+1, CHECK); // utf8 string, tag/access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
263 cfs->skip_u1_fast(utf8_length);
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
264
0
a61af66fc99e Initial load
duke
parents:
diff changeset
265 // Before storing the symbol, make sure it's legal
a61af66fc99e Initial load
duke
parents:
diff changeset
266 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
267 verify_legal_utf8((unsigned char*)utf8_buffer, utf8_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
268 }
a61af66fc99e Initial load
duke
parents:
diff changeset
269
2416
38fea01eb669 6817525: turn on method handle functionality by default for JSR 292
twisti
parents: 2376
diff changeset
270 if (EnableInvokeDynamic && has_cp_patch_at(index)) {
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
271 Handle patch = clear_cp_patch_at(index);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
272 guarantee_property(java_lang_String::is_instance(patch()),
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
273 "Illegal utf8 patch at %d in class file %s",
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
274 index, CHECK);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
275 char* str = java_lang_String::as_utf8_string(patch());
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
276 // (could use java_lang_String::as_symbol instead, but might as well batch them)
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
277 utf8_buffer = (u1*) str;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
278 utf8_length = (int) strlen(str);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
279 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
280
0
a61af66fc99e Initial load
duke
parents:
diff changeset
281 unsigned int hash;
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
282 Symbol* result = SymbolTable::lookup_only((char*)utf8_buffer, utf8_length, hash);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
283 if (result == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
284 names[names_count] = (char*)utf8_buffer;
a61af66fc99e Initial load
duke
parents:
diff changeset
285 lengths[names_count] = utf8_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
286 indices[names_count] = index;
a61af66fc99e Initial load
duke
parents:
diff changeset
287 hashValues[names_count++] = hash;
a61af66fc99e Initial load
duke
parents:
diff changeset
288 if (names_count == SymbolTable::symbol_alloc_batch_size) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
289 SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
290 names_count = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
291 }
a61af66fc99e Initial load
duke
parents:
diff changeset
292 } else {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
293 _cp->symbol_at_put(index, result);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
294 }
a61af66fc99e Initial load
duke
parents:
diff changeset
295 }
a61af66fc99e Initial load
duke
parents:
diff changeset
296 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
297 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
298 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
299 "Unknown constant tag %u in class file %s", tag, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
300 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
301 }
a61af66fc99e Initial load
duke
parents:
diff changeset
302 }
a61af66fc99e Initial load
duke
parents:
diff changeset
303
a61af66fc99e Initial load
duke
parents:
diff changeset
304 // Allocate the remaining symbols
a61af66fc99e Initial load
duke
parents:
diff changeset
305 if (names_count > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
306 SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
307 }
a61af66fc99e Initial load
duke
parents:
diff changeset
308
a61af66fc99e Initial load
duke
parents:
diff changeset
309 // Copy _current pointer of local copy back to stream().
a61af66fc99e Initial load
duke
parents:
diff changeset
310 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
311 assert(cfs0->current() == old_current, "non-exclusive use of stream()");
a61af66fc99e Initial load
duke
parents:
diff changeset
312 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
313 cfs0->set_current(cfs1.current());
a61af66fc99e Initial load
duke
parents:
diff changeset
314 }
a61af66fc99e Initial load
duke
parents:
diff changeset
315
a61af66fc99e Initial load
duke
parents:
diff changeset
316 bool inline valid_cp_range(int index, int length) { return (index > 0 && index < length); }
a61af66fc99e Initial load
duke
parents:
diff changeset
317
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
318 inline Symbol* check_symbol_at(constantPoolHandle cp, int index) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
319 if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8())
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
320 return cp->symbol_at(index);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
321 else
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
322 return NULL;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
323 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
324
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
325 constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
326 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
327 constantPoolHandle nullHandle;
a61af66fc99e Initial load
duke
parents:
diff changeset
328
a61af66fc99e Initial load
duke
parents:
diff changeset
329 cfs->guarantee_more(3, CHECK_(nullHandle)); // length, first cp tag
a61af66fc99e Initial load
duke
parents:
diff changeset
330 u2 length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
331 guarantee_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
332 length >= 1, "Illegal constant pool size %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
333 length, CHECK_(nullHandle));
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
334 ConstantPool* constant_pool = ConstantPool::allocate(_loader_data, length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
335 CHECK_(nullHandle));
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
336 _cp = constant_pool; // save in case of errors
0
a61af66fc99e Initial load
duke
parents:
diff changeset
337 constantPoolHandle cp (THREAD, constant_pool);
a61af66fc99e Initial load
duke
parents:
diff changeset
338
a61af66fc99e Initial load
duke
parents:
diff changeset
339 // parsing constant pool entries
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
340 parse_constant_pool_entries(length, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
341
a61af66fc99e Initial load
duke
parents:
diff changeset
342 int index = 1; // declared outside of loops for portability
a61af66fc99e Initial load
duke
parents:
diff changeset
343
a61af66fc99e Initial load
duke
parents:
diff changeset
344 // first verification pass - validate cross references and fixup class and string constants
a61af66fc99e Initial load
duke
parents:
diff changeset
345 for (index = 1; index < length; index++) { // Index 0 is unused
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
346 jbyte tag = cp->tag_at(index).value();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
347 switch (tag) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
348 case JVM_CONSTANT_Class :
a61af66fc99e Initial load
duke
parents:
diff changeset
349 ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present
a61af66fc99e Initial load
duke
parents:
diff changeset
350 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
351 case JVM_CONSTANT_Fieldref :
a61af66fc99e Initial load
duke
parents:
diff changeset
352 // fall through
a61af66fc99e Initial load
duke
parents:
diff changeset
353 case JVM_CONSTANT_Methodref :
a61af66fc99e Initial load
duke
parents:
diff changeset
354 // fall through
a61af66fc99e Initial load
duke
parents:
diff changeset
355 case JVM_CONSTANT_InterfaceMethodref : {
a61af66fc99e Initial load
duke
parents:
diff changeset
356 if (!_need_verify) break;
a61af66fc99e Initial load
duke
parents:
diff changeset
357 int klass_ref_index = cp->klass_ref_index_at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
358 int name_and_type_ref_index = cp->name_and_type_ref_index_at(index);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
359 check_property(valid_klass_reference_at(klass_ref_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
360 "Invalid constant pool index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
361 klass_ref_index,
a61af66fc99e Initial load
duke
parents:
diff changeset
362 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
363 check_property(valid_cp_range(name_and_type_ref_index, length) &&
a61af66fc99e Initial load
duke
parents:
diff changeset
364 cp->tag_at(name_and_type_ref_index).is_name_and_type(),
a61af66fc99e Initial load
duke
parents:
diff changeset
365 "Invalid constant pool index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
366 name_and_type_ref_index,
a61af66fc99e Initial load
duke
parents:
diff changeset
367 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
368 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
369 }
a61af66fc99e Initial load
duke
parents:
diff changeset
370 case JVM_CONSTANT_String :
a61af66fc99e Initial load
duke
parents:
diff changeset
371 ShouldNotReachHere(); // Only JVM_CONSTANT_StringIndex should be present
a61af66fc99e Initial load
duke
parents:
diff changeset
372 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
373 case JVM_CONSTANT_Integer :
a61af66fc99e Initial load
duke
parents:
diff changeset
374 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
375 case JVM_CONSTANT_Float :
a61af66fc99e Initial load
duke
parents:
diff changeset
376 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
377 case JVM_CONSTANT_Long :
a61af66fc99e Initial load
duke
parents:
diff changeset
378 case JVM_CONSTANT_Double :
a61af66fc99e Initial load
duke
parents:
diff changeset
379 index++;
a61af66fc99e Initial load
duke
parents:
diff changeset
380 check_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
381 (index < length && cp->tag_at(index).is_invalid()),
a61af66fc99e Initial load
duke
parents:
diff changeset
382 "Improper constant pool long/double index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
383 index, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
384 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
385 case JVM_CONSTANT_NameAndType : {
a61af66fc99e Initial load
duke
parents:
diff changeset
386 if (!_need_verify) break;
a61af66fc99e Initial load
duke
parents:
diff changeset
387 int name_ref_index = cp->name_ref_index_at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
388 int signature_ref_index = cp->signature_ref_index_at(index);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
389 check_property(valid_symbol_at(name_ref_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
390 "Invalid constant pool index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
391 name_ref_index, CHECK_(nullHandle));
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
392 check_property(valid_symbol_at(signature_ref_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
393 "Invalid constant pool index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
394 signature_ref_index, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
395 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
396 }
a61af66fc99e Initial load
duke
parents:
diff changeset
397 case JVM_CONSTANT_Utf8 :
a61af66fc99e Initial load
duke
parents:
diff changeset
398 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
399 case JVM_CONSTANT_UnresolvedClass : // fall-through
a61af66fc99e Initial load
duke
parents:
diff changeset
400 case JVM_CONSTANT_UnresolvedClassInError:
a61af66fc99e Initial load
duke
parents:
diff changeset
401 ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present
a61af66fc99e Initial load
duke
parents:
diff changeset
402 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
403 case JVM_CONSTANT_ClassIndex :
a61af66fc99e Initial load
duke
parents:
diff changeset
404 {
a61af66fc99e Initial load
duke
parents:
diff changeset
405 int class_index = cp->klass_index_at(index);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
406 check_property(valid_symbol_at(class_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
407 "Invalid constant pool index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
408 class_index, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
409 cp->unresolved_klass_at_put(index, cp->symbol_at(class_index));
a61af66fc99e Initial load
duke
parents:
diff changeset
410 }
a61af66fc99e Initial load
duke
parents:
diff changeset
411 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
412 case JVM_CONSTANT_StringIndex :
a61af66fc99e Initial load
duke
parents:
diff changeset
413 {
a61af66fc99e Initial load
duke
parents:
diff changeset
414 int string_index = cp->string_index_at(index);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
415 check_property(valid_symbol_at(string_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
416 "Invalid constant pool index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
417 string_index, CHECK_(nullHandle));
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
418 Symbol* sym = cp->symbol_at(string_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
419 cp->unresolved_string_at_put(index, sym);
a61af66fc99e Initial load
duke
parents:
diff changeset
420 }
a61af66fc99e Initial load
duke
parents:
diff changeset
421 break;
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
422 case JVM_CONSTANT_MethodHandle :
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
423 {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
424 int ref_index = cp->method_handle_index_at(index);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
425 check_property(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
426 valid_cp_range(ref_index, length) &&
2416
38fea01eb669 6817525: turn on method handle functionality by default for JSR 292
twisti
parents: 2376
diff changeset
427 EnableInvokeDynamic,
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
428 "Invalid constant pool index %u in class file %s",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
429 ref_index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
430 constantTag tag = cp->tag_at(ref_index);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
431 int ref_kind = cp->method_handle_ref_kind_at(index);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
432 switch (ref_kind) {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
433 case JVM_REF_getField:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
434 case JVM_REF_getStatic:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
435 case JVM_REF_putField:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
436 case JVM_REF_putStatic:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
437 check_property(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
438 tag.is_field(),
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
439 "Invalid constant pool index %u in class file %s (not a field)",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
440 ref_index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
441 break;
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
442 case JVM_REF_invokeVirtual:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
443 case JVM_REF_newInvokeSpecial:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
444 check_property(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
445 tag.is_method(),
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
446 "Invalid constant pool index %u in class file %s (not a method)",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
447 ref_index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
448 break;
10128
41ed397cc0cd 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 9083
diff changeset
449 case JVM_REF_invokeStatic:
41ed397cc0cd 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 9083
diff changeset
450 case JVM_REF_invokeSpecial:
10340
ccdecfece956 8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents: 10314
diff changeset
451 check_property(tag.is_method() ||
ccdecfece956 8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents: 10314
diff changeset
452 ((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()),
10128
41ed397cc0cd 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 9083
diff changeset
453 "Invalid constant pool index %u in class file %s (not a method)",
41ed397cc0cd 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 9083
diff changeset
454 ref_index, CHECK_(nullHandle));
41ed397cc0cd 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 9083
diff changeset
455 break;
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
456 case JVM_REF_invokeInterface:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
457 check_property(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
458 tag.is_interface_method(),
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
459 "Invalid constant pool index %u in class file %s (not an interface method)",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
460 ref_index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
461 break;
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
462 default:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
463 classfile_parse_error(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
464 "Bad method handle kind at constant pool index %u in class file %s",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
465 index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
466 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
467 // Keep the ref_index unchanged. It will be indirected at link-time.
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
468 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
469 break;
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
470 case JVM_CONSTANT_MethodType :
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
471 {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
472 int ref_index = cp->method_type_index_at(index);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
473 check_property(valid_symbol_at(ref_index) && EnableInvokeDynamic,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
474 "Invalid constant pool index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
475 ref_index, CHECK_(nullHandle));
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
476 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
477 break;
1660
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
478 case JVM_CONSTANT_InvokeDynamic :
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
479 {
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
480 int name_and_type_ref_index = cp->invoke_dynamic_name_and_type_ref_index_at(index);
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
481 check_property(valid_cp_range(name_and_type_ref_index, length) &&
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
482 cp->tag_at(name_and_type_ref_index).is_name_and_type(),
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
483 "Invalid constant pool index %u in class file %s",
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
484 name_and_type_ref_index,
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
485 CHECK_(nullHandle));
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
486 // bootstrap specifier index must be checked later, when BootstrapMethods attr is available
1660
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
487 break;
083fde3b838e 6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents: 1608
diff changeset
488 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
489 default:
1490
f03d0a26bf83 6888954: argument formatting for assert() and friends
jcoomes
parents: 1366
diff changeset
490 fatal(err_msg("bad constant pool tag value %u",
f03d0a26bf83 6888954: argument formatting for assert() and friends
jcoomes
parents: 1366
diff changeset
491 cp->tag_at(index).value()));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
492 ShouldNotReachHere();
a61af66fc99e Initial load
duke
parents:
diff changeset
493 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
494 } // end of switch
a61af66fc99e Initial load
duke
parents:
diff changeset
495 } // end of for
a61af66fc99e Initial load
duke
parents:
diff changeset
496
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
497 if (_cp_patches != NULL) {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
498 // need to treat this_class specially...
2416
38fea01eb669 6817525: turn on method handle functionality by default for JSR 292
twisti
parents: 2376
diff changeset
499 assert(EnableInvokeDynamic, "");
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
500 int this_class_index;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
501 {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
502 cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
503 u1* mark = cfs->current();
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
504 u2 flags = cfs->get_u2_fast();
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
505 this_class_index = cfs->get_u2_fast();
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
506 cfs->set_current(mark); // revert to mark
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
507 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
508
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
509 for (index = 1; index < length; index++) { // Index 0 is unused
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
510 if (has_cp_patch_at(index)) {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
511 guarantee_property(index != this_class_index,
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
512 "Illegal constant pool patch to self at %d in class file %s",
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
513 index, CHECK_(nullHandle));
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
514 patch_constant_pool(cp, index, cp_patch_at(index), CHECK_(nullHandle));
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
515 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
516 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
517 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
518
0
a61af66fc99e Initial load
duke
parents:
diff changeset
519 if (!_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
520 return cp;
a61af66fc99e Initial load
duke
parents:
diff changeset
521 }
a61af66fc99e Initial load
duke
parents:
diff changeset
522
a61af66fc99e Initial load
duke
parents:
diff changeset
523 // second verification pass - checks the strings are of the right format.
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
524 // but not yet to the other entries
0
a61af66fc99e Initial load
duke
parents:
diff changeset
525 for (index = 1; index < length; index++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
526 jbyte tag = cp->tag_at(index).value();
a61af66fc99e Initial load
duke
parents:
diff changeset
527 switch (tag) {
a61af66fc99e Initial load
duke
parents:
diff changeset
528 case JVM_CONSTANT_UnresolvedClass: {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
529 Symbol* class_name = cp->unresolved_klass_at(index);
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
530 // check the name, even if _cp_patches will overwrite it
0
a61af66fc99e Initial load
duke
parents:
diff changeset
531 verify_legal_class_name(class_name, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
532 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
533 }
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
534 case JVM_CONSTANT_NameAndType: {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
535 if (_need_verify && _major_version >= JAVA_7_VERSION) {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
536 int sig_index = cp->signature_ref_index_at(index);
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
537 int name_index = cp->name_ref_index_at(index);
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
538 Symbol* name = cp->symbol_at(name_index);
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
539 Symbol* sig = cp->symbol_at(sig_index);
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
540 if (sig->byte_at(0) == JVM_SIGNATURE_FUNC) {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
541 verify_legal_method_signature(name, sig, CHECK_(nullHandle));
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
542 } else {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
543 verify_legal_field_signature(name, sig, CHECK_(nullHandle));
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
544 }
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
545 }
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
546 break;
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
547 }
2461
758ba0bf7bcc 7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents: 2460
diff changeset
548 case JVM_CONSTANT_InvokeDynamic:
0
a61af66fc99e Initial load
duke
parents:
diff changeset
549 case JVM_CONSTANT_Fieldref:
a61af66fc99e Initial load
duke
parents:
diff changeset
550 case JVM_CONSTANT_Methodref:
a61af66fc99e Initial load
duke
parents:
diff changeset
551 case JVM_CONSTANT_InterfaceMethodref: {
a61af66fc99e Initial load
duke
parents:
diff changeset
552 int name_and_type_ref_index = cp->name_and_type_ref_index_at(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
553 // already verified to be utf8
a61af66fc99e Initial load
duke
parents:
diff changeset
554 int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index);
a61af66fc99e Initial load
duke
parents:
diff changeset
555 // already verified to be utf8
a61af66fc99e Initial load
duke
parents:
diff changeset
556 int signature_ref_index = cp->signature_ref_index_at(name_and_type_ref_index);
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
557 Symbol* name = cp->symbol_at(name_ref_index);
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
558 Symbol* signature = cp->symbol_at(signature_ref_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
559 if (tag == JVM_CONSTANT_Fieldref) {
a61af66fc99e Initial load
duke
parents:
diff changeset
560 verify_legal_field_name(name, CHECK_(nullHandle));
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
561 if (_need_verify && _major_version >= JAVA_7_VERSION) {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
562 // Signature is verified above, when iterating NameAndType_info.
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
563 // Need only to be sure it's the right type.
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
564 if (signature->byte_at(0) == JVM_SIGNATURE_FUNC) {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
565 throwIllegalSignature(
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
566 "Field", name, signature, CHECK_(nullHandle));
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
567 }
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
568 } else {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
569 verify_legal_field_signature(name, signature, CHECK_(nullHandle));
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
570 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
571 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
572 verify_legal_method_name(name, CHECK_(nullHandle));
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
573 if (_need_verify && _major_version >= JAVA_7_VERSION) {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
574 // Signature is verified above, when iterating NameAndType_info.
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
575 // Need only to be sure it's the right type.
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
576 if (signature->byte_at(0) != JVM_SIGNATURE_FUNC) {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
577 throwIllegalSignature(
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
578 "Method", name, signature, CHECK_(nullHandle));
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
579 }
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
580 } else {
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
581 verify_legal_method_signature(name, signature, CHECK_(nullHandle));
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
582 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
583 if (tag == JVM_CONSTANT_Methodref) {
a61af66fc99e Initial load
duke
parents:
diff changeset
584 // 4509014: If a class method name begins with '<', it must be "<init>".
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
585 assert(name != NULL, "method name in constant pool is null");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
586 unsigned int name_len = name->utf8_length();
a61af66fc99e Initial load
duke
parents:
diff changeset
587 assert(name_len > 0, "bad method name"); // already verified as legal name
a61af66fc99e Initial load
duke
parents:
diff changeset
588 if (name->byte_at(0) == '<') {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
589 if (name != vmSymbols::object_initializer_name()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
590 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
591 "Bad method name at constant pool index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
592 name_ref_index, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
593 }
a61af66fc99e Initial load
duke
parents:
diff changeset
594 }
a61af66fc99e Initial load
duke
parents:
diff changeset
595 }
a61af66fc99e Initial load
duke
parents:
diff changeset
596 }
a61af66fc99e Initial load
duke
parents:
diff changeset
597 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
598 }
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
599 case JVM_CONSTANT_MethodHandle: {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
600 int ref_index = cp->method_handle_index_at(index);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
601 int ref_kind = cp->method_handle_ref_kind_at(index);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
602 switch (ref_kind) {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
603 case JVM_REF_invokeVirtual:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
604 case JVM_REF_invokeStatic:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
605 case JVM_REF_invokeSpecial:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
606 case JVM_REF_newInvokeSpecial:
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
607 {
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
608 int name_and_type_ref_index = cp->name_and_type_ref_index_at(ref_index);
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
609 int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index);
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
610 Symbol* name = cp->symbol_at(name_ref_index);
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
611 if (ref_kind == JVM_REF_newInvokeSpecial) {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
612 if (name != vmSymbols::object_initializer_name()) {
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
613 classfile_parse_error(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
614 "Bad constructor name at constant pool index %u in class file %s",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
615 name_ref_index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
616 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
617 } else {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
618 if (name == vmSymbols::object_initializer_name()) {
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
619 classfile_parse_error(
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
620 "Bad method name at constant pool index %u in class file %s",
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
621 name_ref_index, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
622 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
623 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
624 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
625 break;
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
626 // Other ref_kinds are already fully checked in previous pass.
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
627 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
628 break;
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
629 }
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
630 case JVM_CONSTANT_MethodType: {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
631 Symbol* no_name = vmSymbols::type_name(); // place holder
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
632 Symbol* signature = cp->method_type_signature_at(index);
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
633 verify_legal_method_signature(no_name, signature, CHECK_(nullHandle));
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
634 break;
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
635 }
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
636 case JVM_CONSTANT_Utf8: {
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
637 assert(cp->symbol_at(index)->refcount() != 0, "count corrupted");
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
638 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
639 } // end of switch
a61af66fc99e Initial load
duke
parents:
diff changeset
640 } // end of for
a61af66fc99e Initial load
duke
parents:
diff changeset
641
a61af66fc99e Initial load
duke
parents:
diff changeset
642 return cp;
a61af66fc99e Initial load
duke
parents:
diff changeset
643 }
a61af66fc99e Initial load
duke
parents:
diff changeset
644
a61af66fc99e Initial load
duke
parents:
diff changeset
645
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
646 void ClassFileParser::patch_constant_pool(constantPoolHandle cp, int index, Handle patch, TRAPS) {
2416
38fea01eb669 6817525: turn on method handle functionality by default for JSR 292
twisti
parents: 2376
diff changeset
647 assert(EnableInvokeDynamic, "");
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
648 BasicType patch_type = T_VOID;
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
649
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
650 switch (cp->tag_at(index).value()) {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
651
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
652 case JVM_CONSTANT_UnresolvedClass :
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
653 // Patching a class means pre-resolving it.
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
654 // The name in the constant pool is ignored.
1602
136b78722a08 6939203: JSR 292 needs method handle constants
jrose
parents: 1552
diff changeset
655 if (java_lang_Class::is_instance(patch())) {
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
656 guarantee_property(!java_lang_Class::is_primitive(patch()),
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
657 "Illegal class patch at %d in class file %s",
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
658 index, CHECK);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
659 cp->klass_at_put(index, java_lang_Class::as_Klass(patch()));
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
660 } else {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
661 guarantee_property(java_lang_String::is_instance(patch()),
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
662 "Illegal class patch at %d in class file %s",
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
663 index, CHECK);
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
664 Symbol* name = java_lang_String::as_symbol(patch(), CHECK);
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
665 cp->unresolved_klass_at_put(index, name);
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
666 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
667 break;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
668
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
669 case JVM_CONSTANT_String :
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
670 // skip this patch and don't clear it. Needs the oop array for resolved
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
671 // references to be created first.
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
672 return;
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
673
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
674 case JVM_CONSTANT_Integer : patch_type = T_INT; goto patch_prim;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
675 case JVM_CONSTANT_Float : patch_type = T_FLOAT; goto patch_prim;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
676 case JVM_CONSTANT_Long : patch_type = T_LONG; goto patch_prim;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
677 case JVM_CONSTANT_Double : patch_type = T_DOUBLE; goto patch_prim;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
678 patch_prim:
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
679 {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
680 jvalue value;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
681 BasicType value_type = java_lang_boxing_object::get_value(patch(), &value);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
682 guarantee_property(value_type == patch_type,
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
683 "Illegal primitive patch at %d in class file %s",
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
684 index, CHECK);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
685 switch (value_type) {
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
686 case T_INT: cp->int_at_put(index, value.i); break;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
687 case T_FLOAT: cp->float_at_put(index, value.f); break;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
688 case T_LONG: cp->long_at_put(index, value.j); break;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
689 case T_DOUBLE: cp->double_at_put(index, value.d); break;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
690 default: assert(false, "");
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
691 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
692 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
693 break;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
694
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
695 default:
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
696 // %%% TODO: put method handles into CONSTANT_InterfaceMethodref, etc.
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
697 guarantee_property(!has_cp_patch_at(index),
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
698 "Illegal unexpected patch at %d in class file %s",
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
699 index, CHECK);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
700 return;
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
701 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
702
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
703 // On fall-through, mark the patch as used.
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
704 clear_cp_patch_at(index);
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
705 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
706
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
707
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
708
0
a61af66fc99e Initial load
duke
parents:
diff changeset
709 class NameSigHash: public ResourceObj {
a61af66fc99e Initial load
duke
parents:
diff changeset
710 public:
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
711 Symbol* _name; // name
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
712 Symbol* _sig; // signature
0
a61af66fc99e Initial load
duke
parents:
diff changeset
713 NameSigHash* _next; // Next entry in hash table
a61af66fc99e Initial load
duke
parents:
diff changeset
714 };
a61af66fc99e Initial load
duke
parents:
diff changeset
715
a61af66fc99e Initial load
duke
parents:
diff changeset
716
a61af66fc99e Initial load
duke
parents:
diff changeset
717 #define HASH_ROW_SIZE 256
a61af66fc99e Initial load
duke
parents:
diff changeset
718
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
719 unsigned int hash(Symbol* name, Symbol* sig) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
720 unsigned int raw_hash = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
721 raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2);
a61af66fc99e Initial load
duke
parents:
diff changeset
722 raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize;
a61af66fc99e Initial load
duke
parents:
diff changeset
723
a61af66fc99e Initial load
duke
parents:
diff changeset
724 return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE;
a61af66fc99e Initial load
duke
parents:
diff changeset
725 }
a61af66fc99e Initial load
duke
parents:
diff changeset
726
a61af66fc99e Initial load
duke
parents:
diff changeset
727
a61af66fc99e Initial load
duke
parents:
diff changeset
728 void initialize_hashtable(NameSigHash** table) {
a61af66fc99e Initial load
duke
parents:
diff changeset
729 memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE);
a61af66fc99e Initial load
duke
parents:
diff changeset
730 }
a61af66fc99e Initial load
duke
parents:
diff changeset
731
a61af66fc99e Initial load
duke
parents:
diff changeset
732 // Return false if the name/sig combination is found in table.
a61af66fc99e Initial load
duke
parents:
diff changeset
733 // Return true if no duplicate is found. And name/sig is added as a new entry in table.
a61af66fc99e Initial load
duke
parents:
diff changeset
734 // The old format checker uses heap sort to find duplicates.
a61af66fc99e Initial load
duke
parents:
diff changeset
735 // NOTE: caller should guarantee that GC doesn't happen during the life cycle
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
736 // of table since we don't expect Symbol*'s to move.
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
737 bool put_after_lookup(Symbol* name, Symbol* sig, NameSigHash** table) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
738 assert(name != NULL, "name in constant pool is NULL");
a61af66fc99e Initial load
duke
parents:
diff changeset
739
a61af66fc99e Initial load
duke
parents:
diff changeset
740 // First lookup for duplicates
a61af66fc99e Initial load
duke
parents:
diff changeset
741 int index = hash(name, sig);
a61af66fc99e Initial load
duke
parents:
diff changeset
742 NameSigHash* entry = table[index];
a61af66fc99e Initial load
duke
parents:
diff changeset
743 while (entry != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
744 if (entry->_name == name && entry->_sig == sig) {
a61af66fc99e Initial load
duke
parents:
diff changeset
745 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
746 }
a61af66fc99e Initial load
duke
parents:
diff changeset
747 entry = entry->_next;
a61af66fc99e Initial load
duke
parents:
diff changeset
748 }
a61af66fc99e Initial load
duke
parents:
diff changeset
749
a61af66fc99e Initial load
duke
parents:
diff changeset
750 // No duplicate is found, allocate a new entry and fill it.
a61af66fc99e Initial load
duke
parents:
diff changeset
751 entry = new NameSigHash();
a61af66fc99e Initial load
duke
parents:
diff changeset
752 entry->_name = name;
a61af66fc99e Initial load
duke
parents:
diff changeset
753 entry->_sig = sig;
a61af66fc99e Initial load
duke
parents:
diff changeset
754
a61af66fc99e Initial load
duke
parents:
diff changeset
755 // Insert into hash table
a61af66fc99e Initial load
duke
parents:
diff changeset
756 entry->_next = table[index];
a61af66fc99e Initial load
duke
parents:
diff changeset
757 table[index] = entry;
a61af66fc99e Initial load
duke
parents:
diff changeset
758
a61af66fc99e Initial load
duke
parents:
diff changeset
759 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
760 }
a61af66fc99e Initial load
duke
parents:
diff changeset
761
a61af66fc99e Initial load
duke
parents:
diff changeset
762
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
763 Array<Klass*>* ClassFileParser::parse_interfaces(int length,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
764 Handle protection_domain,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
765 Symbol* class_name,
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
766 bool* has_default_methods,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
767 TRAPS) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
768 if (length == 0) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
769 _local_interfaces = Universe::the_empty_klass_array();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
770 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
771 ClassFileStream* cfs = stream();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
772 assert(length > 0, "only called for length>0");
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
773 _local_interfaces = MetadataFactory::new_array<Klass*>(_loader_data, length, NULL, CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
774
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
775 int index;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
776 for (index = 0; index < length; index++) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
777 u2 interface_index = cfs->get_u2(CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
778 KlassHandle interf;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
779 check_property(
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
780 valid_klass_reference_at(interface_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
781 "Interface name has bad constant pool index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
782 interface_index, CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
783 if (_cp->tag_at(interface_index).is_klass()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
784 interf = KlassHandle(THREAD, _cp->resolved_klass_at(interface_index));
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
785 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
786 Symbol* unresolved_klass = _cp->klass_name_at(interface_index);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
787
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
788 // Don't need to check legal name because it's checked when parsing constant pool.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
789 // But need to make sure it's not an array type.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
790 guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
791 "Bad interface name in class file %s", CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
792 Handle class_loader(THREAD, _loader_data->class_loader());
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
793
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
794 // Call resolve_super so classcircularity is checked
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
795 Klass* k = SystemDictionary::resolve_super_or_fail(class_name,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
796 unresolved_klass, class_loader, protection_domain,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
797 false, CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
798 interf = KlassHandle(THREAD, k);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
799 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
800
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
801 if (!interf()->is_interface()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
802 THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
803 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
804 if (InstanceKlass::cast(interf())->has_default_methods()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
805 *has_default_methods = true;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
806 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
807 _local_interfaces->at_put(index, interf());
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
808 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
809
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
810 if (!_need_verify || length <= 1) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
811 return _local_interfaces;
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
812 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
813
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
814 // Check if there's any duplicates in interfaces
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
815 ResourceMark rm(THREAD);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
816 NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD(
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
817 THREAD, NameSigHash*, HASH_ROW_SIZE);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
818 initialize_hashtable(interface_names);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
819 bool dup = false;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
820 {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
821 debug_only(No_Safepoint_Verifier nsv;)
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
822 for (index = 0; index < length; index++) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
823 Klass* k = _local_interfaces->at(index);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
824 Symbol* name = InstanceKlass::cast(k)->name();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
825 // If no duplicates, add (name, NULL) in hashtable interface_names.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
826 if (!put_after_lookup(name, NULL, interface_names)) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
827 dup = true;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
828 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
829 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
830 }
a61af66fc99e Initial load
duke
parents:
diff changeset
831 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
832 if (dup) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
833 classfile_parse_error("Duplicate interface name in class file %s", CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
834 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
835 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
836 return _local_interfaces;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
837 }
a61af66fc99e Initial load
duke
parents:
diff changeset
838
a61af66fc99e Initial load
duke
parents:
diff changeset
839
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
840 void ClassFileParser::verify_constantvalue(int constantvalue_index, int signature_index, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
841 // Make sure the constant pool entry is of a type appropriate to this field
a61af66fc99e Initial load
duke
parents:
diff changeset
842 guarantee_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
843 (constantvalue_index > 0 &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
844 constantvalue_index < _cp->length()),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
845 "Bad initial value index %u in ConstantValue attribute in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
846 constantvalue_index, CHECK);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
847 constantTag value_type = _cp->tag_at(constantvalue_index);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
848 switch ( _cp->basic_type_for_signature_at(signature_index) ) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
849 case T_LONG:
a61af66fc99e Initial load
duke
parents:
diff changeset
850 guarantee_property(value_type.is_long(), "Inconsistent constant value type in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
851 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
852 case T_FLOAT:
a61af66fc99e Initial load
duke
parents:
diff changeset
853 guarantee_property(value_type.is_float(), "Inconsistent constant value type in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
854 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
855 case T_DOUBLE:
a61af66fc99e Initial load
duke
parents:
diff changeset
856 guarantee_property(value_type.is_double(), "Inconsistent constant value type in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
857 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
858 case T_BYTE: case T_CHAR: case T_SHORT: case T_BOOLEAN: case T_INT:
a61af66fc99e Initial load
duke
parents:
diff changeset
859 guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
860 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
861 case T_OBJECT:
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
862 guarantee_property((_cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
863 && value_type.is_string()),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
864 "Bad string initial value in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
865 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
866 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
867 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
868 "Unable to set initial value %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
869 constantvalue_index, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
870 }
a61af66fc99e Initial load
duke
parents:
diff changeset
871 }
a61af66fc99e Initial load
duke
parents:
diff changeset
872
a61af66fc99e Initial load
duke
parents:
diff changeset
873
a61af66fc99e Initial load
duke
parents:
diff changeset
874 // Parse attributes for a field.
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
875 void ClassFileParser::parse_field_attributes(u2 attributes_count,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
876 bool is_static, u2 signature_index,
a61af66fc99e Initial load
duke
parents:
diff changeset
877 u2* constantvalue_index_addr,
a61af66fc99e Initial load
duke
parents:
diff changeset
878 bool* is_synthetic_addr,
a61af66fc99e Initial load
duke
parents:
diff changeset
879 u2* generic_signature_index_addr,
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
880 ClassFileParser::FieldAnnotationCollector* parsed_annotations,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
881 TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
882 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
883 assert(attributes_count > 0, "length should be greater than 0");
a61af66fc99e Initial load
duke
parents:
diff changeset
884 u2 constantvalue_index = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
885 u2 generic_signature_index = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
886 bool is_synthetic = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
887 u1* runtime_visible_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
888 int runtime_visible_annotations_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
889 u1* runtime_invisible_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
890 int runtime_invisible_annotations_length = 0;
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
891 u1* runtime_visible_type_annotations = NULL;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
892 int runtime_visible_type_annotations_length = 0;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
893 u1* runtime_invisible_type_annotations = NULL;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
894 int runtime_invisible_type_annotations_length = 0;
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
895 bool runtime_invisible_type_annotations_exists = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
896 while (attributes_count--) {
a61af66fc99e Initial load
duke
parents:
diff changeset
897 cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length
a61af66fc99e Initial load
duke
parents:
diff changeset
898 u2 attribute_name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
899 u4 attribute_length = cfs->get_u4_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
900 check_property(valid_symbol_at(attribute_name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
901 "Invalid field attribute index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
902 attribute_name_index,
a61af66fc99e Initial load
duke
parents:
diff changeset
903 CHECK);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
904 Symbol* attribute_name = _cp->symbol_at(attribute_name_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
905 if (is_static && attribute_name == vmSymbols::tag_constant_value()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
906 // ignore if non-static
a61af66fc99e Initial load
duke
parents:
diff changeset
907 if (constantvalue_index != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
908 classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
909 }
a61af66fc99e Initial load
duke
parents:
diff changeset
910 check_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
911 attribute_length == 2,
a61af66fc99e Initial load
duke
parents:
diff changeset
912 "Invalid ConstantValue field attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
913 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
914 constantvalue_index = cfs->get_u2(CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
915 if (_need_verify) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
916 verify_constantvalue(constantvalue_index, signature_index, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
917 }
a61af66fc99e Initial load
duke
parents:
diff changeset
918 } else if (attribute_name == vmSymbols::tag_synthetic()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
919 if (attribute_length != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
920 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
921 "Invalid Synthetic field attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
922 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
923 }
a61af66fc99e Initial load
duke
parents:
diff changeset
924 is_synthetic = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
925 } else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120
a61af66fc99e Initial load
duke
parents:
diff changeset
926 if (attribute_length != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
927 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
928 "Invalid Deprecated field attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
929 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
930 }
a61af66fc99e Initial load
duke
parents:
diff changeset
931 } else if (_major_version >= JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
932 if (attribute_name == vmSymbols::tag_signature()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
933 if (attribute_length != 2) {
a61af66fc99e Initial load
duke
parents:
diff changeset
934 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
935 "Wrong size %u for field's Signature attribute in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
936 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
937 }
17577
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
938 generic_signature_index = parse_generic_signature_attribute(CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
939 } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
940 runtime_visible_annotations_length = attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
941 runtime_visible_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
942 assert(runtime_visible_annotations != NULL, "null visible annotations");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
943 parse_annotations(runtime_visible_annotations,
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
944 runtime_visible_annotations_length,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
945 parsed_annotations,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
946 CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
947 cfs->skip_u1(runtime_visible_annotations_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
948 } else if (PreserveAllAnnotations && attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
949 runtime_invisible_annotations_length = attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
950 runtime_invisible_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
951 assert(runtime_invisible_annotations != NULL, "null invisible annotations");
a61af66fc99e Initial load
duke
parents:
diff changeset
952 cfs->skip_u1(runtime_invisible_annotations_length, CHECK);
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
953 } else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
954 if (runtime_visible_type_annotations != NULL) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
955 classfile_parse_error(
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
956 "Multiple RuntimeVisibleTypeAnnotations attributes for field in class file %s", CHECK);
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
957 }
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
958 runtime_visible_type_annotations_length = attribute_length;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
959 runtime_visible_type_annotations = cfs->get_u1_buffer();
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
960 assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
961 cfs->skip_u1(runtime_visible_type_annotations_length, CHECK);
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
962 } else if (attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
963 if (runtime_invisible_type_annotations_exists) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
964 classfile_parse_error(
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
965 "Multiple RuntimeInvisibleTypeAnnotations attributes for field in class file %s", CHECK);
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
966 } else {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
967 runtime_invisible_type_annotations_exists = true;
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
968 }
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
969 if (PreserveAllAnnotations) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
970 runtime_invisible_type_annotations_length = attribute_length;
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
971 runtime_invisible_type_annotations = cfs->get_u1_buffer();
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
972 assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
973 }
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
974 cfs->skip_u1(attribute_length, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
975 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
976 cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes
a61af66fc99e Initial load
duke
parents:
diff changeset
977 }
a61af66fc99e Initial load
duke
parents:
diff changeset
978 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
979 cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes
a61af66fc99e Initial load
duke
parents:
diff changeset
980 }
a61af66fc99e Initial load
duke
parents:
diff changeset
981 }
a61af66fc99e Initial load
duke
parents:
diff changeset
982
a61af66fc99e Initial load
duke
parents:
diff changeset
983 *constantvalue_index_addr = constantvalue_index;
a61af66fc99e Initial load
duke
parents:
diff changeset
984 *is_synthetic_addr = is_synthetic;
a61af66fc99e Initial load
duke
parents:
diff changeset
985 *generic_signature_index_addr = generic_signature_index;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
986 AnnotationArray* a = assemble_annotations(runtime_visible_annotations,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
987 runtime_visible_annotations_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
988 runtime_invisible_annotations,
a61af66fc99e Initial load
duke
parents:
diff changeset
989 runtime_invisible_annotations_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
990 CHECK);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
991 parsed_annotations->set_field_annotations(a);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
992 a = assemble_annotations(runtime_visible_type_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
993 runtime_visible_type_annotations_length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
994 runtime_invisible_type_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
995 runtime_invisible_type_annotations_length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
996 CHECK);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
997 parsed_annotations->set_field_type_annotations(a);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
998 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
999 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1000
a61af66fc99e Initial load
duke
parents:
diff changeset
1001
a61af66fc99e Initial load
duke
parents:
diff changeset
1002 // Field allocation types. Used for computing field offsets.
a61af66fc99e Initial load
duke
parents:
diff changeset
1003
a61af66fc99e Initial load
duke
parents:
diff changeset
1004 enum FieldAllocationType {
a61af66fc99e Initial load
duke
parents:
diff changeset
1005 STATIC_OOP, // Oops
a61af66fc99e Initial load
duke
parents:
diff changeset
1006 STATIC_BYTE, // Boolean, Byte, char
a61af66fc99e Initial load
duke
parents:
diff changeset
1007 STATIC_SHORT, // shorts
a61af66fc99e Initial load
duke
parents:
diff changeset
1008 STATIC_WORD, // ints
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1009 STATIC_DOUBLE, // aligned long or double
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1010 NONSTATIC_OOP,
a61af66fc99e Initial load
duke
parents:
diff changeset
1011 NONSTATIC_BYTE,
a61af66fc99e Initial load
duke
parents:
diff changeset
1012 NONSTATIC_SHORT,
a61af66fc99e Initial load
duke
parents:
diff changeset
1013 NONSTATIC_WORD,
a61af66fc99e Initial load
duke
parents:
diff changeset
1014 NONSTATIC_DOUBLE,
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1015 MAX_FIELD_ALLOCATION_TYPE,
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1016 BAD_ALLOCATION_TYPE = -1
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1017 };
a61af66fc99e Initial load
duke
parents:
diff changeset
1018
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1019 static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1020 BAD_ALLOCATION_TYPE, // 0
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1021 BAD_ALLOCATION_TYPE, // 1
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1022 BAD_ALLOCATION_TYPE, // 2
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1023 BAD_ALLOCATION_TYPE, // 3
6848
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1024 NONSTATIC_BYTE , // T_BOOLEAN = 4,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1025 NONSTATIC_SHORT, // T_CHAR = 5,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1026 NONSTATIC_WORD, // T_FLOAT = 6,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1027 NONSTATIC_DOUBLE, // T_DOUBLE = 7,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1028 NONSTATIC_BYTE, // T_BYTE = 8,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1029 NONSTATIC_SHORT, // T_SHORT = 9,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1030 NONSTATIC_WORD, // T_INT = 10,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1031 NONSTATIC_DOUBLE, // T_LONG = 11,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1032 NONSTATIC_OOP, // T_OBJECT = 12,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1033 NONSTATIC_OOP, // T_ARRAY = 13,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1034 BAD_ALLOCATION_TYPE, // T_VOID = 14,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1035 BAD_ALLOCATION_TYPE, // T_ADDRESS = 15,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1036 BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1037 BAD_ALLOCATION_TYPE, // T_METADATA = 17,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1038 BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1039 BAD_ALLOCATION_TYPE, // T_CONFLICT = 19,
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1040 BAD_ALLOCATION_TYPE, // 0
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1041 BAD_ALLOCATION_TYPE, // 1
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1042 BAD_ALLOCATION_TYPE, // 2
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1043 BAD_ALLOCATION_TYPE, // 3
6848
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1044 STATIC_BYTE , // T_BOOLEAN = 4,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1045 STATIC_SHORT, // T_CHAR = 5,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1046 STATIC_WORD, // T_FLOAT = 6,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1047 STATIC_DOUBLE, // T_DOUBLE = 7,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1048 STATIC_BYTE, // T_BYTE = 8,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1049 STATIC_SHORT, // T_SHORT = 9,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1050 STATIC_WORD, // T_INT = 10,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1051 STATIC_DOUBLE, // T_LONG = 11,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1052 STATIC_OOP, // T_OBJECT = 12,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1053 STATIC_OOP, // T_ARRAY = 13,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1054 BAD_ALLOCATION_TYPE, // T_VOID = 14,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1055 BAD_ALLOCATION_TYPE, // T_ADDRESS = 15,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1056 BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1057 BAD_ALLOCATION_TYPE, // T_METADATA = 17,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1058 BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
8e47bac5643a 7054512: Compress class pointers after perm gen removal
roland
parents: 6735
diff changeset
1059 BAD_ALLOCATION_TYPE, // T_CONFLICT = 19,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1060 };
a61af66fc99e Initial load
duke
parents:
diff changeset
1061
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1062 static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1063 assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1064 FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1065 assert(result != BAD_ALLOCATION_TYPE, "bad type");
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1066 return result;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1067 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1068
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1069 class FieldAllocationCount: public ResourceObj {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1070 public:
4744
cd5d8cafcc84 7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents: 3938
diff changeset
1071 u2 count[MAX_FIELD_ALLOCATION_TYPE];
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1072
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1073 FieldAllocationCount() {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1074 for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1075 count[i] = 0;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1076 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1077 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1078
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1079 FieldAllocationType update(bool is_static, BasicType type) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1080 FieldAllocationType atype = basic_type_to_atype(is_static, type);
4744
cd5d8cafcc84 7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents: 3938
diff changeset
1081 // Make sure there is no overflow with injected fields.
cd5d8cafcc84 7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents: 3938
diff changeset
1082 assert(count[atype] < 0xFFFF, "More than 65535 fields");
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1083 count[atype]++;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1084 return atype;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1085 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1086 };
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1087
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1088 Array<u2>* ClassFileParser::parse_fields(Symbol* class_name,
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
1089 bool is_interface,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
1090 FieldAllocationCount *fac,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
1091 u2* java_fields_count_ptr, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1092 ClassFileStream* cfs = stream();
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1093 cfs->guarantee_more(2, CHECK_NULL); // length
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1094 u2 length = cfs->get_u2_fast();
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1095 *java_fields_count_ptr = length;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1096
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1097 int num_injected = 0;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1098 InjectedField* injected = JavaClasses::get_injected(class_name, &num_injected);
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1099 int total_fields = length + num_injected;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1101 // The field array starts with tuples of shorts
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1102 // [access, name index, sig index, initial value index, byte offset].
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1103 // A generic signature slot only exists for field with generic
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1104 // signature attribute. And the access flag is set with
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1105 // JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE for that field. The generic
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1106 // signature slots are at the end of the field array and after all
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1107 // other fields data.
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1108 //
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1109 // f1: [access, name index, sig index, initial value index, low_offset, high_offset]
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1110 // f2: [access, name index, sig index, initial value index, low_offset, high_offset]
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1111 // ...
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1112 // fn: [access, name index, sig index, initial value index, low_offset, high_offset]
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1113 // [generic signature index]
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1114 // [generic signature index]
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1115 // ...
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1116 //
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1117 // Allocate a temporary resource array for field data. For each field,
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1118 // a slot is reserved in the temporary array for the generic signature
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1119 // index. After parsing all fields, the data are copied to a permanent
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1120 // array and any unused slots will be discarded.
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1121 ResourceMark rm(THREAD);
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1122 u2* fa = NEW_RESOURCE_ARRAY_IN_THREAD(
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1123 THREAD, u2, total_fields * (FieldInfo::field_slots + 1));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1124
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1125 // The generic signature slots start after all other fields' data.
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1126 int generic_signature_slot = total_fields * FieldInfo::field_slots;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1127 int num_generic_signature = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1128 for (int n = 0; n < length; n++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1129 cfs->guarantee_more(8, CHECK_NULL); // access_flags, name_index, descriptor_index, attributes_count
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1130
a61af66fc99e Initial load
duke
parents:
diff changeset
1131 AccessFlags access_flags;
a61af66fc99e Initial load
duke
parents:
diff changeset
1132 jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS;
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1133 verify_legal_field_modifiers(flags, is_interface, CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1134 access_flags.set_flags(flags);
a61af66fc99e Initial load
duke
parents:
diff changeset
1135
a61af66fc99e Initial load
duke
parents:
diff changeset
1136 u2 name_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1137 int cp_size = _cp->length();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1138 check_property(valid_symbol_at(name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1139 "Invalid constant pool index %u for field name in class file %s",
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1140 name_index,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1141 CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1142 Symbol* name = _cp->symbol_at(name_index);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1143 verify_legal_field_name(name, CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1144
a61af66fc99e Initial load
duke
parents:
diff changeset
1145 u2 signature_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1146 check_property(valid_symbol_at(signature_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1147 "Invalid constant pool index %u for field signature in class file %s",
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1148 signature_index, CHECK_NULL);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1149 Symbol* sig = _cp->symbol_at(signature_index);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1150 verify_legal_field_signature(name, sig, CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1151
a61af66fc99e Initial load
duke
parents:
diff changeset
1152 u2 constantvalue_index = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
1153 bool is_synthetic = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
1154 u2 generic_signature_index = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
1155 bool is_static = access_flags.is_static();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1156 FieldAnnotationCollector parsed_annotations(_loader_data);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1157
a61af66fc99e Initial load
duke
parents:
diff changeset
1158 u2 attributes_count = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1159 if (attributes_count > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1160 parse_field_attributes(attributes_count, is_static, signature_index,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1161 &constantvalue_index, &is_synthetic,
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1162 &generic_signature_index, &parsed_annotations,
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1163 CHECK_NULL);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1164 if (parsed_annotations.field_annotations() != NULL) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1165 if (_fields_annotations == NULL) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1166 _fields_annotations = MetadataFactory::new_array<AnnotationArray*>(
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1167 _loader_data, length, NULL,
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1168 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1169 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1170 _fields_annotations->at_put(n, parsed_annotations.field_annotations());
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1171 parsed_annotations.set_field_annotations(NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1172 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1173 if (parsed_annotations.field_type_annotations() != NULL) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1174 if (_fields_type_annotations == NULL) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1175 _fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>(
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1176 _loader_data, length, NULL,
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
1177 CHECK_NULL);
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
1178 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1179 _fields_type_annotations->at_put(n, parsed_annotations.field_type_annotations());
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1180 parsed_annotations.set_field_type_annotations(NULL);
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
1181 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1182
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1183 if (is_synthetic) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1184 access_flags.set_is_synthetic();
a61af66fc99e Initial load
duke
parents:
diff changeset
1185 }
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1186 if (generic_signature_index != 0) {
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1187 access_flags.set_field_has_generic_signature();
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1188 fa[generic_signature_slot] = generic_signature_index;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1189 generic_signature_slot ++;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1190 num_generic_signature ++;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1191 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1192 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1193
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1194 FieldInfo* field = FieldInfo::from_field_array(fa, n);
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1195 field->initialize(access_flags.as_short(),
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1196 name_index,
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1197 signature_index,
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1198 constantvalue_index);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1199 BasicType type = _cp->basic_type_for_signature_at(signature_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1200
a61af66fc99e Initial load
duke
parents:
diff changeset
1201 // Remember how many oops we encountered and compute allocation type
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1202 FieldAllocationType atype = fac->update(is_static, type);
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1203 field->set_allocation_type(atype);
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1204
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1205 // After field is initialized with type, we can augment it with aux info
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1206 if (parsed_annotations.has_any_annotations())
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1207 parsed_annotations.apply_to(field);
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1208 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1209
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1210 int index = length;
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1211 if (num_injected != 0) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1212 for (int n = 0; n < num_injected; n++) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1213 // Check for duplicates
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1214 if (injected[n].may_be_java) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1215 Symbol* name = injected[n].name();
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1216 Symbol* signature = injected[n].signature();
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1217 bool duplicate = false;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1218 for (int i = 0; i < length; i++) {
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1219 FieldInfo* f = FieldInfo::from_field_array(fa, i);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1220 if (name == _cp->symbol_at(f->name_index()) &&
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1221 signature == _cp->symbol_at(f->signature_index())) {
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1222 // Symbol is desclared in Java so skip this one
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1223 duplicate = true;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1224 break;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1225 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1226 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1227 if (duplicate) {
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1228 // These will be removed from the field array at the end
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1229 continue;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1230 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1231 }
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1232
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1233 // Injected field
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1234 FieldInfo* field = FieldInfo::from_field_array(fa, index);
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1235 field->initialize(JVM_ACC_FIELD_INTERNAL,
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1236 injected[n].name_index,
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1237 injected[n].signature_index,
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1238 0);
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1239
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1240 BasicType type = FieldType::basic_type(injected[n].signature());
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1241
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1242 // Remember how many oops we encountered and compute allocation type
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1243 FieldAllocationType atype = fac->update(false, type);
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1244 field->set_allocation_type(atype);
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1245 index++;
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1246 }
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1247 }
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1248
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1249 // Now copy the fields' data from the temporary resource array.
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1250 // Sometimes injected fields already exist in the Java source so
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1251 // the fields array could be too long. In that case the
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1252 // fields array is trimed. Also unused slots that were reserved
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1253 // for generic signature indexes are discarded.
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1254 Array<u2>* fields = MetadataFactory::new_array<u2>(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1255 _loader_data, index * FieldInfo::field_slots + num_generic_signature,
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1256 CHECK_NULL);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1257 _fields = fields; // save in case of error
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1258 {
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1259 int i = 0;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1260 for (; i < index * FieldInfo::field_slots; i++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1261 fields->at_put(i, fa[i]);
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1262 }
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1263 for (int j = total_fields * FieldInfo::field_slots;
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1264 j < generic_signature_slot; j++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1265 fields->at_put(i++, fa[j]);
6100
71afdabfd05b 7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents: 6038
diff changeset
1266 }
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1267 assert(i == fields->length(), "");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1268 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1269
a61af66fc99e Initial load
duke
parents:
diff changeset
1270 if (_need_verify && length > 1) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1271 // Check duplicated fields
a61af66fc99e Initial load
duke
parents:
diff changeset
1272 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
1273 NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
1274 THREAD, NameSigHash*, HASH_ROW_SIZE);
a61af66fc99e Initial load
duke
parents:
diff changeset
1275 initialize_hashtable(names_and_sigs);
a61af66fc99e Initial load
duke
parents:
diff changeset
1276 bool dup = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
1277 {
a61af66fc99e Initial load
duke
parents:
diff changeset
1278 debug_only(No_Safepoint_Verifier nsv;)
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1279 for (AllFieldStream fs(fields, _cp); !fs.done(); fs.next()) {
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1280 Symbol* name = fs.name();
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
1281 Symbol* sig = fs.signature();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1282 // If no duplicates, add name/signature in hashtable names_and_sigs.
a61af66fc99e Initial load
duke
parents:
diff changeset
1283 if (!put_after_lookup(name, sig, names_and_sigs)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1284 dup = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
1285 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
1286 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1287 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1288 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1289 if (dup) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1290 classfile_parse_error("Duplicate field name&signature in class file %s",
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1291 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1292 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1293 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1294
a61af66fc99e Initial load
duke
parents:
diff changeset
1295 return fields;
a61af66fc99e Initial load
duke
parents:
diff changeset
1296 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1297
a61af66fc99e Initial load
duke
parents:
diff changeset
1298
a61af66fc99e Initial load
duke
parents:
diff changeset
1299 static void copy_u2_with_conversion(u2* dest, u2* src, int length) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1300 while (length-- > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1301 *dest++ = Bytes::get_Java_u2((u1*) (src++));
a61af66fc99e Initial load
duke
parents:
diff changeset
1302 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1303 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1304
a61af66fc99e Initial load
duke
parents:
diff changeset
1305
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1306 u2* ClassFileParser::parse_exception_table(u4 code_length,
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1307 u4 exception_table_length,
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1308 TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1309 ClassFileStream* cfs = stream();
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1310
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1311 u2* exception_table_start = cfs->get_u2_buffer();
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1312 assert(exception_table_start != NULL, "null exception table");
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1313 cfs->guarantee_more(8 * exception_table_length, CHECK_NULL); // start_pc, end_pc, handler_pc, catch_type_index
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1314 // Will check legal target after parsing code array in verifier.
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1315 if (_need_verify) {
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1316 for (unsigned int i = 0; i < exception_table_length; i++) {
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1317 u2 start_pc = cfs->get_u2_fast();
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1318 u2 end_pc = cfs->get_u2_fast();
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1319 u2 handler_pc = cfs->get_u2_fast();
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1320 u2 catch_type_index = cfs->get_u2_fast();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1321 guarantee_property((start_pc < end_pc) && (end_pc <= code_length),
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1322 "Illegal exception table range in class file %s",
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1323 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1324 guarantee_property(handler_pc < code_length,
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1325 "Illegal exception table handler in class file %s",
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1326 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1327 if (catch_type_index != 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1328 guarantee_property(valid_klass_reference_at(catch_type_index),
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1329 "Catch type in exception table has bad constant type in class file %s", CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1330 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1331 }
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1332 } else {
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1333 cfs->skip_u2_fast(exception_table_length * 4);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1334 }
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
1335 return exception_table_start;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1336 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1337
a61af66fc99e Initial load
duke
parents:
diff changeset
1338 void ClassFileParser::parse_linenumber_table(
a61af66fc99e Initial load
duke
parents:
diff changeset
1339 u4 code_attribute_length, u4 code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1340 CompressedLineNumberWriteStream** write_stream, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1341 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
1342 unsigned int num_entries = cfs->get_u2(CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1343
a61af66fc99e Initial load
duke
parents:
diff changeset
1344 // Each entry is a u2 start_pc, and a u2 line_number
a61af66fc99e Initial load
duke
parents:
diff changeset
1345 unsigned int length_in_bytes = num_entries * (sizeof(u2) + sizeof(u2));
a61af66fc99e Initial load
duke
parents:
diff changeset
1346
a61af66fc99e Initial load
duke
parents:
diff changeset
1347 // Verify line number attribute and table length
a61af66fc99e Initial load
duke
parents:
diff changeset
1348 check_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
1349 code_attribute_length == sizeof(u2) + length_in_bytes,
a61af66fc99e Initial load
duke
parents:
diff changeset
1350 "LineNumberTable attribute has wrong length in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1351
a61af66fc99e Initial load
duke
parents:
diff changeset
1352 cfs->guarantee_more(length_in_bytes, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1353
a61af66fc99e Initial load
duke
parents:
diff changeset
1354 if ((*write_stream) == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1355 if (length_in_bytes > fixed_buffer_size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1356 (*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes);
a61af66fc99e Initial load
duke
parents:
diff changeset
1357 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1358 (*write_stream) = new CompressedLineNumberWriteStream(
a61af66fc99e Initial load
duke
parents:
diff changeset
1359 linenumbertable_buffer, fixed_buffer_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
1360 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1361 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1362
a61af66fc99e Initial load
duke
parents:
diff changeset
1363 while (num_entries-- > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1364 u2 bci = cfs->get_u2_fast(); // start_pc
a61af66fc99e Initial load
duke
parents:
diff changeset
1365 u2 line = cfs->get_u2_fast(); // line_number
a61af66fc99e Initial load
duke
parents:
diff changeset
1366 guarantee_property(bci < code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1367 "Invalid pc in LineNumberTable in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1368 (*write_stream)->write_pair(bci, line);
a61af66fc99e Initial load
duke
parents:
diff changeset
1369 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1370 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1371
a61af66fc99e Initial load
duke
parents:
diff changeset
1372
a61af66fc99e Initial load
duke
parents:
diff changeset
1373 // Class file LocalVariableTable elements.
a61af66fc99e Initial load
duke
parents:
diff changeset
1374 class Classfile_LVT_Element VALUE_OBJ_CLASS_SPEC {
a61af66fc99e Initial load
duke
parents:
diff changeset
1375 public:
a61af66fc99e Initial load
duke
parents:
diff changeset
1376 u2 start_bci;
a61af66fc99e Initial load
duke
parents:
diff changeset
1377 u2 length;
a61af66fc99e Initial load
duke
parents:
diff changeset
1378 u2 name_cp_index;
a61af66fc99e Initial load
duke
parents:
diff changeset
1379 u2 descriptor_cp_index;
a61af66fc99e Initial load
duke
parents:
diff changeset
1380 u2 slot;
a61af66fc99e Initial load
duke
parents:
diff changeset
1381 };
a61af66fc99e Initial load
duke
parents:
diff changeset
1382
a61af66fc99e Initial load
duke
parents:
diff changeset
1383
6197
d2a62e0f25eb 6995781: Native Memory Tracking (Phase 1)
zgu
parents: 6100
diff changeset
1384 class LVT_Hash: public CHeapObj<mtClass> {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1385 public:
a61af66fc99e Initial load
duke
parents:
diff changeset
1386 LocalVariableTableElement *_elem; // element
a61af66fc99e Initial load
duke
parents:
diff changeset
1387 LVT_Hash* _next; // Next entry in hash table
a61af66fc99e Initial load
duke
parents:
diff changeset
1388 };
a61af66fc99e Initial load
duke
parents:
diff changeset
1389
a61af66fc99e Initial load
duke
parents:
diff changeset
1390 unsigned int hash(LocalVariableTableElement *elem) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1391 unsigned int raw_hash = elem->start_bci;
a61af66fc99e Initial load
duke
parents:
diff changeset
1392
a61af66fc99e Initial load
duke
parents:
diff changeset
1393 raw_hash = elem->length + raw_hash * 37;
a61af66fc99e Initial load
duke
parents:
diff changeset
1394 raw_hash = elem->name_cp_index + raw_hash * 37;
a61af66fc99e Initial load
duke
parents:
diff changeset
1395 raw_hash = elem->slot + raw_hash * 37;
a61af66fc99e Initial load
duke
parents:
diff changeset
1396
a61af66fc99e Initial load
duke
parents:
diff changeset
1397 return raw_hash % HASH_ROW_SIZE;
a61af66fc99e Initial load
duke
parents:
diff changeset
1398 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1399
a61af66fc99e Initial load
duke
parents:
diff changeset
1400 void initialize_hashtable(LVT_Hash** table) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1401 for (int i = 0; i < HASH_ROW_SIZE; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1402 table[i] = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
1403 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1404 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1405
a61af66fc99e Initial load
duke
parents:
diff changeset
1406 void clear_hashtable(LVT_Hash** table) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1407 for (int i = 0; i < HASH_ROW_SIZE; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1408 LVT_Hash* current = table[i];
a61af66fc99e Initial load
duke
parents:
diff changeset
1409 LVT_Hash* next;
a61af66fc99e Initial load
duke
parents:
diff changeset
1410 while (current != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1411 next = current->_next;
a61af66fc99e Initial load
duke
parents:
diff changeset
1412 current->_next = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
1413 delete(current);
a61af66fc99e Initial load
duke
parents:
diff changeset
1414 current = next;
a61af66fc99e Initial load
duke
parents:
diff changeset
1415 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1416 table[i] = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
1417 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1418 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1419
a61af66fc99e Initial load
duke
parents:
diff changeset
1420 LVT_Hash* LVT_lookup(LocalVariableTableElement *elem, int index, LVT_Hash** table) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1421 LVT_Hash* entry = table[index];
a61af66fc99e Initial load
duke
parents:
diff changeset
1422
a61af66fc99e Initial load
duke
parents:
diff changeset
1423 /*
a61af66fc99e Initial load
duke
parents:
diff changeset
1424 * 3-tuple start_bci/length/slot has to be unique key,
a61af66fc99e Initial load
duke
parents:
diff changeset
1425 * so the following comparison seems to be redundant:
a61af66fc99e Initial load
duke
parents:
diff changeset
1426 * && elem->name_cp_index == entry->_elem->name_cp_index
a61af66fc99e Initial load
duke
parents:
diff changeset
1427 */
a61af66fc99e Initial load
duke
parents:
diff changeset
1428 while (entry != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1429 if (elem->start_bci == entry->_elem->start_bci
a61af66fc99e Initial load
duke
parents:
diff changeset
1430 && elem->length == entry->_elem->length
a61af66fc99e Initial load
duke
parents:
diff changeset
1431 && elem->name_cp_index == entry->_elem->name_cp_index
a61af66fc99e Initial load
duke
parents:
diff changeset
1432 && elem->slot == entry->_elem->slot
a61af66fc99e Initial load
duke
parents:
diff changeset
1433 ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1434 return entry;
a61af66fc99e Initial load
duke
parents:
diff changeset
1435 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1436 entry = entry->_next;
a61af66fc99e Initial load
duke
parents:
diff changeset
1437 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1438 return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
1439 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1440
a61af66fc99e Initial load
duke
parents:
diff changeset
1441 // Return false if the local variable is found in table.
a61af66fc99e Initial load
duke
parents:
diff changeset
1442 // Return true if no duplicate is found.
a61af66fc99e Initial load
duke
parents:
diff changeset
1443 // And local variable is added as a new entry in table.
a61af66fc99e Initial load
duke
parents:
diff changeset
1444 bool LVT_put_after_lookup(LocalVariableTableElement *elem, LVT_Hash** table) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1445 // First lookup for duplicates
a61af66fc99e Initial load
duke
parents:
diff changeset
1446 int index = hash(elem);
a61af66fc99e Initial load
duke
parents:
diff changeset
1447 LVT_Hash* entry = LVT_lookup(elem, index, table);
a61af66fc99e Initial load
duke
parents:
diff changeset
1448
a61af66fc99e Initial load
duke
parents:
diff changeset
1449 if (entry != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1450 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
1451 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1452 // No duplicate is found, allocate a new entry and fill it.
a61af66fc99e Initial load
duke
parents:
diff changeset
1453 if ((entry = new LVT_Hash()) == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1454 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
1455 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1456 entry->_elem = elem;
a61af66fc99e Initial load
duke
parents:
diff changeset
1457
a61af66fc99e Initial load
duke
parents:
diff changeset
1458 // Insert into hash table
a61af66fc99e Initial load
duke
parents:
diff changeset
1459 entry->_next = table[index];
a61af66fc99e Initial load
duke
parents:
diff changeset
1460 table[index] = entry;
a61af66fc99e Initial load
duke
parents:
diff changeset
1461
a61af66fc99e Initial load
duke
parents:
diff changeset
1462 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
1463 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1464
a61af66fc99e Initial load
duke
parents:
diff changeset
1465 void copy_lvt_element(Classfile_LVT_Element *src, LocalVariableTableElement *lvt) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1466 lvt->start_bci = Bytes::get_Java_u2((u1*) &src->start_bci);
a61af66fc99e Initial load
duke
parents:
diff changeset
1467 lvt->length = Bytes::get_Java_u2((u1*) &src->length);
a61af66fc99e Initial load
duke
parents:
diff changeset
1468 lvt->name_cp_index = Bytes::get_Java_u2((u1*) &src->name_cp_index);
a61af66fc99e Initial load
duke
parents:
diff changeset
1469 lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index);
a61af66fc99e Initial load
duke
parents:
diff changeset
1470 lvt->signature_cp_index = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
1471 lvt->slot = Bytes::get_Java_u2((u1*) &src->slot);
a61af66fc99e Initial load
duke
parents:
diff changeset
1472 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1473
a61af66fc99e Initial load
duke
parents:
diff changeset
1474 // Function is used to parse both attributes:
a61af66fc99e Initial load
duke
parents:
diff changeset
1475 // LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT)
a61af66fc99e Initial load
duke
parents:
diff changeset
1476 u2* ClassFileParser::parse_localvariable_table(u4 code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1477 u2 max_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
1478 u4 code_attribute_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1479 u2* localvariable_table_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1480 bool isLVTT,
a61af66fc99e Initial load
duke
parents:
diff changeset
1481 TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1482 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
1483 const char * tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable";
a61af66fc99e Initial load
duke
parents:
diff changeset
1484 *localvariable_table_length = cfs->get_u2(CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1485 unsigned int size = (*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2);
a61af66fc99e Initial load
duke
parents:
diff changeset
1486 // Verify local variable table attribute has right length
a61af66fc99e Initial load
duke
parents:
diff changeset
1487 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1488 guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)),
a61af66fc99e Initial load
duke
parents:
diff changeset
1489 "%s has wrong length in class file %s", tbl_name, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1490 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1491 u2* localvariable_table_start = cfs->get_u2_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
1492 assert(localvariable_table_start != NULL, "null local variable table");
a61af66fc99e Initial load
duke
parents:
diff changeset
1493 if (!_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1494 cfs->skip_u2_fast(size);
a61af66fc99e Initial load
duke
parents:
diff changeset
1495 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1496 cfs->guarantee_more(size * 2, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1497 for(int i = 0; i < (*localvariable_table_length); i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1498 u2 start_pc = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1499 u2 length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1500 u2 name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1501 u2 descriptor_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1502 u2 index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1503 // Assign to a u4 to avoid overflow
a61af66fc99e Initial load
duke
parents:
diff changeset
1504 u4 end_pc = (u4)start_pc + (u4)length;
a61af66fc99e Initial load
duke
parents:
diff changeset
1505
a61af66fc99e Initial load
duke
parents:
diff changeset
1506 if (start_pc >= code_length) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1507 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
1508 "Invalid start_pc %u in %s in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1509 start_pc, tbl_name, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1510 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1511 if (end_pc > code_length) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1512 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
1513 "Invalid length %u in %s in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1514 length, tbl_name, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1515 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1516 int cp_size = _cp->length();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1517 guarantee_property(valid_symbol_at(name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1518 "Name index %u in %s has bad constant type in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1519 name_index, tbl_name, CHECK_NULL);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1520 guarantee_property(valid_symbol_at(descriptor_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1521 "Signature index %u in %s has bad constant type in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1522 descriptor_index, tbl_name, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1523
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1524 Symbol* name = _cp->symbol_at(name_index);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1525 Symbol* sig = _cp->symbol_at(descriptor_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1526 verify_legal_field_name(name, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1527 u2 extra_slot = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
1528 if (!isLVTT) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1529 verify_legal_field_signature(name, sig, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1530
a61af66fc99e Initial load
duke
parents:
diff changeset
1531 // 4894874: check special cases for double and long local variables
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
1532 if (sig == vmSymbols::type_signature(T_DOUBLE) ||
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
1533 sig == vmSymbols::type_signature(T_LONG)) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1534 extra_slot = 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
1535 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1536 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1537 guarantee_property((index + extra_slot) < max_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
1538 "Invalid index %u in %s in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1539 index, tbl_name, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1540 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1541 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1542 return localvariable_table_start;
a61af66fc99e Initial load
duke
parents:
diff changeset
1543 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1544
a61af66fc99e Initial load
duke
parents:
diff changeset
1545
a61af66fc99e Initial load
duke
parents:
diff changeset
1546 void ClassFileParser::parse_type_array(u2 array_length, u4 code_length, u4* u1_index, u4* u2_index,
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1547 u1* u1_array, u2* u2_array, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1548 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
1549 u2 index = 0; // index in the array with long/double occupying two slots
a61af66fc99e Initial load
duke
parents:
diff changeset
1550 u4 i1 = *u1_index;
a61af66fc99e Initial load
duke
parents:
diff changeset
1551 u4 i2 = *u2_index + 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
1552 for(int i = 0; i < array_length; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1553 u1 tag = u1_array[i1++] = cfs->get_u1(CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1554 index++;
a61af66fc99e Initial load
duke
parents:
diff changeset
1555 if (tag == ITEM_Long || tag == ITEM_Double) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1556 index++;
a61af66fc99e Initial load
duke
parents:
diff changeset
1557 } else if (tag == ITEM_Object) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1558 u2 class_index = u2_array[i2++] = cfs->get_u2(CHECK);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1559 guarantee_property(valid_klass_reference_at(class_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1560 "Bad class index %u in StackMap in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1561 class_index, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1562 } else if (tag == ITEM_Uninitialized) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1563 u2 offset = u2_array[i2++] = cfs->get_u2(CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1564 guarantee_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
1565 offset < code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1566 "Bad uninitialized type offset %u in StackMap in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1567 offset, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1568 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1569 guarantee_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
1570 tag <= (u1)ITEM_Uninitialized,
a61af66fc99e Initial load
duke
parents:
diff changeset
1571 "Unknown variable type %u in StackMap in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1572 tag, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
1573 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1574 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1575 u2_array[*u2_index] = index;
a61af66fc99e Initial load
duke
parents:
diff changeset
1576 *u1_index = i1;
a61af66fc99e Initial load
duke
parents:
diff changeset
1577 *u2_index = i2;
a61af66fc99e Initial load
duke
parents:
diff changeset
1578 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1579
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1580 u1* ClassFileParser::parse_stackmap_table(
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1581 u4 code_attribute_length, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1582 if (code_attribute_length == 0)
a61af66fc99e Initial load
duke
parents:
diff changeset
1583 return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
1584
a61af66fc99e Initial load
duke
parents:
diff changeset
1585 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
1586 u1* stackmap_table_start = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
1587 assert(stackmap_table_start != NULL, "null stackmap table");
a61af66fc99e Initial load
duke
parents:
diff changeset
1588
a61af66fc99e Initial load
duke
parents:
diff changeset
1589 // check code_attribute_length first
a61af66fc99e Initial load
duke
parents:
diff changeset
1590 stream()->skip_u1(code_attribute_length, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1591
a61af66fc99e Initial load
duke
parents:
diff changeset
1592 if (!_need_verify && !DumpSharedSpaces) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1593 return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
1594 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1595 return stackmap_table_start;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1596 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1597
a61af66fc99e Initial load
duke
parents:
diff changeset
1598 u2* ClassFileParser::parse_checked_exceptions(u2* checked_exceptions_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
1599 u4 method_attribute_length,
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1600 TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1601 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
1602 cfs->guarantee_more(2, CHECK_NULL); // checked_exceptions_length
a61af66fc99e Initial load
duke
parents:
diff changeset
1603 *checked_exceptions_length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1604 unsigned int size = (*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2);
a61af66fc99e Initial load
duke
parents:
diff changeset
1605 u2* checked_exceptions_start = cfs->get_u2_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
1606 assert(checked_exceptions_start != NULL, "null checked exceptions");
a61af66fc99e Initial load
duke
parents:
diff changeset
1607 if (!_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1608 cfs->skip_u2_fast(size);
a61af66fc99e Initial load
duke
parents:
diff changeset
1609 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
1610 // Verify each value in the checked exception table
a61af66fc99e Initial load
duke
parents:
diff changeset
1611 u2 checked_exception;
a61af66fc99e Initial load
duke
parents:
diff changeset
1612 u2 len = *checked_exceptions_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
1613 cfs->guarantee_more(2 * len, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1614 for (int i = 0; i < len; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1615 checked_exception = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
1616 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1617 valid_klass_reference_at(checked_exception),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1618 "Exception name has bad type at constant pool %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
1619 checked_exception, CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1620 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1621 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1622 // check exceptions attribute length
a61af66fc99e Initial load
duke
parents:
diff changeset
1623 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
1624 guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) +
a61af66fc99e Initial load
duke
parents:
diff changeset
1625 sizeof(u2) * size),
a61af66fc99e Initial load
duke
parents:
diff changeset
1626 "Exceptions attribute has wrong length in class file %s", CHECK_NULL);
a61af66fc99e Initial load
duke
parents:
diff changeset
1627 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1628 return checked_exceptions_start;
a61af66fc99e Initial load
duke
parents:
diff changeset
1629 }
a61af66fc99e Initial load
duke
parents:
diff changeset
1630
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1631 void ClassFileParser::throwIllegalSignature(
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
1632 const char* type, Symbol* name, Symbol* sig, TRAPS) {
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1633 ResourceMark rm(THREAD);
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1634 Exceptions::fthrow(THREAD_AND_LOCATION,
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1635 vmSymbols::java_lang_ClassFormatError(),
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1636 "%s \"%s\" in class %s has illegal signature \"%s\"", type,
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1637 name->as_C_string(), _class_name->as_C_string(), sig->as_C_string());
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
1638 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1639
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1640 // Skip an annotation. Return >=limit if there is any problem.
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1641 int ClassFileParser::skip_annotation(u1* buffer, int limit, int index) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1642 // annotation := atype:u2 do(nmem:u2) {member:u2 value}
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1643 // value := switch (tag:u1) { ... }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1644 index += 2; // skip atype
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1645 if ((index += 2) >= limit) return limit; // read nmem
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1646 int nmem = Bytes::get_Java_u2(buffer+index-2);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1647 while (--nmem >= 0 && index < limit) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1648 index += 2; // skip member
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1649 index = skip_annotation_value(buffer, limit, index);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1650 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1651 return index;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1652 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1653
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1654 // Skip an annotation value. Return >=limit if there is any problem.
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1655 int ClassFileParser::skip_annotation_value(u1* buffer, int limit, int index) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1656 // value := switch (tag:u1) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1657 // case B, C, I, S, Z, D, F, J, c: con:u2;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1658 // case e: e_class:u2 e_name:u2;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1659 // case s: s_con:u2;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1660 // case [: do(nval:u2) {value};
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1661 // case @: annotation;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1662 // case s: s_con:u2;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1663 // }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1664 if ((index += 1) >= limit) return limit; // read tag
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1665 u1 tag = buffer[index-1];
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1666 switch (tag) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1667 case 'B': case 'C': case 'I': case 'S': case 'Z':
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1668 case 'D': case 'F': case 'J': case 'c': case 's':
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1669 index += 2; // skip con or s_con
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1670 break;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1671 case 'e':
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1672 index += 4; // skip e_class, e_name
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1673 break;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1674 case '[':
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1675 {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1676 if ((index += 2) >= limit) return limit; // read nval
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1677 int nval = Bytes::get_Java_u2(buffer+index-2);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1678 while (--nval >= 0 && index < limit) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1679 index = skip_annotation_value(buffer, limit, index);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1680 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1681 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1682 break;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1683 case '@':
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1684 index = skip_annotation(buffer, limit, index);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1685 break;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1686 default:
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1687 assert(false, "annotation tag");
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1688 return limit; // bad tag byte
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1689 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1690 return index;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1691 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1692
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1693 // Sift through annotations, looking for those significant to the VM:
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1694 void ClassFileParser::parse_annotations(u1* buffer, int limit,
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1695 ClassFileParser::AnnotationCollector* coll,
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1696 TRAPS) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1697 // annotations := do(nann:u2) {annotation}
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1698 int index = 0;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1699 if ((index += 2) >= limit) return; // read nann
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1700 int nann = Bytes::get_Java_u2(buffer+index-2);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1701 enum { // initial annotation layout
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1702 atype_off = 0, // utf8 such as 'Ljava/lang/annotation/Retention;'
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1703 count_off = 2, // u2 such as 1 (one value)
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1704 member_off = 4, // utf8 such as 'value'
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1705 tag_off = 6, // u1 such as 'c' (type) or 'e' (enum)
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1706 e_tag_val = 'e',
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1707 e_type_off = 7, // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;'
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1708 e_con_off = 9, // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME'
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1709 e_size = 11, // end of 'e' annotation
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1710 c_tag_val = 'c', // payload is type
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1711 c_con_off = 7, // utf8 payload, such as 'I'
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1712 c_size = 9, // end of 'c' annotation
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1713 s_tag_val = 's', // payload is String
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1714 s_con_off = 7, // utf8 payload, such as 'Ljava/lang/String;'
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1715 s_size = 9,
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1716 min_size = 6 // smallest possible size (zero members)
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1717 };
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1718 while ((--nann) >= 0 && (index-2 + min_size <= limit)) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1719 int index0 = index;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1720 index = skip_annotation(buffer, limit, index);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1721 u1* abase = buffer + index0;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1722 int atype = Bytes::get_Java_u2(abase + atype_off);
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1723 int count = Bytes::get_Java_u2(abase + count_off);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1724 Symbol* aname = check_symbol_at(_cp, atype);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1725 if (aname == NULL) break; // invalid annotation name
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1726 Symbol* member = NULL;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1727 if (count >= 1) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1728 int member_index = Bytes::get_Java_u2(abase + member_off);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1729 member = check_symbol_at(_cp, member_index);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1730 if (member == NULL) break; // invalid member name
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1731 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1732
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1733 // Here is where parsing particular annotations will take place.
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1734 AnnotationCollector::ID id = coll->annotation_index(_loader_data, aname);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1735 if (id == AnnotationCollector::_unknown) continue;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1736 coll->set_annotation(id);
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1737
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1738 if (id == AnnotationCollector::_sun_misc_Contended) {
10305
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1739 // @Contended can optionally specify the contention group.
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1740 //
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1741 // Contended group defines the equivalence class over the fields:
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1742 // the fields within the same contended group are not treated distinct.
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1743 // The only exception is default group, which does not incur the
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1744 // equivalence. Naturally, contention group for classes is meaningless.
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1745 //
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1746 // While the contention group is specified as String, annotation
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1747 // values are already interned, and we might as well use the constant
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1748 // pool index as the group tag.
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1749 //
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1750 u2 group_index = 0; // default contended group
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1751 if (count == 1
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1752 && s_size == (index - index0) // match size
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1753 && s_tag_val == *(abase + tag_off)
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1754 && member == vmSymbols::value_name()) {
10305
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1755 group_index = Bytes::get_Java_u2(abase + s_con_off);
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1756 if (_cp->symbol_at(group_index)->utf8_length() == 0) {
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1757 group_index = 0; // default contended group
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1758 }
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1759 }
10305
50e9396d5257 8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents: 10303
diff changeset
1760 coll->set_contended_group(group_index);
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1761 }
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1762 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1763 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1764
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1765 ClassFileParser::AnnotationCollector::ID
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1766 ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_data,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1767 Symbol* name) {
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1768 vmSymbols::SID sid = vmSymbols::find_sid(name);
7639
22ead76da3f4 8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents: 7615
diff changeset
1769 // Privileged code can use all annotations. Other code silently drops some.
8866
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1770 const bool privileged = loader_data->is_the_null_class_loader_data() ||
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1771 loader_data->is_ext_class_loader_data() ||
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1772 loader_data->is_anonymous();
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1773 switch (sid) {
8866
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1774 case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_reflect_CallerSensitive_signature):
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1775 if (_location != _in_method) break; // only allow for methods
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1776 if (!privileged) break; // only allow in privileged code
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1777 return _method_CallerSensitive;
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1778 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1779 if (_location != _in_method) break; // only allow for methods
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1780 if (!privileged) break; // only allow in privileged code
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1781 return _method_ForceInline;
6266
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1782 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1783 if (_location != _in_method) break; // only allow for methods
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1784 if (!privileged) break; // only allow in privileged code
6266
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1785 return _method_DontInline;
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1786 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature):
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1787 if (_location != _in_method) break; // only allow for methods
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1788 if (!privileged) break; // only allow in privileged code
6266
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1789 return _method_LambdaForm_Compiled;
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1790 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature):
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1791 if (_location != _in_method) break; // only allow for methods
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1792 if (!privileged) break; // only allow in privileged code
6266
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1793 return _method_LambdaForm_Hidden;
17334
0563b652c052 Unify parsing of graal and hotspot Stable annotations
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 14909
diff changeset
1794 #ifdef GRAAL
21526
1da7aef31a08 created com.oracle.graal.hotspot.jvmci package and moved classes destined for future JVMCI module into it (JBS:GRAAL-53)
Doug Simon <doug.simon@oracle.com>
parents: 20804
diff changeset
1795 case vmSymbols::VM_SYMBOL_ENUM_NAME(com_oracle_graal_hotspot_jvmci_Stable_signature):
17334
0563b652c052 Unify parsing of graal and hotspot Stable annotations
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 14909
diff changeset
1796 if (_location != _in_field) break; // only allow for fields
17398
9e1ec84d2899 fix privileged check for Stable
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 17334
diff changeset
1797 if (!privileged && loader_data->class_loader() != SystemDictionary::graal_loader()) break; // only allow in privileged code
17334
0563b652c052 Unify parsing of graal and hotspot Stable annotations
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 14909
diff changeset
1798 return _field_Stable;
0563b652c052 Unify parsing of graal and hotspot Stable annotations
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 14909
diff changeset
1799 #endif
12333
cacc4c6bfc80 8025233: Move sun.invoke.Stable into java.lang.invoke package
vlivanov
parents: 12269
diff changeset
1800 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_Stable_signature):
12190
edb5ab0f3fe5 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 12131
diff changeset
1801 if (_location != _in_field) break; // only allow for fields
edb5ab0f3fe5 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 12131
diff changeset
1802 if (!privileged) break; // only allow in privileged code
edb5ab0f3fe5 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 12131
diff changeset
1803 return _field_Stable;
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1804 case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature):
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1805 if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1806 if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1807 return _sun_misc_Contended;
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1808 default: break;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1809 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1810 return AnnotationCollector::_unknown;
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1811 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1812
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1813 void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) {
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1814 if (is_contended())
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1815 f->set_contended_group(contended_group());
12190
edb5ab0f3fe5 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 12131
diff changeset
1816 if (is_stable())
edb5ab0f3fe5 8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents: 12131
diff changeset
1817 f->set_stable(true);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1818 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1819
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1820 ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1821 // If there's an error deallocate metadata for field annotations
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1822 MetadataFactory::free_array<u1>(_loader_data, _field_annotations);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1823 MetadataFactory::free_array<u1>(_loader_data, _field_type_annotations);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1824 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1825
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1826 void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) {
8866
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1827 if (has_annotation(_method_CallerSensitive))
16885e702c88 7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents: 8719
diff changeset
1828 m->set_caller_sensitive(true);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1829 if (has_annotation(_method_ForceInline))
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1830 m->set_force_inline(true);
6266
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1831 if (has_annotation(_method_DontInline))
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1832 m->set_dont_inline(true);
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1833 if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none)
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1834 m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm);
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1835 if (has_annotation(_method_LambdaForm_Hidden))
1d7922586cf6 7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents: 6227
diff changeset
1836 m->set_hidden(true);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1837 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1838
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1839 void ClassFileParser::ClassAnnotationCollector::apply_to(instanceKlassHandle k) {
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
1840 k->set_is_contended(is_contended());
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1841 }
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1842
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1843
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1844 #define MAX_ARGS_SIZE 255
a61af66fc99e Initial load
duke
parents:
diff changeset
1845 #define MAX_CODE_SIZE 65535
a61af66fc99e Initial load
duke
parents:
diff changeset
1846 #define INITIAL_MAX_LVT_NUMBER 256
a61af66fc99e Initial load
duke
parents:
diff changeset
1847
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1848 /* Copy class file LVT's/LVTT's into the HotSpot internal LVT.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1849 *
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1850 * Rules for LVT's and LVTT's are:
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1851 * - There can be any number of LVT's and LVTT's.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1852 * - If there are n LVT's, it is the same as if there was just
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1853 * one LVT containing all the entries from the n LVT's.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1854 * - There may be no more than one LVT entry per local variable.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1855 * Two LVT entries are 'equal' if these fields are the same:
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1856 * start_pc, length, name, slot
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1857 * - There may be no more than one LVTT entry per each LVT entry.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1858 * Each LVTT entry has to match some LVT entry.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1859 * - HotSpot internal LVT keeps natural ordering of class file LVT entries.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1860 */
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1861 void ClassFileParser::copy_localvariable_table(ConstMethod* cm,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1862 int lvt_cnt,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1863 u2* localvariable_table_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1864 u2** localvariable_table_start,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1865 int lvtt_cnt,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1866 u2* localvariable_type_table_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1867 u2** localvariable_type_table_start,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1868 TRAPS) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1869
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1870 LVT_Hash** lvt_Hash = NEW_RESOURCE_ARRAY(LVT_Hash*, HASH_ROW_SIZE);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1871 initialize_hashtable(lvt_Hash);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1872
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1873 // To fill LocalVariableTable in
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1874 Classfile_LVT_Element* cf_lvt;
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1875 LocalVariableTableElement* lvt = cm->localvariable_table_start();
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1876
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1877 for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1878 cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no];
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1879 for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1880 copy_lvt_element(&cf_lvt[idx], lvt);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1881 // If no duplicates, add LVT elem in hashtable lvt_Hash.
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1882 if (LVT_put_after_lookup(lvt, lvt_Hash) == false
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1883 && _need_verify
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1884 && _major_version >= JAVA_1_5_VERSION) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1885 clear_hashtable(lvt_Hash);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1886 classfile_parse_error("Duplicated LocalVariableTable attribute "
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1887 "entry for '%s' in class file %s",
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1888 _cp->symbol_at(lvt->name_cp_index)->as_utf8(),
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1889 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1890 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1891 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1892 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1893
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1894 // To merge LocalVariableTable and LocalVariableTypeTable
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1895 Classfile_LVT_Element* cf_lvtt;
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1896 LocalVariableTableElement lvtt_elem;
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1897
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1898 for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1899 cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no];
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1900 for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1901 copy_lvt_element(&cf_lvtt[idx], &lvtt_elem);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1902 int index = hash(&lvtt_elem);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1903 LVT_Hash* entry = LVT_lookup(&lvtt_elem, index, lvt_Hash);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1904 if (entry == NULL) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1905 if (_need_verify) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1906 clear_hashtable(lvt_Hash);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1907 classfile_parse_error("LVTT entry for '%s' in class file %s "
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1908 "does not match any LVT entry",
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1909 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1910 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1911 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1912 } else if (entry->_elem->signature_cp_index != 0 && _need_verify) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1913 clear_hashtable(lvt_Hash);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1914 classfile_parse_error("Duplicated LocalVariableTypeTable attribute "
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1915 "entry for '%s' in class file %s",
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1916 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1917 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1918 } else {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1919 // to add generic signatures into LocalVariableTable
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1920 entry->_elem->signature_cp_index = lvtt_elem.descriptor_cp_index;
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1921 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1922 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1923 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1924 clear_hashtable(lvt_Hash);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1925 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1926
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1927
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1928 void ClassFileParser::copy_method_annotations(ConstMethod* cm,
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1929 u1* runtime_visible_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1930 int runtime_visible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1931 u1* runtime_invisible_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1932 int runtime_invisible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1933 u1* runtime_visible_parameter_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1934 int runtime_visible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1935 u1* runtime_invisible_parameter_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1936 int runtime_invisible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1937 u1* runtime_visible_type_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1938 int runtime_visible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1939 u1* runtime_invisible_type_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1940 int runtime_invisible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1941 u1* annotation_default,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1942 int annotation_default_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1943 TRAPS) {
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1944
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1945 AnnotationArray* a;
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1946
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1947 if (runtime_visible_annotations_length +
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1948 runtime_invisible_annotations_length > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1949 a = assemble_annotations(runtime_visible_annotations,
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1950 runtime_visible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1951 runtime_invisible_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1952 runtime_invisible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1953 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1954 cm->set_method_annotations(a);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1955 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1956
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1957 if (runtime_visible_parameter_annotations_length +
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1958 runtime_invisible_parameter_annotations_length > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1959 a = assemble_annotations(runtime_visible_parameter_annotations,
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1960 runtime_visible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1961 runtime_invisible_parameter_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1962 runtime_invisible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1963 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1964 cm->set_parameter_annotations(a);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1965 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1966
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1967 if (annotation_default_length > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1968 a = assemble_annotations(annotation_default,
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1969 annotation_default_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1970 NULL,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1971 0,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1972 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1973 cm->set_default_annotations(a);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1974 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1975
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1976 if (runtime_visible_type_annotations_length +
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1977 runtime_invisible_type_annotations_length > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1978 a = assemble_annotations(runtime_visible_type_annotations,
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1979 runtime_visible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1980 runtime_invisible_type_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1981 runtime_invisible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1982 CHECK);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1983 cm->set_type_annotations(a);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1984 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1985 }
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1986
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
1987
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1988 // Note: the parse_method below is big and clunky because all parsing of the code and exceptions
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
1989 // attribute is inlined. This is cumbersome to avoid since we inline most of the parts in the
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
1990 // Method* to save footprint, so we only know the size of the resulting Method* when the
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1991 // entire method attribute is parsed.
a61af66fc99e Initial load
duke
parents:
diff changeset
1992 //
a61af66fc99e Initial load
duke
parents:
diff changeset
1993 // The promoted_flags parameter is used to pass relevant access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
1994 // from the method back up to the containing klass. These flag values
a61af66fc99e Initial load
duke
parents:
diff changeset
1995 // are added to klass's access_flags.
a61af66fc99e Initial load
duke
parents:
diff changeset
1996
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
1997 methodHandle ClassFileParser::parse_method(bool is_interface,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1998 AccessFlags *promoted_flags,
a61af66fc99e Initial load
duke
parents:
diff changeset
1999 TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2000 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
2001 methodHandle nullHandle;
a61af66fc99e Initial load
duke
parents:
diff changeset
2002 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
2003 // Parse fixed parts
a61af66fc99e Initial load
duke
parents:
diff changeset
2004 cfs->guarantee_more(8, CHECK_(nullHandle)); // access_flags, name_index, descriptor_index, attributes_count
a61af66fc99e Initial load
duke
parents:
diff changeset
2005
a61af66fc99e Initial load
duke
parents:
diff changeset
2006 int flags = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2007 u2 name_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2008 int cp_size = _cp->length();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2009 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2010 valid_symbol_at(name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2011 "Illegal constant pool index %u for method name in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2012 name_index, CHECK_(nullHandle));
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2013 Symbol* name = _cp->symbol_at(name_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2014 verify_legal_method_name(name, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2015
a61af66fc99e Initial load
duke
parents:
diff changeset
2016 u2 signature_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2017 guarantee_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2018 valid_symbol_at(signature_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2019 "Illegal constant pool index %u for method signature in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2020 signature_index, CHECK_(nullHandle));
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2021 Symbol* signature = _cp->symbol_at(signature_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2022
a61af66fc99e Initial load
duke
parents:
diff changeset
2023 AccessFlags access_flags;
a61af66fc99e Initial load
duke
parents:
diff changeset
2024 if (name == vmSymbols::class_initializer_name()) {
2334
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2025 // We ignore the other access flags for a valid class initializer.
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2026 // (JVM Spec 2nd ed., chapter 4.6)
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2027 if (_major_version < 51) { // backward compatibility
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2028 flags = JVM_ACC_STATIC;
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2029 } else if ((flags & JVM_ACC_STATIC) == JVM_ACC_STATIC) {
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2030 flags &= JVM_ACC_STATIC | JVM_ACC_STRICT;
dbad0519a1c4 6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents: 2226
diff changeset
2031 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2032 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2033 verify_legal_method_modifiers(flags, is_interface, name, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2034 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2035
a61af66fc99e Initial load
duke
parents:
diff changeset
2036 int args_size = -1; // only used when _need_verify is true
a61af66fc99e Initial load
duke
parents:
diff changeset
2037 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2038 args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) +
a61af66fc99e Initial load
duke
parents:
diff changeset
2039 verify_legal_method_signature(name, signature, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2040 if (args_size > MAX_ARGS_SIZE) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2041 classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2042 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2043 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2044
a61af66fc99e Initial load
duke
parents:
diff changeset
2045 access_flags.set_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS);
a61af66fc99e Initial load
duke
parents:
diff changeset
2046
a61af66fc99e Initial load
duke
parents:
diff changeset
2047 // Default values for code and exceptions attribute elements
a61af66fc99e Initial load
duke
parents:
diff changeset
2048 u2 max_stack = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2049 u2 max_locals = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2050 u4 code_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2051 u1* code_start = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2052 u2 exception_table_length = 0;
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2053 u2* exception_table_start = NULL;
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2054 Array<int>* exception_handlers = Universe::the_empty_int_array();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2055 u2 checked_exceptions_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2056 u2* checked_exceptions_start = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2057 CompressedLineNumberWriteStream* linenumber_table = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2058 int linenumber_table_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2059 int total_lvt_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2060 u2 lvt_cnt = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2061 u2 lvtt_cnt = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2062 bool lvt_allocated = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2063 u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER;
a61af66fc99e Initial load
duke
parents:
diff changeset
2064 u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER;
a61af66fc99e Initial load
duke
parents:
diff changeset
2065 u2* localvariable_table_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2066 u2** localvariable_table_start;
a61af66fc99e Initial load
duke
parents:
diff changeset
2067 u2* localvariable_type_table_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2068 u2** localvariable_type_table_start;
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2069 u2 method_parameters_length = 0;
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2070 u1* method_parameters_data = NULL;
7983
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2071 bool method_parameters_seen = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2072 bool parsed_code_attribute = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2073 bool parsed_checked_exceptions_attribute = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2074 bool parsed_stackmap_attribute = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2075 // stackmap attribute - JDK1.5
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2076 u1* stackmap_data = NULL;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2077 int stackmap_data_length = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2078 u2 generic_signature_index = 0;
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2079 MethodAnnotationCollector parsed_annotations;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2080 u1* runtime_visible_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2081 int runtime_visible_annotations_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2082 u1* runtime_invisible_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2083 int runtime_invisible_annotations_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2084 u1* runtime_visible_parameter_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2085 int runtime_visible_parameter_annotations_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2086 u1* runtime_invisible_parameter_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2087 int runtime_invisible_parameter_annotations_length = 0;
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2088 u1* runtime_visible_type_annotations = NULL;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2089 int runtime_visible_type_annotations_length = 0;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2090 u1* runtime_invisible_type_annotations = NULL;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2091 int runtime_invisible_type_annotations_length = 0;
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2092 bool runtime_invisible_type_annotations_exists = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2093 u1* annotation_default = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2094 int annotation_default_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2095
a61af66fc99e Initial load
duke
parents:
diff changeset
2096 // Parse code and exceptions attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
2097 u2 method_attributes_count = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2098 while (method_attributes_count--) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2099 cfs->guarantee_more(6, CHECK_(nullHandle)); // method_attribute_name_index, method_attribute_length
a61af66fc99e Initial load
duke
parents:
diff changeset
2100 u2 method_attribute_name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2101 u4 method_attribute_length = cfs->get_u4_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2102 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2103 valid_symbol_at(method_attribute_name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2104 "Invalid method attribute name index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2105 method_attribute_name_index, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2106
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2107 Symbol* method_attribute_name = _cp->symbol_at(method_attribute_name_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2108 if (method_attribute_name == vmSymbols::tag_code()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2109 // Parse Code attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
2110 if (_need_verify) {
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
2111 guarantee_property(
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
2112 !access_flags.is_native() && !access_flags.is_abstract(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2113 "Code attribute in native or abstract methods in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2114 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2115 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2116 if (parsed_code_attribute) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2117 classfile_parse_error("Multiple Code attributes in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2118 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2119 parsed_code_attribute = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2120
a61af66fc99e Initial load
duke
parents:
diff changeset
2121 // Stack size, locals size, and code size
a61af66fc99e Initial load
duke
parents:
diff changeset
2122 if (_major_version == 45 && _minor_version <= 2) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2123 cfs->guarantee_more(4, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2124 max_stack = cfs->get_u1_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2125 max_locals = cfs->get_u1_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2126 code_length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2127 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2128 cfs->guarantee_more(8, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2129 max_stack = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2130 max_locals = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2131 code_length = cfs->get_u4_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2132 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2133 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2134 guarantee_property(args_size <= max_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
2135 "Arguments can't fit into locals in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2136 guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE,
a61af66fc99e Initial load
duke
parents:
diff changeset
2137 "Invalid method Code length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2138 code_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2139 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2140 // Code pointer
a61af66fc99e Initial load
duke
parents:
diff changeset
2141 code_start = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2142 assert(code_start != NULL, "null code start");
a61af66fc99e Initial load
duke
parents:
diff changeset
2143 cfs->guarantee_more(code_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2144 cfs->skip_u1_fast(code_length);
a61af66fc99e Initial load
duke
parents:
diff changeset
2145
a61af66fc99e Initial load
duke
parents:
diff changeset
2146 // Exception handler table
a61af66fc99e Initial load
duke
parents:
diff changeset
2147 cfs->guarantee_more(2, CHECK_(nullHandle)); // exception_table_length
a61af66fc99e Initial load
duke
parents:
diff changeset
2148 exception_table_length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2149 if (exception_table_length > 0) {
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2150 exception_table_start =
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2151 parse_exception_table(code_length, exception_table_length, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2152 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2153
a61af66fc99e Initial load
duke
parents:
diff changeset
2154 // Parse additional attributes in code attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
2155 cfs->guarantee_more(2, CHECK_(nullHandle)); // code_attributes_count
a61af66fc99e Initial load
duke
parents:
diff changeset
2156 u2 code_attributes_count = cfs->get_u2_fast();
92
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2157
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2158 unsigned int calculated_attribute_length = 0;
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2159
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2160 if (_major_version > 45 || (_major_version == 45 && _minor_version > 2)) {
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2161 calculated_attribute_length =
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2162 sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length);
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2163 } else {
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2164 // max_stack, locals and length are smaller in pre-version 45.2 classes
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2165 calculated_attribute_length = sizeof(u1) + sizeof(u1) + sizeof(u2);
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2166 }
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2167 calculated_attribute_length +=
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2168 code_length +
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2169 sizeof(exception_table_length) +
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2170 sizeof(code_attributes_count) +
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2171 exception_table_length *
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2172 ( sizeof(u2) + // start_pc
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2173 sizeof(u2) + // end_pc
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2174 sizeof(u2) + // handler_pc
ebec5b9731e2 6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents: 0
diff changeset
2175 sizeof(u2) ); // catch_type_index
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2176
a61af66fc99e Initial load
duke
parents:
diff changeset
2177 while (code_attributes_count--) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2178 cfs->guarantee_more(6, CHECK_(nullHandle)); // code_attribute_name_index, code_attribute_length
a61af66fc99e Initial load
duke
parents:
diff changeset
2179 u2 code_attribute_name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2180 u4 code_attribute_length = cfs->get_u4_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2181 calculated_attribute_length += code_attribute_length +
a61af66fc99e Initial load
duke
parents:
diff changeset
2182 sizeof(code_attribute_name_index) +
a61af66fc99e Initial load
duke
parents:
diff changeset
2183 sizeof(code_attribute_length);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2184 check_property(valid_symbol_at(code_attribute_name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2185 "Invalid code attribute name index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2186 code_attribute_name_index,
a61af66fc99e Initial load
duke
parents:
diff changeset
2187 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2188 if (LoadLineNumberTables &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2189 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2190 // Parse and compress line number table
a61af66fc99e Initial load
duke
parents:
diff changeset
2191 parse_linenumber_table(code_attribute_length, code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2192 &linenumber_table, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2193
a61af66fc99e Initial load
duke
parents:
diff changeset
2194 } else if (LoadLocalVariableTables &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2195 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2196 // Parse local variable table
a61af66fc99e Initial load
duke
parents:
diff changeset
2197 if (!lvt_allocated) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2198 localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2199 THREAD, u2, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2200 localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2201 THREAD, u2*, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2202 localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2203 THREAD, u2, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2204 localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2205 THREAD, u2*, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2206 lvt_allocated = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2207 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2208 if (lvt_cnt == max_lvt_cnt) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2209 max_lvt_cnt <<= 1;
12922
98a2169ed7ac 8023683: Enhance class file parsing
iklam
parents: 12921
diff changeset
2210 localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
98a2169ed7ac 8023683: Enhance class file parsing
iklam
parents: 12921
diff changeset
2211 localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2212 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2213 localvariable_table_start[lvt_cnt] =
a61af66fc99e Initial load
duke
parents:
diff changeset
2214 parse_localvariable_table(code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2215 max_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
2216 code_attribute_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2217 &localvariable_table_length[lvt_cnt],
a61af66fc99e Initial load
duke
parents:
diff changeset
2218 false, // is not LVTT
a61af66fc99e Initial load
duke
parents:
diff changeset
2219 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2220 total_lvt_length += localvariable_table_length[lvt_cnt];
a61af66fc99e Initial load
duke
parents:
diff changeset
2221 lvt_cnt++;
a61af66fc99e Initial load
duke
parents:
diff changeset
2222 } else if (LoadLocalVariableTypeTables &&
a61af66fc99e Initial load
duke
parents:
diff changeset
2223 _major_version >= JAVA_1_5_VERSION &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2224 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2225 if (!lvt_allocated) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2226 localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2227 THREAD, u2, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2228 localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2229 THREAD, u2*, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2230 localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2231 THREAD, u2, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2232 localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2233 THREAD, u2*, INITIAL_MAX_LVT_NUMBER);
a61af66fc99e Initial load
duke
parents:
diff changeset
2234 lvt_allocated = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2235 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2236 // Parse local variable type table
a61af66fc99e Initial load
duke
parents:
diff changeset
2237 if (lvtt_cnt == max_lvtt_cnt) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2238 max_lvtt_cnt <<= 1;
12922
98a2169ed7ac 8023683: Enhance class file parsing
iklam
parents: 12921
diff changeset
2239 localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
98a2169ed7ac 8023683: Enhance class file parsing
iklam
parents: 12921
diff changeset
2240 localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2241 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2242 localvariable_type_table_start[lvtt_cnt] =
a61af66fc99e Initial load
duke
parents:
diff changeset
2243 parse_localvariable_table(code_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2244 max_locals,
a61af66fc99e Initial load
duke
parents:
diff changeset
2245 code_attribute_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2246 &localvariable_type_table_length[lvtt_cnt],
a61af66fc99e Initial load
duke
parents:
diff changeset
2247 true, // is LVTT
a61af66fc99e Initial load
duke
parents:
diff changeset
2248 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2249 lvtt_cnt++;
8819
36376b540a98 8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents: 8719
diff changeset
2250 } else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2251 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2252 // Stack map is only needed by the new verifier in JDK1.5.
a61af66fc99e Initial load
duke
parents:
diff changeset
2253 if (parsed_stackmap_attribute) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2254 classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2255 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2256 stackmap_data = parse_stackmap_table(code_attribute_length, CHECK_(nullHandle));
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2257 stackmap_data_length = code_attribute_length;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2258 parsed_stackmap_attribute = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2259 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2260 // Skip unknown attributes
a61af66fc99e Initial load
duke
parents:
diff changeset
2261 cfs->skip_u1(code_attribute_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2262 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2263 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2264 // check method attribute length
a61af66fc99e Initial load
duke
parents:
diff changeset
2265 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2266 guarantee_property(method_attribute_length == calculated_attribute_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2267 "Code segment has wrong length in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2268 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2269 } else if (method_attribute_name == vmSymbols::tag_exceptions()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2270 // Parse Exceptions attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
2271 if (parsed_checked_exceptions_attribute) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2272 classfile_parse_error("Multiple Exceptions attributes in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2273 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2274 parsed_checked_exceptions_attribute = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2275 checked_exceptions_start =
a61af66fc99e Initial load
duke
parents:
diff changeset
2276 parse_checked_exceptions(&checked_exceptions_length,
a61af66fc99e Initial load
duke
parents:
diff changeset
2277 method_attribute_length,
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2278 CHECK_(nullHandle));
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2279 } else if (method_attribute_name == vmSymbols::tag_method_parameters()) {
7983
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2280 // reject multiple method parameters
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2281 if (method_parameters_seen) {
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2282 classfile_parse_error("Multiple MethodParameters attributes in class file %s", CHECK_(nullHandle));
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2283 }
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2284 method_parameters_seen = true;
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2285 method_parameters_length = cfs->get_u1_fast();
10154
d1644a010f52 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 10128
diff changeset
2286 if (method_attribute_length != (method_parameters_length * 4u) + 1u) {
7983
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2287 classfile_parse_error(
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2288 "Invalid MethodParameters method attribute length %u in class file",
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2289 method_attribute_length, CHECK_(nullHandle));
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2290 }
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2291 method_parameters_data = cfs->get_u1_buffer();
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2292 cfs->skip_u2_fast(method_parameters_length);
10154
d1644a010f52 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 10128
diff changeset
2293 cfs->skip_u2_fast(method_parameters_length);
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2294 // ignore this attribute if it cannot be reflected
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2295 if (!SystemDictionary::Parameter_klass_loaded())
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2296 method_parameters_length = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2297 } else if (method_attribute_name == vmSymbols::tag_synthetic()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2298 if (method_attribute_length != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2299 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
2300 "Invalid Synthetic method attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2301 method_attribute_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2302 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2303 // Should we check that there hasn't already been a synthetic attribute?
a61af66fc99e Initial load
duke
parents:
diff changeset
2304 access_flags.set_is_synthetic();
a61af66fc99e Initial load
duke
parents:
diff changeset
2305 } else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120
a61af66fc99e Initial load
duke
parents:
diff changeset
2306 if (method_attribute_length != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2307 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
2308 "Invalid Deprecated method attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2309 method_attribute_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2310 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2311 } else if (_major_version >= JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2312 if (method_attribute_name == vmSymbols::tag_signature()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2313 if (method_attribute_length != 2) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2314 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
2315 "Invalid Signature attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2316 method_attribute_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2317 }
17577
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2318 generic_signature_index = parse_generic_signature_attribute(CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2319 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2320 runtime_visible_annotations_length = method_attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2321 runtime_visible_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2322 assert(runtime_visible_annotations != NULL, "null visible annotations");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2323 parse_annotations(runtime_visible_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2324 runtime_visible_annotations_length, &parsed_annotations,
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
2325 CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2326 cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2327 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2328 runtime_invisible_annotations_length = method_attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2329 runtime_invisible_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2330 assert(runtime_invisible_annotations != NULL, "null invisible annotations");
a61af66fc99e Initial load
duke
parents:
diff changeset
2331 cfs->skip_u1(runtime_invisible_annotations_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2332 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_parameter_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2333 runtime_visible_parameter_annotations_length = method_attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2334 runtime_visible_parameter_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2335 assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations");
a61af66fc99e Initial load
duke
parents:
diff changeset
2336 cfs->skip_u1(runtime_visible_parameter_annotations_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2337 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_parameter_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2338 runtime_invisible_parameter_annotations_length = method_attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2339 runtime_invisible_parameter_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2340 assert(runtime_invisible_parameter_annotations != NULL, "null invisible parameter annotations");
a61af66fc99e Initial load
duke
parents:
diff changeset
2341 cfs->skip_u1(runtime_invisible_parameter_annotations_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2342 } else if (method_attribute_name == vmSymbols::tag_annotation_default()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2343 annotation_default_length = method_attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2344 annotation_default = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2345 assert(annotation_default != NULL, "null annotation default");
a61af66fc99e Initial load
duke
parents:
diff changeset
2346 cfs->skip_u1(annotation_default_length, CHECK_(nullHandle));
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2347 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2348 if (runtime_visible_type_annotations != NULL) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2349 classfile_parse_error(
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2350 "Multiple RuntimeVisibleTypeAnnotations attributes for method in class file %s",
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2351 CHECK_(nullHandle));
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2352 }
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2353 runtime_visible_type_annotations_length = method_attribute_length;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2354 runtime_visible_type_annotations = cfs->get_u1_buffer();
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2355 assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2356 // No need for the VM to parse Type annotations
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2357 cfs->skip_u1(runtime_visible_type_annotations_length, CHECK_(nullHandle));
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2358 } else if (method_attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2359 if (runtime_invisible_type_annotations_exists) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2360 classfile_parse_error(
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2361 "Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s",
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2362 CHECK_(nullHandle));
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2363 } else {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2364 runtime_invisible_type_annotations_exists = true;
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2365 }
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2366 if (PreserveAllAnnotations) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2367 runtime_invisible_type_annotations_length = method_attribute_length;
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2368 runtime_invisible_type_annotations = cfs->get_u1_buffer();
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2369 assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2370 }
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2371 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2372 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2373 // Skip unknown attributes
a61af66fc99e Initial load
duke
parents:
diff changeset
2374 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2375 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2376 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2377 // Skip unknown attributes
a61af66fc99e Initial load
duke
parents:
diff changeset
2378 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2379 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2380 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2381
a61af66fc99e Initial load
duke
parents:
diff changeset
2382 if (linenumber_table != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2383 linenumber_table->write_terminator();
a61af66fc99e Initial load
duke
parents:
diff changeset
2384 linenumber_table_length = linenumber_table->position();
a61af66fc99e Initial load
duke
parents:
diff changeset
2385 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2386
a61af66fc99e Initial load
duke
parents:
diff changeset
2387 // Make sure there's at least one Code attribute in non-native/non-abstract method
a61af66fc99e Initial load
duke
parents:
diff changeset
2388 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2389 guarantee_property(access_flags.is_native() || access_flags.is_abstract() || parsed_code_attribute,
a61af66fc99e Initial load
duke
parents:
diff changeset
2390 "Absent Code attribute in method that is not native or abstract in class file %s", CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
2391 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2392
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2393 // All sizing information for a Method* is finally available, now create it
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2394 InlineTableSizes sizes(
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2395 total_lvt_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2396 linenumber_table_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2397 exception_table_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2398 checked_exceptions_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2399 method_parameters_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2400 generic_signature_index,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2401 runtime_visible_annotations_length +
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2402 runtime_invisible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2403 runtime_visible_parameter_annotations_length +
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2404 runtime_invisible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2405 runtime_visible_type_annotations_length +
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2406 runtime_invisible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2407 annotation_default_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2408 0);
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2409
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
2410 Method* m = Method::allocate(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2411 _loader_data, code_length, access_flags, &sizes,
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2412 ConstMethod::NORMAL, CHECK_(nullHandle));
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2413
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2414 ClassLoadingService::add_class_method_size(m->size()*HeapWordSize);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2415
a61af66fc99e Initial load
duke
parents:
diff changeset
2416 // Fill in information from fixed part (access_flags already set)
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2417 m->set_constants(_cp);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2418 m->set_name_index(name_index);
a61af66fc99e Initial load
duke
parents:
diff changeset
2419 m->set_signature_index(signature_index);
a61af66fc99e Initial load
duke
parents:
diff changeset
2420 #ifdef CC_INTERP
a61af66fc99e Initial load
duke
parents:
diff changeset
2421 // hmm is there a gc issue here??
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2422 ResultTypeFinder rtf(_cp->symbol_at(signature_index));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2423 m->set_result_index(rtf.type());
a61af66fc99e Initial load
duke
parents:
diff changeset
2424 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
2425
a61af66fc99e Initial load
duke
parents:
diff changeset
2426 if (args_size >= 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2427 m->set_size_of_parameters(args_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
2428 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2429 m->compute_size_of_parameters(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
2430 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2431 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
2432 if (args_size >= 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2433 m->compute_size_of_parameters(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
2434 assert(args_size == m->size_of_parameters(), "");
a61af66fc99e Initial load
duke
parents:
diff changeset
2435 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2436 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
2437
a61af66fc99e Initial load
duke
parents:
diff changeset
2438 // Fill in code attribute information
a61af66fc99e Initial load
duke
parents:
diff changeset
2439 m->set_max_stack(max_stack);
a61af66fc99e Initial load
duke
parents:
diff changeset
2440 m->set_max_locals(max_locals);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2441 if (stackmap_data != NULL) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2442 m->constMethod()->copy_stackmap_data(_loader_data, stackmap_data,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2443 stackmap_data_length, CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2444 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2445
a61af66fc99e Initial load
duke
parents:
diff changeset
2446 // Copy byte codes
1138
dd57230ba8fe 6893268: additional dynamic language related optimizations in C2
twisti
parents: 1108
diff changeset
2447 m->set_code(code_start);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2448
a61af66fc99e Initial load
duke
parents:
diff changeset
2449 // Copy line number table
a61af66fc99e Initial load
duke
parents:
diff changeset
2450 if (linenumber_table != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2451 memcpy(m->compressed_linenumber_table(),
a61af66fc99e Initial load
duke
parents:
diff changeset
2452 linenumber_table->buffer(), linenumber_table_length);
a61af66fc99e Initial load
duke
parents:
diff changeset
2453 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2454
6213
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2455 // Copy exception table
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2456 if (exception_table_length > 0) {
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2457 int size =
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2458 exception_table_length * sizeof(ExceptionTableElement) / sizeof(u2);
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2459 copy_u2_with_conversion((u2*) m->exception_table_start(),
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2460 exception_table_start, size);
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2461 }
8150fa46d2ed 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 6100
diff changeset
2462
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2463 // Copy method parameters
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2464 if (method_parameters_length > 0) {
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2465 MethodParametersElement* elem = m->constMethod()->method_parameters_start();
7983
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2466 for (int i = 0; i < method_parameters_length; i++) {
24a91505f9d5 8006949: Update hotspot for MethodParameters format change
emc
parents: 7639
diff changeset
2467 elem[i].name_cp_index = Bytes::get_Java_u2(method_parameters_data);
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2468 method_parameters_data += 2;
10154
d1644a010f52 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 10128
diff changeset
2469 elem[i].flags = Bytes::get_Java_u2(method_parameters_data);
d1644a010f52 8007154: Remove support for u4 MethodParameter flags fields
emc
parents: 10128
diff changeset
2470 method_parameters_data += 2;
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2471 }
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2472 }
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
2473
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2474 // Copy checked exceptions
a61af66fc99e Initial load
duke
parents:
diff changeset
2475 if (checked_exceptions_length > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2476 int size = checked_exceptions_length * sizeof(CheckedExceptionElement) / sizeof(u2);
a61af66fc99e Initial load
duke
parents:
diff changeset
2477 copy_u2_with_conversion((u2*) m->checked_exceptions_start(), checked_exceptions_start, size);
a61af66fc99e Initial load
duke
parents:
diff changeset
2478 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2479
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2480 // Copy class file LVT's/LVTT's into the HotSpot internal LVT.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2481 if (total_lvt_length > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2482 promoted_flags->set_has_localvariable_table();
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2483 copy_localvariable_table(m->constMethod(), lvt_cnt,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2484 localvariable_table_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2485 localvariable_table_start,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2486 lvtt_cnt,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2487 localvariable_type_table_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2488 localvariable_type_table_start, CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2489 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2490
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2491 if (parsed_annotations.has_any_annotations())
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2492 parsed_annotations.apply_to(m);
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2493
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2494 // Copy annotations
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2495 copy_method_annotations(m->constMethod(),
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2496 runtime_visible_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2497 runtime_visible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2498 runtime_invisible_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2499 runtime_invisible_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2500 runtime_visible_parameter_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2501 runtime_visible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2502 runtime_invisible_parameter_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2503 runtime_invisible_parameter_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2504 runtime_visible_type_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2505 runtime_visible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2506 runtime_invisible_type_annotations,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2507 runtime_invisible_type_annotations_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2508 annotation_default,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2509 annotation_default_length,
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2510 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2511
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
2512 if (name == vmSymbols::finalize_method_name() &&
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
2513 signature == vmSymbols::void_method_signature()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2514 if (m->is_empty_method()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2515 _has_empty_finalizer = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2516 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2517 _has_finalizer = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2518 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2519 }
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
2520 if (name == vmSymbols::object_initializer_name() &&
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
2521 signature == vmSymbols::void_method_signature() &&
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2522 m->is_vanilla_constructor()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2523 _has_vanilla_constructor = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2524 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2525
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2526 NOT_PRODUCT(m->verify());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2527 return m;
a61af66fc99e Initial load
duke
parents:
diff changeset
2528 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2529
a61af66fc99e Initial load
duke
parents:
diff changeset
2530
a61af66fc99e Initial load
duke
parents:
diff changeset
2531 // The promoted_flags parameter is used to pass relevant access_flags
a61af66fc99e Initial load
duke
parents:
diff changeset
2532 // from the methods back up to the containing klass. These flag values
a61af66fc99e Initial load
duke
parents:
diff changeset
2533 // are added to klass's access_flags.
a61af66fc99e Initial load
duke
parents:
diff changeset
2534
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2535 Array<Method*>* ClassFileParser::parse_methods(bool is_interface,
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
2536 AccessFlags* promoted_flags,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
2537 bool* has_final_method,
20576
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
2538 bool* declares_default_methods,
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
2539 TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2540 ClassFileStream* cfs = stream();
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2541 cfs->guarantee_more(2, CHECK_NULL); // length
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2542 u2 length = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2543 if (length == 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2544 _methods = Universe::the_empty_method_array();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2545 } else {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2546 _methods = MetadataFactory::new_array<Method*>(_loader_data, length, NULL, CHECK_NULL);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2547
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2548 HandleMark hm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
2549 for (int index = 0; index < length; index++) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2550 methodHandle method = parse_method(is_interface,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2551 promoted_flags,
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2552 CHECK_NULL);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2553
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2554 if (method->is_final()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2555 *has_final_method = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2556 }
20576
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
2557 // declares_default_methods: declares concrete instance methods, any access flags
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
2558 // used for interface initialization, and default method inheritance analysis
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
2559 if (is_interface && !(*declares_default_methods)
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
2560 && !method->is_abstract() && !method->is_static()) {
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
2561 *declares_default_methods = true;
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
2562 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2563 _methods->at_put(index, method());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2564 }
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2565
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2566 if (_need_verify && length > 1) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2567 // Check duplicated methods
a61af66fc99e Initial load
duke
parents:
diff changeset
2568 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
2569 NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD(
a61af66fc99e Initial load
duke
parents:
diff changeset
2570 THREAD, NameSigHash*, HASH_ROW_SIZE);
a61af66fc99e Initial load
duke
parents:
diff changeset
2571 initialize_hashtable(names_and_sigs);
a61af66fc99e Initial load
duke
parents:
diff changeset
2572 bool dup = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2573 {
a61af66fc99e Initial load
duke
parents:
diff changeset
2574 debug_only(No_Safepoint_Verifier nsv;)
a61af66fc99e Initial load
duke
parents:
diff changeset
2575 for (int i = 0; i < length; i++) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2576 Method* m = _methods->at(i);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2577 // If no duplicates, add name/signature in hashtable names_and_sigs.
a61af66fc99e Initial load
duke
parents:
diff changeset
2578 if (!put_after_lookup(m->name(), m->signature(), names_and_sigs)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2579 dup = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2580 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
2581 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2582 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2583 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2584 if (dup) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2585 classfile_parse_error("Duplicate method name&signature in class file %s",
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2586 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2587 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2588 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2589 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2590 return _methods;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2591 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2592
a61af66fc99e Initial load
duke
parents:
diff changeset
2593
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2594 intArray* ClassFileParser::sort_methods(Array<Method*>* methods) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2595 int length = methods->length();
3245
8ce625481709 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 2461
diff changeset
2596 // If JVMTI original method ordering or sharing is enabled we have to
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2597 // remember the original class file ordering.
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2598 // We temporarily use the vtable_index field in the Method* to store the
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2599 // class file index, so we can read in after calling qsort.
3245
8ce625481709 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 2461
diff changeset
2600 // Put the method ordering in the shared archive.
8ce625481709 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 2461
diff changeset
2601 if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2602 for (int index = 0; index < length; index++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2603 Method* m = methods->at(index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2604 assert(!m->valid_vtable_index(), "vtable index should not be set");
a61af66fc99e Initial load
duke
parents:
diff changeset
2605 m->set_vtable_index(index);
a61af66fc99e Initial load
duke
parents:
diff changeset
2606 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2607 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2608 // Sort method array by ascending method name (for faster lookups & vtable construction)
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
2609 // Note that the ordering is not alphabetical, see Symbol::fast_compare
8031
927a311d00f9 8007320: NPG: move method annotations
coleenp
parents: 7983
diff changeset
2610 Method::sort_methods(methods);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2611
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2612 intArray* method_ordering = NULL;
3245
8ce625481709 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 2461
diff changeset
2613 // If JVMTI original method ordering or sharing is enabled construct int
8ce625481709 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 2461
diff changeset
2614 // array remembering the original ordering
8ce625481709 7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents: 2461
diff changeset
2615 if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2616 method_ordering = new intArray(length);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2617 for (int index = 0; index < length; index++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2618 Method* m = methods->at(index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2619 int old_index = m->vtable_index();
a61af66fc99e Initial load
duke
parents:
diff changeset
2620 assert(old_index >= 0 && old_index < length, "invalid method index");
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2621 method_ordering->at_put(index, old_index);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2622 m->set_vtable_index(Method::invalid_vtable_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2623 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2624 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2625 return method_ordering;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2626 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2627
17577
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2628 // Parse generic_signature attribute for methods and fields
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2629 u2 ClassFileParser::parse_generic_signature_attribute(TRAPS) {
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2630 ClassFileStream* cfs = stream();
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2631 cfs->guarantee_more(2, CHECK_0); // generic_signature_index
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2632 u2 generic_signature_index = cfs->get_u2_fast();
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2633 check_property(
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2634 valid_symbol_at(generic_signature_index),
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2635 "Invalid Signature attribute at constant pool index %u in class file %s",
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2636 generic_signature_index, CHECK_0);
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2637 return generic_signature_index;
f0d759a6a230 8037167: Better method signature resolution
acorn
parents: 17574
diff changeset
2638 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2639
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2640 void ClassFileParser::parse_classfile_sourcefile_attribute(TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2641 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
2642 cfs->guarantee_more(2, CHECK); // sourcefile_index
a61af66fc99e Initial load
duke
parents:
diff changeset
2643 u2 sourcefile_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2644 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2645 valid_symbol_at(sourcefile_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2646 "Invalid SourceFile attribute at constant pool index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2647 sourcefile_index, CHECK);
12067
e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 11148
diff changeset
2648 set_class_sourcefile_index(sourcefile_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2649 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2650
a61af66fc99e Initial load
duke
parents:
diff changeset
2651
a61af66fc99e Initial load
duke
parents:
diff changeset
2652
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2653 void ClassFileParser::parse_classfile_source_debug_extension_attribute(int length, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2654 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
2655 u1* sde_buffer = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2656 assert(sde_buffer != NULL, "null sde buffer");
a61af66fc99e Initial load
duke
parents:
diff changeset
2657
a61af66fc99e Initial load
duke
parents:
diff changeset
2658 // Don't bother storing it if there is no way to retrieve it
a61af66fc99e Initial load
duke
parents:
diff changeset
2659 if (JvmtiExport::can_get_source_debug_extension()) {
6226
kvn
parents: 6203 6222
diff changeset
2660 assert((length+1) > length, "Overflow checking");
kvn
parents: 6203 6222
diff changeset
2661 u1* sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1);
kvn
parents: 6203 6222
diff changeset
2662 for (int i = 0; i < length; i++) {
kvn
parents: 6203 6222
diff changeset
2663 sde[i] = sde_buffer[i];
kvn
parents: 6203 6222
diff changeset
2664 }
kvn
parents: 6203 6222
diff changeset
2665 sde[length] = '\0';
kvn
parents: 6203 6222
diff changeset
2666 set_class_sde_buffer((char*)sde, length);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2667 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2668 // Got utf8 string, set stream position forward
a61af66fc99e Initial load
duke
parents:
diff changeset
2669 cfs->skip_u1(length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2670 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2671
a61af66fc99e Initial load
duke
parents:
diff changeset
2672
a61af66fc99e Initial load
duke
parents:
diff changeset
2673 // Inner classes can be static, private or protected (classic VM does this)
a61af66fc99e Initial load
duke
parents:
diff changeset
2674 #define RECOGNIZED_INNER_CLASS_MODIFIERS (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED | JVM_ACC_STATIC)
a61af66fc99e Initial load
duke
parents:
diff changeset
2675
a61af66fc99e Initial load
duke
parents:
diff changeset
2676 // Return number of classes in the inner classes attribute table
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2677 u2 ClassFileParser::parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start,
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2678 bool parsed_enclosingmethod_attribute,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2679 u2 enclosing_method_class_index,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2680 u2 enclosing_method_method_index,
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2681 TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2682 ClassFileStream* cfs = stream();
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2683 u1* current_mark = cfs->current();
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2684 u2 length = 0;
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2685 if (inner_classes_attribute_start != NULL) {
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2686 cfs->set_current(inner_classes_attribute_start);
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2687 cfs->guarantee_more(2, CHECK_0); // length
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2688 length = cfs->get_u2_fast();
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2689 }
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2690
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2691 // 4-tuples of shorts of inner classes data and 2 shorts of enclosing
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2692 // method data:
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2693 // [inner_class_info_index,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2694 // outer_class_info_index,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2695 // inner_name_index,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2696 // inner_class_access_flags,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2697 // ...
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2698 // enclosing_method_class_index,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2699 // enclosing_method_method_index]
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2700 int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2701 Array<u2>* inner_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2702 _inner_classes = inner_classes;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2703
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2704 int index = 0;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2705 int cp_size = _cp->length();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2706 cfs->guarantee_more(8 * length, CHECK_0); // 4-tuples of u2
a61af66fc99e Initial load
duke
parents:
diff changeset
2707 for (int n = 0; n < length; n++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2708 // Inner class index
a61af66fc99e Initial load
duke
parents:
diff changeset
2709 u2 inner_class_info_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2710 check_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
2711 inner_class_info_index == 0 ||
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2712 valid_klass_reference_at(inner_class_info_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2713 "inner_class_info_index %u has bad constant type in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2714 inner_class_info_index, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
2715 // Outer class index
a61af66fc99e Initial load
duke
parents:
diff changeset
2716 u2 outer_class_info_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2717 check_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
2718 outer_class_info_index == 0 ||
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2719 valid_klass_reference_at(outer_class_info_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2720 "outer_class_info_index %u has bad constant type in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2721 outer_class_info_index, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
2722 // Inner class name
a61af66fc99e Initial load
duke
parents:
diff changeset
2723 u2 inner_name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2724 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2725 inner_name_index == 0 || valid_symbol_at(inner_name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2726 "inner_name_index %u has bad constant type in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2727 inner_name_index, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
2728 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2729 guarantee_property(inner_class_info_index != outer_class_info_index,
a61af66fc99e Initial load
duke
parents:
diff changeset
2730 "Class is both outer and inner class in class file %s", CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
2731 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2732 // Access flags
a61af66fc99e Initial load
duke
parents:
diff changeset
2733 AccessFlags inner_access_flags;
a61af66fc99e Initial load
duke
parents:
diff changeset
2734 jint flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS;
a61af66fc99e Initial load
duke
parents:
diff changeset
2735 if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2736 // Set abstract bit for old class files for backward compatibility
a61af66fc99e Initial load
duke
parents:
diff changeset
2737 flags |= JVM_ACC_ABSTRACT;
a61af66fc99e Initial load
duke
parents:
diff changeset
2738 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2739 verify_legal_class_modifiers(flags, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
2740 inner_access_flags.set_flags(flags);
a61af66fc99e Initial load
duke
parents:
diff changeset
2741
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2742 inner_classes->at_put(index++, inner_class_info_index);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2743 inner_classes->at_put(index++, outer_class_info_index);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2744 inner_classes->at_put(index++, inner_name_index);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2745 inner_classes->at_put(index++, inner_access_flags.as_short());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2746 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2747
a61af66fc99e Initial load
duke
parents:
diff changeset
2748 // 4347400: make sure there's no duplicate entry in the classes array
a61af66fc99e Initial load
duke
parents:
diff changeset
2749 if (_need_verify && _major_version >= JAVA_1_5_VERSION) {
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2750 for(int i = 0; i < length * 4; i += 4) {
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2751 for(int j = i + 4; j < length * 4; j += 4) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2752 guarantee_property((inner_classes->at(i) != inner_classes->at(j) ||
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2753 inner_classes->at(i+1) != inner_classes->at(j+1) ||
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2754 inner_classes->at(i+2) != inner_classes->at(j+2) ||
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2755 inner_classes->at(i+3) != inner_classes->at(j+3)),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2756 "Duplicate entry in InnerClasses in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2757 CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
2758 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2759 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2760 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2761
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2762 // Set EnclosingMethod class and method indexes.
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2763 if (parsed_enclosingmethod_attribute) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2764 inner_classes->at_put(index++, enclosing_method_class_index);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2765 inner_classes->at_put(index++, enclosing_method_method_index);
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2766 }
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2767 assert(index == size, "wrong size");
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2768
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2769 // Restore buffer's current position.
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2770 cfs->set_current(current_mark);
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2771
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2772 return length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2773 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2774
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2775 void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) {
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2776 set_class_synthetic_flag(true);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2777 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2778
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2779 void ClassFileParser::parse_classfile_signature_attribute(TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2780 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
2781 u2 signature_index = cfs->get_u2(CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2782 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2783 valid_symbol_at(signature_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2784 "Invalid constant pool index %u in Signature attribute in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2785 signature_index, CHECK);
12067
e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 11148
diff changeset
2786 set_class_generic_signature_index(signature_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2787 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2788
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2789 void ClassFileParser::parse_classfile_bootstrap_methods_attribute(u4 attribute_byte_length, TRAPS) {
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2790 ClassFileStream* cfs = stream();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2791 u1* current_start = cfs->current();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2792
20353
72fa1e83e5f9 8051002: Incorrectly merged share/vm/classfile/classFileParser.cpp was pushed to 8u20.
lfoltan
parents: 18027
diff changeset
2793 guarantee_property(attribute_byte_length >= sizeof(u2),
17574
5f7e12f5b4e5 8036800: Attribute OOM to correct part of code
hseigel
parents: 17558
diff changeset
2794 "Invalid BootstrapMethods attribute length %u in class file %s",
5f7e12f5b4e5 8036800: Attribute OOM to correct part of code
hseigel
parents: 17558
diff changeset
2795 attribute_byte_length,
5f7e12f5b4e5 8036800: Attribute OOM to correct part of code
hseigel
parents: 17558
diff changeset
2796 CHECK);
5f7e12f5b4e5 8036800: Attribute OOM to correct part of code
hseigel
parents: 17558
diff changeset
2797
5f7e12f5b4e5 8036800: Attribute OOM to correct part of code
hseigel
parents: 17558
diff changeset
2798 cfs->guarantee_more(attribute_byte_length, CHECK);
5f7e12f5b4e5 8036800: Attribute OOM to correct part of code
hseigel
parents: 17558
diff changeset
2799
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2800 int attribute_array_length = cfs->get_u2_fast();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2801
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2802 guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2803 "Short length on BootstrapMethods in class file %s",
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2804 CHECK);
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2805
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2806 // The attribute contains a counted array of counted tuples of shorts,
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2807 // represending bootstrap specifiers:
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2808 // length*{bootstrap_method_index, argument_count*{argument_index}}
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2809 int operand_count = (attribute_byte_length - sizeof(u2)) / sizeof(u2);
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2810 // operand_count = number of shorts in attr, except for leading length
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2811
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2812 // The attribute is copied into a short[] array.
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2813 // The array begins with a series of short[2] pairs, one for each tuple.
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2814 int index_size = (attribute_array_length * 2);
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2815
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2816 Array<u2>* operands = MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2817
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2818 // Eagerly assign operands so they will be deallocated with the constant
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2819 // pool if there is an error.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2820 _cp->set_operands(operands);
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2821
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2822 int operand_fill_index = index_size;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2823 int cp_size = _cp->length();
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2824
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2825 for (int n = 0; n < attribute_array_length; n++) {
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2826 // Store a 32-bit offset into the header of the operand array.
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2827 ConstantPool::operand_offset_at_put(operands, n, operand_fill_index);
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2828
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2829 // Read a bootstrap specifier.
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2830 cfs->guarantee_more(sizeof(u2) * 2, CHECK); // bsm, argc
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2831 u2 bootstrap_method_index = cfs->get_u2_fast();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2832 u2 argument_count = cfs->get_u2_fast();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2833 check_property(
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2834 valid_cp_range(bootstrap_method_index, cp_size) &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2835 _cp->tag_at(bootstrap_method_index).is_method_handle(),
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2836 "bootstrap_method_index %u has bad constant type in class file %s",
2085
ef3c5db0b3ae 7008165: Garbage in ClassFormatError message
twisti
parents: 2011
diff changeset
2837 bootstrap_method_index,
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2838 CHECK);
18056
3b0fe4ec6ebe 8041717: Issue with class file parser
hseigel
parents: 17577
diff changeset
2839
3b0fe4ec6ebe 8041717: Issue with class file parser
hseigel
parents: 17577
diff changeset
2840 guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
3b0fe4ec6ebe 8041717: Issue with class file parser
hseigel
parents: 17577
diff changeset
2841 "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
3b0fe4ec6ebe 8041717: Issue with class file parser
hseigel
parents: 17577
diff changeset
2842 CHECK);
3b0fe4ec6ebe 8041717: Issue with class file parser
hseigel
parents: 17577
diff changeset
2843
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2844 operands->at_put(operand_fill_index++, bootstrap_method_index);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2845 operands->at_put(operand_fill_index++, argument_count);
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2846
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2847 cfs->guarantee_more(sizeof(u2) * argument_count, CHECK); // argv[argc]
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2848 for (int j = 0; j < argument_count; j++) {
2085
ef3c5db0b3ae 7008165: Garbage in ClassFormatError message
twisti
parents: 2011
diff changeset
2849 u2 argument_index = cfs->get_u2_fast();
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2850 check_property(
2085
ef3c5db0b3ae 7008165: Garbage in ClassFormatError message
twisti
parents: 2011
diff changeset
2851 valid_cp_range(argument_index, cp_size) &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2852 _cp->tag_at(argument_index).is_loadable_constant(),
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2853 "argument_index %u has bad constant type in class file %s",
2085
ef3c5db0b3ae 7008165: Garbage in ClassFormatError message
twisti
parents: 2011
diff changeset
2854 argument_index,
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2855 CHECK);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2856 operands->at_put(operand_fill_index++, argument_index);
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2857 }
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2858 }
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2859
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
2860 assert(operand_fill_index == operands->length(), "exact fill");
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2861
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2862 u1* current_end = cfs->current();
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2863 guarantee_property(current_end == current_start + attribute_byte_length,
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2864 "Bad length on BootstrapMethods in class file %s",
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2865 CHECK);
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2866 }
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2867
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2868 void ClassFileParser::parse_classfile_attributes(ClassFileParser::ClassAnnotationCollector* parsed_annotations,
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2869 TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2870 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
2871 // Set inner classes attribute to default sentinel
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2872 _inner_classes = Universe::the_empty_short_array();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2873 cfs->guarantee_more(2, CHECK); // attributes_count
a61af66fc99e Initial load
duke
parents:
diff changeset
2874 u2 attributes_count = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2875 bool parsed_sourcefile_attribute = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2876 bool parsed_innerclasses_attribute = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
2877 bool parsed_enclosingmethod_attribute = false;
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2878 bool parsed_bootstrap_methods_attribute = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2879 u1* runtime_visible_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2880 int runtime_visible_annotations_length = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
2881 u1* runtime_invisible_annotations = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
2882 int runtime_invisible_annotations_length = 0;
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2883 u1* runtime_visible_type_annotations = NULL;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2884 int runtime_visible_type_annotations_length = 0;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2885 u1* runtime_invisible_type_annotations = NULL;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2886 int runtime_invisible_type_annotations_length = 0;
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2887 bool runtime_invisible_type_annotations_exists = false;
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2888 u1* inner_classes_attribute_start = NULL;
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2889 u4 inner_classes_attribute_length = 0;
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2890 u2 enclosing_method_class_index = 0;
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2891 u2 enclosing_method_method_index = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2892 // Iterate over attributes
a61af66fc99e Initial load
duke
parents:
diff changeset
2893 while (attributes_count--) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2894 cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length
a61af66fc99e Initial load
duke
parents:
diff changeset
2895 u2 attribute_name_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2896 u4 attribute_length = cfs->get_u4_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
2897 check_property(
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2898 valid_symbol_at(attribute_name_index),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2899 "Attribute name has bad constant pool index %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2900 attribute_name_index, CHECK);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2901 Symbol* tag = _cp->symbol_at(attribute_name_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2902 if (tag == vmSymbols::tag_source_file()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2903 // Check for SourceFile tag
a61af66fc99e Initial load
duke
parents:
diff changeset
2904 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2905 guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2906 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2907 if (parsed_sourcefile_attribute) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2908 classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2909 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2910 parsed_sourcefile_attribute = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2911 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2912 parse_classfile_sourcefile_attribute(CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2913 } else if (tag == vmSymbols::tag_source_debug_extension()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2914 // Check for SourceDebugExtension tag
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2915 parse_classfile_source_debug_extension_attribute((int)attribute_length, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2916 } else if (tag == vmSymbols::tag_inner_classes()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2917 // Check for InnerClasses tag
a61af66fc99e Initial load
duke
parents:
diff changeset
2918 if (parsed_innerclasses_attribute) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2919 classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2920 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2921 parsed_innerclasses_attribute = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2922 }
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2923 inner_classes_attribute_start = cfs->get_u1_buffer();
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2924 inner_classes_attribute_length = attribute_length;
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2925 cfs->skip_u1(inner_classes_attribute_length, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2926 } else if (tag == vmSymbols::tag_synthetic()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2927 // Check for Synthetic tag
a61af66fc99e Initial load
duke
parents:
diff changeset
2928 // Shouldn't we check that the synthetic flags wasn't already set? - not required in spec
a61af66fc99e Initial load
duke
parents:
diff changeset
2929 if (attribute_length != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2930 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
2931 "Invalid Synthetic classfile attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2932 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2933 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2934 parse_classfile_synthetic_attribute(CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2935 } else if (tag == vmSymbols::tag_deprecated()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2936 // Check for Deprecatd tag - 4276120
a61af66fc99e Initial load
duke
parents:
diff changeset
2937 if (attribute_length != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2938 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
2939 "Invalid Deprecated classfile attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2940 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2941 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2942 } else if (_major_version >= JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2943 if (tag == vmSymbols::tag_signature()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2944 if (attribute_length != 2) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2945 classfile_parse_error(
a61af66fc99e Initial load
duke
parents:
diff changeset
2946 "Wrong Signature attribute length %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
2947 attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2948 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2949 parse_classfile_signature_attribute(CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2950 } else if (tag == vmSymbols::tag_runtime_visible_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2951 runtime_visible_annotations_length = attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2952 runtime_visible_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2953 assert(runtime_visible_annotations != NULL, "null visible annotations");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2954 parse_annotations(runtime_visible_annotations,
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2955 runtime_visible_annotations_length,
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2956 parsed_annotations,
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
2957 CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2958 cfs->skip_u1(runtime_visible_annotations_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2959 } else if (PreserveAllAnnotations && tag == vmSymbols::tag_runtime_invisible_annotations()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2960 runtime_invisible_annotations_length = attribute_length;
a61af66fc99e Initial load
duke
parents:
diff changeset
2961 runtime_invisible_annotations = cfs->get_u1_buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
2962 assert(runtime_invisible_annotations != NULL, "null invisible annotations");
a61af66fc99e Initial load
duke
parents:
diff changeset
2963 cfs->skip_u1(runtime_invisible_annotations_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2964 } else if (tag == vmSymbols::tag_enclosing_method()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2965 if (parsed_enclosingmethod_attribute) {
a61af66fc99e Initial load
duke
parents:
diff changeset
2966 classfile_parse_error("Multiple EnclosingMethod attributes in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2967 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
2968 parsed_enclosingmethod_attribute = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
2969 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2970 cfs->guarantee_more(4, CHECK); // class_index, method_index
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2971 enclosing_method_class_index = cfs->get_u2_fast();
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2972 enclosing_method_method_index = cfs->get_u2_fast();
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2973 if (enclosing_method_class_index == 0) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2974 classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2975 }
a61af66fc99e Initial load
duke
parents:
diff changeset
2976 // Validate the constant pool indices and types
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2977 check_property(valid_klass_reference_at(enclosing_method_class_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2978 "Invalid or out-of-bounds class index in EnclosingMethod attribute in class file %s", CHECK);
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
2979 if (enclosing_method_method_index != 0 &&
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2980 (!_cp->is_within_bounds(enclosing_method_method_index) ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2981 !_cp->tag_at(enclosing_method_method_index).is_name_and_type())) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
2982 classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
2983 }
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2984 } else if (tag == vmSymbols::tag_bootstrap_methods() &&
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2985 _major_version >= Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2986 if (parsed_bootstrap_methods_attribute)
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2987 classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK);
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
2988 parsed_bootstrap_methods_attribute = true;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
2989 parse_classfile_bootstrap_methods_attribute(attribute_length, CHECK);
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2990 } else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) {
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2991 if (runtime_visible_type_annotations != NULL) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2992 classfile_parse_error(
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2993 "Multiple RuntimeVisibleTypeAnnotations attributes in class file %s", CHECK);
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
2994 }
7457
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2995 runtime_visible_type_annotations_length = attribute_length;
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2996 runtime_visible_type_annotations = cfs->get_u1_buffer();
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2997 assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2998 // No need for the VM to parse Type annotations
35431a769282 8004823: Add VM support for type annotation reflection
stefank
parents: 7187
diff changeset
2999 cfs->skip_u1(runtime_visible_type_annotations_length, CHECK);
12201
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3000 } else if (tag == vmSymbols::tag_runtime_invisible_type_annotations()) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3001 if (runtime_invisible_type_annotations_exists) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3002 classfile_parse_error(
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3003 "Multiple RuntimeInvisibleTypeAnnotations attributes in class file %s", CHECK);
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3004 } else {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3005 runtime_invisible_type_annotations_exists = true;
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3006 }
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3007 if (PreserveAllAnnotations) {
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3008 runtime_invisible_type_annotations_length = attribute_length;
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3009 runtime_invisible_type_annotations = cfs->get_u1_buffer();
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3010 assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3011 }
b6767a18b379 8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents: 12131
diff changeset
3012 cfs->skip_u1(attribute_length, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3013 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
3014 // Unknown attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
3015 cfs->skip_u1(attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
3016 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3017 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
3018 // Unknown attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
3019 cfs->skip_u1(attribute_length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
3020 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3021 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3022 _annotations = assemble_annotations(runtime_visible_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3023 runtime_visible_annotations_length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3024 runtime_invisible_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3025 runtime_invisible_annotations_length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3026 CHECK);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3027 _type_annotations = assemble_annotations(runtime_visible_type_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3028 runtime_visible_type_annotations_length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3029 runtime_invisible_type_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3030 runtime_invisible_type_annotations_length,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3031 CHECK);
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
3032
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3033 if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) {
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3034 u2 num_of_classes = parse_classfile_inner_classes_attribute(
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3035 inner_classes_attribute_start,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3036 parsed_innerclasses_attribute,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3037 enclosing_method_class_index,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3038 enclosing_method_method_index,
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3039 CHECK);
5967
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3040 if (parsed_innerclasses_attribute &&_need_verify && _major_version >= JAVA_1_5_VERSION) {
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3041 guarantee_property(
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3042 inner_classes_attribute_length == sizeof(num_of_classes) + 4 * sizeof(u2) * num_of_classes,
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3043 "Wrong InnerClasses attribute length in class file %s", CHECK);
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3044 }
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3045 }
f7c4174b33ba 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 4755
diff changeset
3046
2011
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
3047 if (_max_bootstrap_specifier_index >= 0) {
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
3048 guarantee_property(parsed_bootstrap_methods_attribute,
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
3049 "Missing BootstrapMethods attribute in class file %s", CHECK);
dad31fc330cd 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents: 1972
diff changeset
3050 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3051 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3052
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3053 void ClassFileParser::apply_parsed_class_attributes(instanceKlassHandle k) {
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3054 if (_synthetic_flag)
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3055 k->set_is_synthetic();
12067
e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 11148
diff changeset
3056 if (_sourcefile_index != 0) {
e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 11148
diff changeset
3057 k->set_source_file_name_index(_sourcefile_index);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3058 }
12067
e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 11148
diff changeset
3059 if (_generic_signature_index != 0) {
e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents: 11148
diff changeset
3060 k->set_generic_signature_index(_generic_signature_index);
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3061 }
6226
kvn
parents: 6203 6222
diff changeset
3062 if (_sde_buffer != NULL) {
kvn
parents: 6203 6222
diff changeset
3063 k->set_source_debug_extension(_sde_buffer, _sde_length);
kvn
parents: 6203 6222
diff changeset
3064 }
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3065 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3066
20703
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3067 // Create the Annotations object that will
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3068 // hold the annotations array for the Klass.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3069 void ClassFileParser::create_combined_annotations(TRAPS) {
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3070 if (_annotations == NULL &&
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3071 _type_annotations == NULL &&
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3072 _fields_annotations == NULL &&
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3073 _fields_type_annotations == NULL) {
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3074 // Don't create the Annotations object unnecessarily.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3075 return;
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3076 }
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3077
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3078 Annotations* annotations = Annotations::allocate(_loader_data, CHECK);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3079 annotations->set_class_annotations(_annotations);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3080 annotations->set_class_type_annotations(_type_annotations);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3081 annotations->set_fields_annotations(_fields_annotations);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3082 annotations->set_fields_type_annotations(_fields_type_annotations);
20703
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3083
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3084 // This is the Annotations object that will be
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3085 // assigned to InstanceKlass being constructed.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3086 _combined_annotations = annotations;
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3087
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3088 // The annotations arrays below has been transfered the
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3089 // _combined_annotations so these fields can now be cleared.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3090 _annotations = NULL;
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3091 _type_annotations = NULL;
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3092 _fields_annotations = NULL;
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3093 _fields_type_annotations = NULL;
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3094 }
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3095
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3096 // Transfer ownership of metadata allocated to the InstanceKlass.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3097 void ClassFileParser::apply_parsed_class_metadata(
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3098 instanceKlassHandle this_klass,
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3099 int java_fields_count, TRAPS) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3100 _cp->set_pool_holder(this_klass());
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3101 this_klass->set_constants(_cp);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3102 this_klass->set_fields(_fields, java_fields_count);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3103 this_klass->set_methods(_methods);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3104 this_klass->set_inner_classes(_inner_classes);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3105 this_klass->set_local_interfaces(_local_interfaces);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3106 this_klass->set_transitive_interfaces(_transitive_interfaces);
20703
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3107 this_klass->set_annotations(_combined_annotations);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3108
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3109 // Clear out these fields so they don't get deallocated by the destructor
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3110 clear_class_metadata();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3111 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3112
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3113 AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annotations,
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3114 int runtime_visible_annotations_length,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3115 u1* runtime_invisible_annotations,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3116 int runtime_invisible_annotations_length, TRAPS) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3117 AnnotationArray* annotations = NULL;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3118 if (runtime_visible_annotations != NULL ||
a61af66fc99e Initial load
duke
parents:
diff changeset
3119 runtime_invisible_annotations != NULL) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3120 annotations = MetadataFactory::new_array<u1>(_loader_data,
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3121 runtime_visible_annotations_length +
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3122 runtime_invisible_annotations_length,
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3123 CHECK_(annotations));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3124 if (runtime_visible_annotations != NULL) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3125 for (int i = 0; i < runtime_visible_annotations_length; i++) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3126 annotations->at_put(i, runtime_visible_annotations[i]);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3127 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3128 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3129 if (runtime_invisible_annotations != NULL) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3130 for (int i = 0; i < runtime_invisible_annotations_length; i++) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3131 int append = runtime_visible_annotations_length+i;
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3132 annotations->at_put(append, runtime_invisible_annotations[i]);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3133 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3134 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3135 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3136 return annotations;
a61af66fc99e Initial load
duke
parents:
diff changeset
3137 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3138
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3139 instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3140 TRAPS) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3141 instanceKlassHandle super_klass;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3142 if (super_class_index == 0) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3143 check_property(_class_name == vmSymbols::java_lang_Object(),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3144 "Invalid superclass index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3145 super_class_index,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3146 CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3147 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3148 check_property(valid_klass_reference_at(super_class_index),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3149 "Invalid superclass index %u in class file %s",
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3150 super_class_index,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3151 CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3152 // The class name should be legal because it is checked when parsing constant pool.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3153 // However, make sure it is not an array type.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3154 bool is_array = false;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3155 if (_cp->tag_at(super_class_index).is_klass()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3156 super_klass = instanceKlassHandle(THREAD, _cp->resolved_klass_at(super_class_index));
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3157 if (_need_verify)
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3158 is_array = super_klass->oop_is_array();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3159 } else if (_need_verify) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3160 is_array = (_cp->unresolved_klass_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3161 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3162 if (_need_verify) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3163 guarantee_property(!is_array,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3164 "Bad superclass name in class file %s", CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3165 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3166 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3167 return super_klass;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3168 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3169
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3170
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3171 // Values needed for oopmap and InstanceKlass creation
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3172 class FieldLayoutInfo : public StackObj {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3173 public:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3174 int* nonstatic_oop_offsets;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3175 unsigned int* nonstatic_oop_counts;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3176 unsigned int nonstatic_oop_map_count;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3177 unsigned int total_oop_map_count;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3178 int instance_size;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3179 int nonstatic_field_size;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3180 int static_field_size;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3181 bool has_nonstatic_fields;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3182 };
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3183
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3184 // Layout fields and fill in FieldLayoutInfo. Could use more refactoring!
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3185 void ClassFileParser::layout_fields(Handle class_loader,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3186 FieldAllocationCount* fac,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3187 ClassAnnotationCollector* parsed_annotations,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3188 FieldLayoutInfo* info,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3189 TRAPS) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3190
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3191 // Field size and offset computation
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3192 int nonstatic_field_size = _super_klass() == NULL ? 0 : _super_klass()->nonstatic_field_size();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3193 int next_static_oop_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3194 int next_static_double_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3195 int next_static_word_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3196 int next_static_short_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3197 int next_static_byte_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3198 int next_nonstatic_oop_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3199 int next_nonstatic_double_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3200 int next_nonstatic_word_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3201 int next_nonstatic_short_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3202 int next_nonstatic_byte_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3203 int first_nonstatic_oop_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3204 int next_nonstatic_field_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3205 int next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3206
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3207 // Count the contended fields by type.
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3208 //
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3209 // We ignore static fields, because @Contended is not supported for them.
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3210 // The layout code below will also ignore the static fields.
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3211 int nonstatic_contended_count = 0;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3212 FieldAllocationCount fac_contended;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3213 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3214 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3215 if (fs.is_contended()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3216 fac_contended.count[atype]++;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3217 if (!fs.access_flags().is_static()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3218 nonstatic_contended_count++;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3219 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3220 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3221 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3222
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3223
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3224 // Calculate the starting byte offsets
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3225 next_static_oop_offset = InstanceMirrorKlass::offset_of_static_fields();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3226 next_static_double_offset = next_static_oop_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3227 ((fac->count[STATIC_OOP]) * heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3228 if ( fac->count[STATIC_DOUBLE] &&
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3229 (Universe::field_type_should_be_aligned(T_DOUBLE) ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3230 Universe::field_type_should_be_aligned(T_LONG)) ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3231 next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3232 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3233
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3234 next_static_word_offset = next_static_double_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3235 ((fac->count[STATIC_DOUBLE]) * BytesPerLong);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3236 next_static_short_offset = next_static_word_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3237 ((fac->count[STATIC_WORD]) * BytesPerInt);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3238 next_static_byte_offset = next_static_short_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3239 ((fac->count[STATIC_SHORT]) * BytesPerShort);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3240
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3241 int nonstatic_fields_start = instanceOopDesc::base_offset_in_bytes() +
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3242 nonstatic_field_size * heapOopSize;
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3243
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3244 next_nonstatic_field_offset = nonstatic_fields_start;
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3245
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3246 bool is_contended_class = parsed_annotations->is_contended();
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3247
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3248 // Class is contended, pad before all the fields
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3249 if (is_contended_class) {
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3250 next_nonstatic_field_offset += ContendedPaddingWidth;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3251 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3252
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3253 // Compute the non-contended fields count.
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3254 // The packing code below relies on these counts to determine if some field
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3255 // can be squeezed into the alignment gap. Contended fields are obviously
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3256 // exempt from that.
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3257 unsigned int nonstatic_double_count = fac->count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE];
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3258 unsigned int nonstatic_word_count = fac->count[NONSTATIC_WORD] - fac_contended.count[NONSTATIC_WORD];
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3259 unsigned int nonstatic_short_count = fac->count[NONSTATIC_SHORT] - fac_contended.count[NONSTATIC_SHORT];
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3260 unsigned int nonstatic_byte_count = fac->count[NONSTATIC_BYTE] - fac_contended.count[NONSTATIC_BYTE];
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3261 unsigned int nonstatic_oop_count = fac->count[NONSTATIC_OOP] - fac_contended.count[NONSTATIC_OOP];
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3262
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3263 // Total non-static fields count, including every contended field
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3264 unsigned int nonstatic_fields_count = fac->count[NONSTATIC_DOUBLE] + fac->count[NONSTATIC_WORD] +
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3265 fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] +
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3266 fac->count[NONSTATIC_OOP];
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3267
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3268 bool super_has_nonstatic_fields =
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3269 (_super_klass() != NULL && _super_klass->has_nonstatic_fields());
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3270 bool has_nonstatic_fields = super_has_nonstatic_fields || (nonstatic_fields_count != 0);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3271
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3272
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3273 // Prepare list of oops for oop map generation.
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3274 //
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3275 // "offset" and "count" lists are describing the set of contiguous oop
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3276 // regions. offset[i] is the start of the i-th region, which then has
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3277 // count[i] oops following. Before we know how many regions are required,
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3278 // we pessimistically allocate the maps to fit all the oops into the
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3279 // distinct regions.
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3280 //
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3281 // TODO: We add +1 to always allocate non-zero resource arrays; we need
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3282 // to figure out if we still need to do this.
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3283 int* nonstatic_oop_offsets;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3284 unsigned int* nonstatic_oop_counts;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3285 unsigned int nonstatic_oop_map_count = 0;
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3286 unsigned int max_nonstatic_oop_maps = fac->count[NONSTATIC_OOP] + 1;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3287
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3288 nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD(
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3289 THREAD, int, max_nonstatic_oop_maps);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3290 nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD(
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3291 THREAD, unsigned int, max_nonstatic_oop_maps);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3292
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3293 first_nonstatic_oop_offset = 0; // will be set for first oop field
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3294
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3295 bool compact_fields = CompactFields;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3296 int allocation_style = FieldsAllocationStyle;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3297 if( allocation_style < 0 || allocation_style > 2 ) { // Out of range?
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3298 assert(false, "0 <= FieldsAllocationStyle <= 2");
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3299 allocation_style = 1; // Optimistic
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3300 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3301
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3302 // The next classes have predefined hard-coded fields offsets
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3303 // (see in JavaClasses::compute_hard_coded_offsets()).
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3304 // Use default fields allocation order for them.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3305 if( (allocation_style != 0 || compact_fields ) && class_loader.is_null() &&
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3306 (_class_name == vmSymbols::java_lang_AssertionStatusDirectives() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3307 _class_name == vmSymbols::java_lang_Class() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3308 _class_name == vmSymbols::java_lang_ClassLoader() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3309 _class_name == vmSymbols::java_lang_ref_Reference() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3310 _class_name == vmSymbols::java_lang_ref_SoftReference() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3311 _class_name == vmSymbols::java_lang_StackTraceElement() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3312 _class_name == vmSymbols::java_lang_String() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3313 _class_name == vmSymbols::java_lang_Throwable() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3314 _class_name == vmSymbols::java_lang_Boolean() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3315 _class_name == vmSymbols::java_lang_Character() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3316 _class_name == vmSymbols::java_lang_Float() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3317 _class_name == vmSymbols::java_lang_Double() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3318 _class_name == vmSymbols::java_lang_Byte() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3319 _class_name == vmSymbols::java_lang_Short() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3320 _class_name == vmSymbols::java_lang_Integer() ||
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3321 _class_name == vmSymbols::java_lang_Long())) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3322 allocation_style = 0; // Allocate oops first
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3323 compact_fields = false; // Don't compact fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3324 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3325
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3326 // Rearrange fields for a given allocation style
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3327 if( allocation_style == 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3328 // Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3329 next_nonstatic_oop_offset = next_nonstatic_field_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3330 next_nonstatic_double_offset = next_nonstatic_oop_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3331 (nonstatic_oop_count * heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3332 } else if( allocation_style == 1 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3333 // Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3334 next_nonstatic_double_offset = next_nonstatic_field_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3335 } else if( allocation_style == 2 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3336 // Fields allocation: oops fields in super and sub classes are together.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3337 if( nonstatic_field_size > 0 && _super_klass() != NULL &&
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3338 _super_klass->nonstatic_oop_map_size() > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3339 unsigned int map_count = _super_klass->nonstatic_oop_map_count();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3340 OopMapBlock* first_map = _super_klass->start_of_nonstatic_oop_maps();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3341 OopMapBlock* last_map = first_map + map_count - 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3342 int next_offset = last_map->offset() + (last_map->count() * heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3343 if (next_offset == next_nonstatic_field_offset) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3344 allocation_style = 0; // allocate oops first
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3345 next_nonstatic_oop_offset = next_nonstatic_field_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3346 next_nonstatic_double_offset = next_nonstatic_oop_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3347 (nonstatic_oop_count * heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3348 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3349 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3350 if( allocation_style == 2 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3351 allocation_style = 1; // allocate oops last
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3352 next_nonstatic_double_offset = next_nonstatic_field_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3353 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3354 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3355 ShouldNotReachHere();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3356 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3357
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3358 int nonstatic_oop_space_count = 0;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3359 int nonstatic_word_space_count = 0;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3360 int nonstatic_short_space_count = 0;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3361 int nonstatic_byte_space_count = 0;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3362 int nonstatic_oop_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3363 int nonstatic_word_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3364 int nonstatic_short_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3365 int nonstatic_byte_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3366
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3367 // Try to squeeze some of the fields into the gaps due to
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3368 // long/double alignment.
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3369 if( nonstatic_double_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3370 int offset = next_nonstatic_double_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3371 next_nonstatic_double_offset = align_size_up(offset, BytesPerLong);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3372 if( compact_fields && offset != next_nonstatic_double_offset ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3373 // Allocate available fields into the gap before double field.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3374 int length = next_nonstatic_double_offset - offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3375 assert(length == BytesPerInt, "");
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3376 nonstatic_word_space_offset = offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3377 if( nonstatic_word_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3378 nonstatic_word_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3379 nonstatic_word_space_count = 1; // Only one will fit
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3380 length -= BytesPerInt;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3381 offset += BytesPerInt;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3382 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3383 nonstatic_short_space_offset = offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3384 while( length >= BytesPerShort && nonstatic_short_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3385 nonstatic_short_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3386 nonstatic_short_space_count += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3387 length -= BytesPerShort;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3388 offset += BytesPerShort;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3389 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3390 nonstatic_byte_space_offset = offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3391 while( length > 0 && nonstatic_byte_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3392 nonstatic_byte_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3393 nonstatic_byte_space_count += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3394 length -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3395 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3396 // Allocate oop field in the gap if there are no other fields for that.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3397 nonstatic_oop_space_offset = offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3398 if( length >= heapOopSize && nonstatic_oop_count > 0 &&
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3399 allocation_style != 0 ) { // when oop fields not first
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3400 nonstatic_oop_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3401 nonstatic_oop_space_count = 1; // Only one will fit
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3402 length -= heapOopSize;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3403 offset += heapOopSize;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3404 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3405 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3406 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3407
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3408 next_nonstatic_word_offset = next_nonstatic_double_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3409 (nonstatic_double_count * BytesPerLong);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3410 next_nonstatic_short_offset = next_nonstatic_word_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3411 (nonstatic_word_count * BytesPerInt);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3412 next_nonstatic_byte_offset = next_nonstatic_short_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3413 (nonstatic_short_count * BytesPerShort);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3414 next_nonstatic_padded_offset = next_nonstatic_byte_offset +
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3415 nonstatic_byte_count;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3416
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3417 // let oops jump before padding with this allocation style
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3418 if( allocation_style == 1 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3419 next_nonstatic_oop_offset = next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3420 if( nonstatic_oop_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3421 next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3422 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3423 next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3424 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3425
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3426 // Iterate over fields again and compute correct offsets.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3427 // The field allocation type was temporarily stored in the offset slot.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3428 // oop fields are located before non-oop fields (static and non-static).
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3429 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3430
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3431 // skip already laid out fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3432 if (fs.is_offset_set()) continue;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3433
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3434 // contended instance fields are handled below
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3435 if (fs.is_contended() && !fs.access_flags().is_static()) continue;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3436
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3437 int real_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3438 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3439
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3440 // pack the rest of the fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3441 switch (atype) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3442 case STATIC_OOP:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3443 real_offset = next_static_oop_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3444 next_static_oop_offset += heapOopSize;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3445 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3446 case STATIC_BYTE:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3447 real_offset = next_static_byte_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3448 next_static_byte_offset += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3449 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3450 case STATIC_SHORT:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3451 real_offset = next_static_short_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3452 next_static_short_offset += BytesPerShort;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3453 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3454 case STATIC_WORD:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3455 real_offset = next_static_word_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3456 next_static_word_offset += BytesPerInt;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3457 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3458 case STATIC_DOUBLE:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3459 real_offset = next_static_double_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3460 next_static_double_offset += BytesPerLong;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3461 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3462 case NONSTATIC_OOP:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3463 if( nonstatic_oop_space_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3464 real_offset = nonstatic_oop_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3465 nonstatic_oop_space_offset += heapOopSize;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3466 nonstatic_oop_space_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3467 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3468 real_offset = next_nonstatic_oop_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3469 next_nonstatic_oop_offset += heapOopSize;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3470 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3471 // Update oop maps
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3472 if( nonstatic_oop_map_count > 0 &&
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3473 nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3474 real_offset -
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3475 int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3476 heapOopSize ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3477 // Extend current oop map
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3478 assert(nonstatic_oop_map_count - 1 < max_nonstatic_oop_maps, "range check");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3479 nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3480 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3481 // Create new oop map
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3482 assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3483 nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3484 nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3485 nonstatic_oop_map_count += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3486 if( first_nonstatic_oop_offset == 0 ) { // Undefined
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3487 first_nonstatic_oop_offset = real_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3488 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3489 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3490 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3491 case NONSTATIC_BYTE:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3492 if( nonstatic_byte_space_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3493 real_offset = nonstatic_byte_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3494 nonstatic_byte_space_offset += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3495 nonstatic_byte_space_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3496 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3497 real_offset = next_nonstatic_byte_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3498 next_nonstatic_byte_offset += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3499 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3500 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3501 case NONSTATIC_SHORT:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3502 if( nonstatic_short_space_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3503 real_offset = nonstatic_short_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3504 nonstatic_short_space_offset += BytesPerShort;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3505 nonstatic_short_space_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3506 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3507 real_offset = next_nonstatic_short_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3508 next_nonstatic_short_offset += BytesPerShort;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3509 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3510 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3511 case NONSTATIC_WORD:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3512 if( nonstatic_word_space_count > 0 ) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3513 real_offset = nonstatic_word_space_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3514 nonstatic_word_space_offset += BytesPerInt;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3515 nonstatic_word_space_count -= 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3516 } else {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3517 real_offset = next_nonstatic_word_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3518 next_nonstatic_word_offset += BytesPerInt;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3519 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3520 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3521 case NONSTATIC_DOUBLE:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3522 real_offset = next_nonstatic_double_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3523 next_nonstatic_double_offset += BytesPerLong;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3524 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3525 default:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3526 ShouldNotReachHere();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3527 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3528 fs.set_offset(real_offset);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3529 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3530
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3531
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3532 // Handle the contended cases.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3533 //
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3534 // Each contended field should not intersect the cache line with another contended field.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3535 // In the absence of alignment information, we end up with pessimistically separating
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3536 // the fields with full-width padding.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3537 //
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3538 // Additionally, this should not break alignment for the fields, so we round the alignment up
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3539 // for each field.
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3540 if (nonstatic_contended_count > 0) {
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3541
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3542 // if there is at least one contended field, we need to have pre-padding for them
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3543 next_nonstatic_padded_offset += ContendedPaddingWidth;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3544
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3545 // collect all contended groups
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3546 BitMap bm(_cp->size());
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3547 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3548 // skip already laid out fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3549 if (fs.is_offset_set()) continue;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3550
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3551 if (fs.is_contended()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3552 bm.set_bit(fs.contended_group());
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3553 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3554 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3555
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3556 int current_group = -1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3557 while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3558
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3559 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3560
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3561 // skip already laid out fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3562 if (fs.is_offset_set()) continue;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3563
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3564 // skip non-contended fields and fields from different group
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3565 if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3566
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3567 // handle statics below
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3568 if (fs.access_flags().is_static()) continue;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3569
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3570 int real_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3571 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3572
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3573 switch (atype) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3574 case NONSTATIC_BYTE:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3575 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3576 real_offset = next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3577 next_nonstatic_padded_offset += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3578 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3579
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3580 case NONSTATIC_SHORT:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3581 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3582 real_offset = next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3583 next_nonstatic_padded_offset += BytesPerShort;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3584 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3585
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3586 case NONSTATIC_WORD:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3587 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3588 real_offset = next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3589 next_nonstatic_padded_offset += BytesPerInt;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3590 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3591
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3592 case NONSTATIC_DOUBLE:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3593 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3594 real_offset = next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3595 next_nonstatic_padded_offset += BytesPerLong;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3596 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3597
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3598 case NONSTATIC_OOP:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3599 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3600 real_offset = next_nonstatic_padded_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3601 next_nonstatic_padded_offset += heapOopSize;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3602
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3603 // Create new oop map
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3604 assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3605 nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3606 nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3607 nonstatic_oop_map_count += 1;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3608 if( first_nonstatic_oop_offset == 0 ) { // Undefined
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3609 first_nonstatic_oop_offset = real_offset;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3610 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3611 break;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3612
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3613 default:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3614 ShouldNotReachHere();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3615 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3616
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3617 if (fs.contended_group() == 0) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3618 // Contended group defines the equivalence class over the fields:
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3619 // the fields within the same contended group are not inter-padded.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3620 // The only exception is default group, which does not incur the
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3621 // equivalence, and so requires intra-padding.
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3622 next_nonstatic_padded_offset += ContendedPaddingWidth;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3623 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3624
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3625 fs.set_offset(real_offset);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3626 } // for
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3627
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3628 // Start laying out the next group.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3629 // Note that this will effectively pad the last group in the back;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3630 // this is expected to alleviate memory contention effects for
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3631 // subclass fields and/or adjacent object.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3632 // If this was the default group, the padding is already in place.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3633 if (current_group != 0) {
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3634 next_nonstatic_padded_offset += ContendedPaddingWidth;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3635 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3636 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3637
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3638 // handle static fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3639 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3640
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3641 // Entire class is contended, pad in the back.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3642 // This helps to alleviate memory contention effects for subclass fields
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3643 // and/or adjacent object.
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3644 if (is_contended_class) {
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3645 next_nonstatic_padded_offset += ContendedPaddingWidth;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3646 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3647
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3648 int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset;
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3649
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3650 int nonstatic_fields_end = align_size_up(notaligned_nonstatic_fields_end, heapOopSize);
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3651 int instance_end = align_size_up(notaligned_nonstatic_fields_end, wordSize);
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3652 int static_fields_end = align_size_up(next_static_byte_offset, wordSize);
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3653
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3654 int static_field_size = (static_fields_end -
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3655 InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3656 nonstatic_field_size = nonstatic_field_size +
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3657 (nonstatic_fields_end - nonstatic_fields_start) / heapOopSize;
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3658
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3659 int instance_size = align_object_size(instance_end / wordSize);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3660
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3661 assert(instance_size == align_object_size(align_size_up(
10303
205dd30230e1 8012939: @Contended doesn't work correctly with inheritance
shade
parents: 10269
diff changeset
3662 (instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize),
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3663 wordSize) / wordSize), "consistent layout helper value");
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3664
10348
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3665 // Invariant: nonstatic_field end/start should only change if there are
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3666 // nonstatic fields in the class, or if the class is contended. We compare
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3667 // against the non-aligned value, so that end alignment will not fail the
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3668 // assert without actually having the fields.
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3669 assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) ||
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3670 is_contended_class ||
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3671 (nonstatic_fields_count > 0), "double-check nonstatic start/end");
3970971c91e0 8015270: @Contended: fix multiple issues in the layout code
shade
parents: 10343
diff changeset
3672
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3673 // Number of non-static oop map blocks allocated at end of klass.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3674 const unsigned int total_oop_map_count =
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3675 compute_oop_map_count(_super_klass, nonstatic_oop_map_count,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3676 first_nonstatic_oop_offset);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3677
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3678 #ifndef PRODUCT
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3679 if (PrintFieldLayout) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3680 print_field_layout(_class_name,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3681 _fields,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3682 _cp,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3683 instance_size,
10314
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3684 nonstatic_fields_start,
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3685 nonstatic_fields_end,
bbddfb08190f 8014878: Clean up class field layout code
shade
parents: 10310
diff changeset
3686 static_fields_end);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3687 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3688
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3689 #endif
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3690 // Pass back information needed for InstanceKlass creation
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3691 info->nonstatic_oop_offsets = nonstatic_oop_offsets;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3692 info->nonstatic_oop_counts = nonstatic_oop_counts;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3693 info->nonstatic_oop_map_count = nonstatic_oop_map_count;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3694 info->total_oop_map_count = total_oop_map_count;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3695 info->instance_size = instance_size;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3696 info->static_field_size = static_field_size;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3697 info->nonstatic_field_size = nonstatic_field_size;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3698 info->has_nonstatic_fields = has_nonstatic_fields;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3699 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3700
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3701
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3702 instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
7185
90273fc0a981 8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents: 6983
diff changeset
3703 ClassLoaderData* loader_data,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3704 Handle protection_domain,
710
e5b0439ef4ae 6655638: dynamic languages need method handles
jrose
parents: 657
diff changeset
3705 KlassHandle host_klass,
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
3706 GrowableArray<Handle>* cp_patches,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3707 TempNewSymbol& parsed_name,
973
ad6585fd4087 6830542: Performance: JVM_DefineClass already verified.
acorn
parents: 879
diff changeset
3708 bool verify,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3709 TRAPS) {
7462
ade95d680b42 8004728: Add hotspot support for parameter reflection
coleenp
parents: 7457
diff changeset
3710
4731
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3711 // When a retransformable agent is attached, JVMTI caches the
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3712 // class bytes that existed before the first retransformation.
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3713 // If RedefineClasses() was used before the retransformable
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3714 // agent attached, then the cached class bytes may not be the
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3715 // original class bytes.
11148
825e6cb66923 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 10405
diff changeset
3716 JvmtiCachedClassFileData *cached_class_file = NULL;
7185
90273fc0a981 8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents: 6983
diff changeset
3717 Handle class_loader(THREAD, loader_data->class_loader());
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3718 bool has_default_methods = false;
20576
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
3719 bool declares_default_methods = false;
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3720 ResourceMark rm(THREAD);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3721
a61af66fc99e Initial load
duke
parents:
diff changeset
3722 ClassFileStream* cfs = stream();
a61af66fc99e Initial load
duke
parents:
diff changeset
3723 // Timing
875
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3724 assert(THREAD->is_Java_thread(), "must be a JavaThread");
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3725 JavaThread* jt = (JavaThread*) THREAD;
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3726
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3727 PerfClassTraceTime ctimer(ClassLoader::perf_class_parse_time(),
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3728 ClassLoader::perf_class_parse_selftime(),
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3729 NULL,
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3730 jt->get_thread_stat()->perf_recursion_counts_addr(),
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3731 jt->get_thread_stat()->perf_timers_addr(),
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3732 PerfClassTraceTime::PARSE_CLASS);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3733
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3734 init_parsed_class_attributes(loader_data);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3735
a61af66fc99e Initial load
duke
parents:
diff changeset
3736 if (JvmtiExport::should_post_class_file_load_hook()) {
4751
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3737 // Get the cached class file bytes (if any) from the class that
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3738 // is being redefined or retransformed. We use jvmti_thread_state()
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3739 // instead of JvmtiThreadState::state_for(jt) so we don't allocate
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3740 // a JvmtiThreadState any earlier than necessary. This will help
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3741 // avoid the bug described by 7126851.
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3742 JvmtiThreadState *state = jt->jvmti_thread_state();
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3743 if (state != NULL) {
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3744 KlassHandle *h_class_being_redefined =
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3745 state->get_class_being_redefined();
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3746 if (h_class_being_redefined != NULL) {
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3747 instanceKlassHandle ikh_class_being_redefined =
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3748 instanceKlassHandle(THREAD, (*h_class_being_redefined)());
11148
825e6cb66923 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 10405
diff changeset
3749 cached_class_file = ikh_class_being_redefined->get_cached_class_file();
4751
5b58979183f9 7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents: 4731
diff changeset
3750 }
4731
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3751 }
4ceaf61479fc 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 3938
diff changeset
3752
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3753 unsigned char* ptr = cfs->buffer();
a61af66fc99e Initial load
duke
parents:
diff changeset
3754 unsigned char* end_ptr = cfs->buffer() + cfs->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
3755
7185
90273fc0a981 8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents: 6983
diff changeset
3756 JvmtiExport::post_class_file_load_hook(name, class_loader(), protection_domain,
11148
825e6cb66923 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 10405
diff changeset
3757 &ptr, &end_ptr, &cached_class_file);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3758
a61af66fc99e Initial load
duke
parents:
diff changeset
3759 if (ptr != cfs->buffer()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
3760 // JVMTI agent has modified class file data.
a61af66fc99e Initial load
duke
parents:
diff changeset
3761 // Set new class file stream using JVMTI agent modified
a61af66fc99e Initial load
duke
parents:
diff changeset
3762 // class file data.
a61af66fc99e Initial load
duke
parents:
diff changeset
3763 cfs = new ClassFileStream(ptr, end_ptr - ptr, cfs->source());
a61af66fc99e Initial load
duke
parents:
diff changeset
3764 set_stream(cfs);
a61af66fc99e Initial load
duke
parents:
diff changeset
3765 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3766 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3767
710
e5b0439ef4ae 6655638: dynamic languages need method handles
jrose
parents: 657
diff changeset
3768 _host_klass = host_klass;
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
3769 _cp_patches = cp_patches;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3770
a61af66fc99e Initial load
duke
parents:
diff changeset
3771 instanceKlassHandle nullHandle;
a61af66fc99e Initial load
duke
parents:
diff changeset
3772
a61af66fc99e Initial load
duke
parents:
diff changeset
3773 // Figure out whether we can skip format checking (matching classic VM behavior)
20375
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3774 if (DumpSharedSpaces) {
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3775 // verify == true means it's a 'remote' class (i.e., non-boot class)
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3776 // Verification decision is based on BytecodeVerificationRemote flag
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3777 // for those classes.
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3778 _need_verify = (verify) ? BytecodeVerificationRemote :
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3779 BytecodeVerificationLocal;
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3780 } else {
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3781 _need_verify = Verifier::should_verify_for(class_loader(), verify);
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3782 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3783
a61af66fc99e Initial load
duke
parents:
diff changeset
3784 // Set the verify flag in stream
a61af66fc99e Initial load
duke
parents:
diff changeset
3785 cfs->set_verify(_need_verify);
a61af66fc99e Initial load
duke
parents:
diff changeset
3786
a61af66fc99e Initial load
duke
parents:
diff changeset
3787 // Save the class file name for easier error message printing.
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3788 _class_name = (name != NULL) ? name : vmSymbols::unknown_class_name();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3789
a61af66fc99e Initial load
duke
parents:
diff changeset
3790 cfs->guarantee_more(8, CHECK_(nullHandle)); // magic, major, minor
a61af66fc99e Initial load
duke
parents:
diff changeset
3791 // Magic value
a61af66fc99e Initial load
duke
parents:
diff changeset
3792 u4 magic = cfs->get_u4_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
3793 guarantee_property(magic == JAVA_CLASSFILE_MAGIC,
a61af66fc99e Initial load
duke
parents:
diff changeset
3794 "Incompatible magic value %u in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
3795 magic, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
3796
a61af66fc99e Initial load
duke
parents:
diff changeset
3797 // Version numbers
a61af66fc99e Initial load
duke
parents:
diff changeset
3798 u2 minor_version = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
3799 u2 major_version = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
3800
20375
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3801 if (DumpSharedSpaces && major_version < JAVA_1_5_VERSION) {
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3802 ResourceMark rm;
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3803 warning("Pre JDK 1.5 class not supported by CDS: %u.%u %s",
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3804 major_version, minor_version, name->as_C_string());
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3805 Exceptions::fthrow(
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3806 THREAD_AND_LOCATION,
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3807 vmSymbols::java_lang_UnsupportedClassVersionError(),
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3808 "Unsupported major.minor version for dump time %u.%u",
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3809 major_version,
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3810 minor_version);
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3811 }
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3812
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3813 // Check version numbers - we check this even with verifier off
a61af66fc99e Initial load
duke
parents:
diff changeset
3814 if (!is_supported_version(major_version, minor_version)) {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3815 if (name == NULL) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3816 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
3817 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3818 vmSymbols::java_lang_UnsupportedClassVersionError(),
17879
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3819 "Unsupported class file version %u.%u, "
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3820 "this version of the Java Runtime only recognizes class file versions up to %u.%u",
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3821 major_version,
17879
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3822 minor_version,
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3823 JAVA_MAX_SUPPORTED_VERSION,
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3824 JAVA_MAX_SUPPORTED_MINOR_VERSION);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3825 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
3826 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
3827 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
3828 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3829 vmSymbols::java_lang_UnsupportedClassVersionError(),
17879
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3830 "%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), "
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3831 "this version of the Java Runtime only recognizes class file versions up to %u.%u",
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3832 name->as_C_string(),
a61af66fc99e Initial load
duke
parents:
diff changeset
3833 major_version,
17879
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3834 minor_version,
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3835 JAVA_MAX_SUPPORTED_VERSION,
d55853ba088b 8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents: 17646
diff changeset
3836 JAVA_MAX_SUPPORTED_MINOR_VERSION);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3837 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3838 return nullHandle;
a61af66fc99e Initial load
duke
parents:
diff changeset
3839 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3840
a61af66fc99e Initial load
duke
parents:
diff changeset
3841 _major_version = major_version;
a61af66fc99e Initial load
duke
parents:
diff changeset
3842 _minor_version = minor_version;
a61af66fc99e Initial load
duke
parents:
diff changeset
3843
a61af66fc99e Initial load
duke
parents:
diff changeset
3844
a61af66fc99e Initial load
duke
parents:
diff changeset
3845 // Check if verification needs to be relaxed for this class file
a61af66fc99e Initial load
duke
parents:
diff changeset
3846 // Do not restrict it to jdk1.0 or jdk1.1 to maintain backward compatibility (4982376)
a61af66fc99e Initial load
duke
parents:
diff changeset
3847 _relax_verify = Verifier::relax_verify_for(class_loader());
a61af66fc99e Initial load
duke
parents:
diff changeset
3848
a61af66fc99e Initial load
duke
parents:
diff changeset
3849 // Constant pool
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3850 constantPoolHandle cp = parse_constant_pool(CHECK_(nullHandle));
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3851
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3852 int cp_size = cp->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
3853
a61af66fc99e Initial load
duke
parents:
diff changeset
3854 cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len
a61af66fc99e Initial load
duke
parents:
diff changeset
3855
a61af66fc99e Initial load
duke
parents:
diff changeset
3856 // Access flags
a61af66fc99e Initial load
duke
parents:
diff changeset
3857 AccessFlags access_flags;
a61af66fc99e Initial load
duke
parents:
diff changeset
3858 jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS;
a61af66fc99e Initial load
duke
parents:
diff changeset
3859
a61af66fc99e Initial load
duke
parents:
diff changeset
3860 if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
3861 // Set abstract bit for old class files for backward compatibility
a61af66fc99e Initial load
duke
parents:
diff changeset
3862 flags |= JVM_ACC_ABSTRACT;
a61af66fc99e Initial load
duke
parents:
diff changeset
3863 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3864 verify_legal_class_modifiers(flags, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
3865 access_flags.set_flags(flags);
a61af66fc99e Initial load
duke
parents:
diff changeset
3866
a61af66fc99e Initial load
duke
parents:
diff changeset
3867 // This class and superclass
a61af66fc99e Initial load
duke
parents:
diff changeset
3868 u2 this_class_index = cfs->get_u2_fast();
a61af66fc99e Initial load
duke
parents:
diff changeset
3869 check_property(
a61af66fc99e Initial load
duke
parents:
diff changeset
3870 valid_cp_range(this_class_index, cp_size) &&
a61af66fc99e Initial load
duke
parents:
diff changeset
3871 cp->tag_at(this_class_index).is_unresolved_klass(),
a61af66fc99e Initial load
duke
parents:
diff changeset
3872 "Invalid this class index %u in constant pool in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
3873 this_class_index, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
3874
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3875 Symbol* class_name = cp->unresolved_klass_at(this_class_index);
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3876 assert(class_name != NULL, "class_name can't be null");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3877
a61af66fc99e Initial load
duke
parents:
diff changeset
3878 // It's important to set parsed_name *before* resolving the super class.
a61af66fc99e Initial load
duke
parents:
diff changeset
3879 // (it's used for cleanup by the caller if parsing fails)
a61af66fc99e Initial load
duke
parents:
diff changeset
3880 parsed_name = class_name;
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3881 // parsed_name is returned and can be used if there's an error, so add to
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3882 // its reference count. Caller will decrement the refcount.
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3883 parsed_name->increment_refcount();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3884
a61af66fc99e Initial load
duke
parents:
diff changeset
3885 // Update _class_name which could be null previously to be class_name
a61af66fc99e Initial load
duke
parents:
diff changeset
3886 _class_name = class_name;
a61af66fc99e Initial load
duke
parents:
diff changeset
3887
a61af66fc99e Initial load
duke
parents:
diff changeset
3888 // Don't need to check whether this class name is legal or not.
a61af66fc99e Initial load
duke
parents:
diff changeset
3889 // It has been checked when constant pool is parsed.
a61af66fc99e Initial load
duke
parents:
diff changeset
3890 // However, make sure it is not an array type.
a61af66fc99e Initial load
duke
parents:
diff changeset
3891 if (_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
3892 guarantee_property(class_name->byte_at(0) != JVM_SIGNATURE_ARRAY,
a61af66fc99e Initial load
duke
parents:
diff changeset
3893 "Bad class name in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
3894 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
3895 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3896
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
3897 Klass* preserve_this_klass; // for storing result across HandleMark
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3898
a61af66fc99e Initial load
duke
parents:
diff changeset
3899 // release all handles when parsing is done
a61af66fc99e Initial load
duke
parents:
diff changeset
3900 { HandleMark hm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
3901
a61af66fc99e Initial load
duke
parents:
diff changeset
3902 // Checks if name in class file matches requested name
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3903 if (name != NULL && class_name != name) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3904 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
3905 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
3906 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3907 vmSymbols::java_lang_NoClassDefFoundError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3908 "%s (wrong name: %s)",
a61af66fc99e Initial load
duke
parents:
diff changeset
3909 name->as_C_string(),
a61af66fc99e Initial load
duke
parents:
diff changeset
3910 class_name->as_C_string()
a61af66fc99e Initial load
duke
parents:
diff changeset
3911 );
a61af66fc99e Initial load
duke
parents:
diff changeset
3912 return nullHandle;
a61af66fc99e Initial load
duke
parents:
diff changeset
3913 }
a61af66fc99e Initial load
duke
parents:
diff changeset
3914
a61af66fc99e Initial load
duke
parents:
diff changeset
3915 if (TraceClassLoadingPreorder) {
10128
41ed397cc0cd 8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents: 9083
diff changeset
3916 tty->print("[Loading %s", (name != NULL) ? name->as_klass_external_name() : "NoName");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3917 if (cfs->source() != NULL) tty->print(" from %s", cfs->source());
a61af66fc99e Initial load
duke
parents:
diff changeset
3918 tty->print_cr("]");
a61af66fc99e Initial load
duke
parents:
diff changeset
3919 }
20375
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3920 #if INCLUDE_CDS
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3921 if (DumpLoadedClassList != NULL && cfs->source() != NULL && classlist_file->is_open()) {
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3922 // Only dump the classes that can be stored into CDS archive
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3923 if (SystemDictionaryShared::is_sharing_possible(loader_data)) {
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3924 if (name != NULL) {
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3925 ResourceMark rm(THREAD);
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3926 classlist_file->print_cr("%s", name->as_C_string());
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3927 classlist_file->flush();
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3928 }
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3929 }
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3930 }
6e0cb14ce59b 8046070: Class Data Sharing clean up and refactoring
iklam
parents: 20353
diff changeset
3931 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3932
a61af66fc99e Initial load
duke
parents:
diff changeset
3933 u2 super_class_index = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3934 instanceKlassHandle super_klass = parse_super_class(super_class_index,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3935 CHECK_NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3936
a61af66fc99e Initial load
duke
parents:
diff changeset
3937 // Interfaces
a61af66fc99e Initial load
duke
parents:
diff changeset
3938 u2 itfs_len = cfs->get_u2_fast();
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3939 Array<Klass*>* local_interfaces =
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3940 parse_interfaces(itfs_len, protection_domain, _class_name,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3941 &has_default_methods, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3942
4744
cd5d8cafcc84 7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents: 3938
diff changeset
3943 u2 java_fields_count = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3944 // Fields (offsets are filled in later)
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
3945 FieldAllocationCount fac;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3946 Array<u2>* fields = parse_fields(class_name,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3947 access_flags.is_interface(),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3948 &fac, &java_fields_count,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3949 CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3950 // Methods
a61af66fc99e Initial load
duke
parents:
diff changeset
3951 bool has_final_method = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
3952 AccessFlags promoted_flags;
a61af66fc99e Initial load
duke
parents:
diff changeset
3953 promoted_flags.set_flags(0);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3954 Array<Method*>* methods = parse_methods(access_flags.is_interface(),
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3955 &promoted_flags,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3956 &has_final_method,
20576
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
3957 &declares_default_methods,
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3958 CHECK_(nullHandle));
20576
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
3959 if (declares_default_methods) {
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
3960 has_default_methods = true;
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
3961 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3962
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3963 // Additional attributes
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3964 ClassAnnotationCollector parsed_annotations;
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
3965 parse_classfile_attributes(&parsed_annotations, CHECK_(nullHandle));
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3966
20703
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3967 // Finalize the Annotations metadata object,
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3968 // now that all annotation arrays have been created.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3969 create_combined_annotations(CHECK_(nullHandle));
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
3970
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3971 // Make sure this is the end of class file stream
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3972 guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle));
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
3973
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3974 // We check super class after class file is parsed and format is checked
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
3975 if (super_class_index > 0 && super_klass.is_null()) {
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3976 Symbol* sk = cp->klass_name_at(super_class_index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3977 if (access_flags.is_interface()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
3978 // Before attempting to resolve the superclass, check for class format
a61af66fc99e Initial load
duke
parents:
diff changeset
3979 // errors not checked yet.
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
3980 guarantee_property(sk == vmSymbols::java_lang_Object(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3981 "Interfaces must have java.lang.Object as superclass in class file %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
3982 CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
3983 }
6831
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3984 Klass* k = SystemDictionary::resolve_super_or_fail(class_name, sk,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3985 class_loader,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3986 protection_domain,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3987 true,
d8ce2825b193 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents: 6735
diff changeset
3988 CHECK_(nullHandle));
875
6a93908f268f 6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents: 710
diff changeset
3989
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3990 KlassHandle kh (THREAD, k);
a61af66fc99e Initial load
duke
parents:
diff changeset
3991 super_klass = instanceKlassHandle(THREAD, kh());
431
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
3992 }
a45484ea312d 6653858: dynamic languages need to be able to load anonymous classes
jrose
parents: 196
diff changeset
3993 if (super_klass.not_null()) {
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3994
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3995 if (super_klass->has_default_methods()) {
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3996 has_default_methods = true;
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3997 }
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
3998
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3999 if (super_klass->is_interface()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4000 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4001 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4002 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4003 vmSymbols::java_lang_IncompatibleClassChangeError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4004 "class %s has interface %s as super class",
a61af66fc99e Initial load
duke
parents:
diff changeset
4005 class_name->as_klass_external_name(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4006 super_klass->external_name()
a61af66fc99e Initial load
duke
parents:
diff changeset
4007 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4008 return nullHandle;
a61af66fc99e Initial load
duke
parents:
diff changeset
4009 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4010 // Make sure super class is not final
a61af66fc99e Initial load
duke
parents:
diff changeset
4011 if (super_klass->is_final()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4012 THROW_MSG_(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class", nullHandle);
a61af66fc99e Initial load
duke
parents:
diff changeset
4013 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4014 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4015
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4016 // save super klass for error handling.
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4017 _super_klass = super_klass;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4018
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4019 // Compute the transitive list of all unique interfaces implemented by this class
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4020 _transitive_interfaces =
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4021 compute_transitive_interfaces(super_klass, local_interfaces, CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4022
a61af66fc99e Initial load
duke
parents:
diff changeset
4023 // sort methods
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4024 intArray* method_ordering = sort_methods(methods);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4025
a61af66fc99e Initial load
duke
parents:
diff changeset
4026 // promote flags from parse_methods() to the klass' flags
a61af66fc99e Initial load
duke
parents:
diff changeset
4027 access_flags.add_promoted_flags(promoted_flags.as_int());
a61af66fc99e Initial load
duke
parents:
diff changeset
4028
a61af66fc99e Initial load
duke
parents:
diff changeset
4029 // Size of Java vtable (in words)
a61af66fc99e Initial load
duke
parents:
diff changeset
4030 int vtable_size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4031 int itable_size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4032 int num_miranda_methods = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4033
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4034 GrowableArray<Method*> all_mirandas(20);
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4035
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4036 klassVtable::compute_vtable_size_and_num_mirandas(
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4037 &vtable_size, &num_miranda_methods, &all_mirandas, super_klass(), methods,
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4038 access_flags, class_loader, class_name, local_interfaces,
652
4aaa9f5e02a8 4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents: 579
diff changeset
4039 CHECK_(nullHandle));
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4040
a61af66fc99e Initial load
duke
parents:
diff changeset
4041 // Size of Java itable (in words)
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4042 itable_size = access_flags.is_interface() ? 0 : klassItable::compute_itable_size(_transitive_interfaces);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4043
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4044 FieldLayoutInfo info;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4045 layout_fields(class_loader, &fac, &parsed_annotations, &info, CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4046
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4047 int total_oop_map_size2 =
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4048 InstanceKlass::nonstatic_oop_map_size(info.total_oop_map_count);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4049
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4050 // Compute reference type
a61af66fc99e Initial load
duke
parents:
diff changeset
4051 ReferenceType rt;
a61af66fc99e Initial load
duke
parents:
diff changeset
4052 if (super_klass() == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4053 rt = REF_NONE;
a61af66fc99e Initial load
duke
parents:
diff changeset
4054 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
4055 rt = super_klass->reference_type();
a61af66fc99e Initial load
duke
parents:
diff changeset
4056 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4057
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4058 // We can now create the basic Klass* for this klass
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4059 _klass = InstanceKlass::allocate_instance_klass(loader_data,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4060 vtable_size,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4061 itable_size,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4062 info.static_field_size,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4063 total_oop_map_size2,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4064 rt,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4065 access_flags,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4066 name,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4067 super_klass(),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4068 !host_klass.is_null(),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4069 CHECK_(nullHandle));
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4070 instanceKlassHandle this_klass (THREAD, _klass);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4071
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4072 assert(this_klass->static_field_size() == info.static_field_size, "sanity");
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4073 assert(this_klass->nonstatic_oop_map_count() == info.total_oop_map_count,
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4074 "sanity");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4075
a61af66fc99e Initial load
duke
parents:
diff changeset
4076 // Fill in information already parsed
975
83c29a26f67c 6879572: SA fails _is_marked_dependent not found
acorn
parents: 974
diff changeset
4077 this_klass->set_should_verify_class(verify);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4078 jint lh = Klass::instance_layout_helper(info.instance_size, false);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4079 this_klass->set_layout_helper(lh);
a61af66fc99e Initial load
duke
parents:
diff changeset
4080 assert(this_klass->oop_is_instance(), "layout is correct");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4081 assert(this_klass->size_helper() == info.instance_size, "correct size_helper");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4082 // Not yet: supers are done below to support the new subtype-checking fields
a61af66fc99e Initial load
duke
parents:
diff changeset
4083 //this_klass->set_super(super_klass());
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4084 this_klass->set_class_loader_data(loader_data);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4085 this_klass->set_nonstatic_field_size(info.nonstatic_field_size);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4086 this_klass->set_has_nonstatic_fields(info.has_nonstatic_fields);
3938
e6b1331a51d2 7086585: make Java field injection more flexible
never
parents: 3786
diff changeset
4087 this_klass->set_static_oop_field_count(fac.count[STATIC_OOP]);
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4088
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4089 apply_parsed_class_metadata(this_klass, java_fields_count, CHECK_NULL);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4090
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4091 if (has_final_method) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4092 this_klass->set_has_final_method();
a61af66fc99e Initial load
duke
parents:
diff changeset
4093 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4094 this_klass->copy_method_ordering(method_ordering, CHECK_NULL);
12264
b2e698d2276c 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 12190
diff changeset
4095 // The InstanceKlass::_methods_jmethod_ids cache
b2e698d2276c 8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents: 12190
diff changeset
4096 // is managed on the assumption that the initial cache
977
74a5db69c1fe 6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents: 975
diff changeset
4097 // size is equal to the number of methods in the class. If
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4098 // that changes, then InstanceKlass::idnum_can_increment()
977
74a5db69c1fe 6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents: 975
diff changeset
4099 // has to be changed accordingly.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4100 this_klass->set_initial_method_idnum(methods->length());
a61af66fc99e Initial load
duke
parents:
diff changeset
4101 this_klass->set_name(cp->klass_name_at(this_class_index));
6852
19eb999cb72c 8000740: remove LinkWellKnownClasses
twisti
parents: 6848
diff changeset
4102 if (is_anonymous()) // I am well known to myself
474
7a018855d2f0 6779339: turn off LinkWellKnownClasses by default pending further testing
jrose
parents: 431
diff changeset
4103 cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4104
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4105 this_klass->set_minor_version(minor_version);
a61af66fc99e Initial load
duke
parents:
diff changeset
4106 this_klass->set_major_version(major_version);
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4107 this_klass->set_has_default_methods(has_default_methods);
20576
90257dfad6e3 8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents: 20561
diff changeset
4108 this_klass->set_declares_default_methods(declares_default_methods);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4109
17998
ae92351815b6 8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents: 17934
diff changeset
4110 if (!host_klass.is_null()) {
ae92351815b6 8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents: 17934
diff changeset
4111 assert (this_klass->is_anonymous(), "should be the same");
ae92351815b6 8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents: 17934
diff changeset
4112 this_klass->set_host_klass(host_klass());
ae92351815b6 8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents: 17934
diff changeset
4113 }
ae92351815b6 8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents: 17934
diff changeset
4114
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4115 // Set up Method*::intrinsic_id as soon as we know the names of methods.
856
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4116 // (We used to do this lazily, but now we query it in Rewriter,
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4117 // which is eagerly done for every method, so we might as well do it now,
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4118 // when everything is fresh in memory.)
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4119 if (Method::klass_id_for_intrinsics(this_klass()) != vmSymbols::NO_SID) {
856
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4120 for (int j = 0; j < methods->length(); j++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4121 methods->at(j)->init_intrinsic_id();
856
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4122 }
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4123 }
75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents: 710
diff changeset
4124
11148
825e6cb66923 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 10405
diff changeset
4125 if (cached_class_file != NULL) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4126 // JVMTI: we have an InstanceKlass now, tell it about the cached bytes
11148
825e6cb66923 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 10405
diff changeset
4127 this_klass->set_cached_class_file(cached_class_file);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4128 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4129
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4130 // Fill in field values obtained by parse_classfile_attributes
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4131 if (parsed_annotations.has_any_annotations())
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4132 parsed_annotations.apply_to(this_klass);
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4133 apply_parsed_class_attributes(this_klass);
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4134
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4135 // Miranda methods
a61af66fc99e Initial load
duke
parents:
diff changeset
4136 if ((num_miranda_methods > 0) ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4137 // if this class introduced new miranda methods or
a61af66fc99e Initial load
duke
parents:
diff changeset
4138 (super_klass.not_null() && (super_klass->has_miranda_methods()))
a61af66fc99e Initial load
duke
parents:
diff changeset
4139 // super class exists and this class inherited miranda methods
a61af66fc99e Initial load
duke
parents:
diff changeset
4140 ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4141 this_klass->set_has_miranda_methods(); // then set a flag
a61af66fc99e Initial load
duke
parents:
diff changeset
4142 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4143
a61af66fc99e Initial load
duke
parents:
diff changeset
4144 // Fill in information needed to compute superclasses.
a61af66fc99e Initial load
duke
parents:
diff changeset
4145 this_klass->initialize_supers(super_klass(), CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
4146
a61af66fc99e Initial load
duke
parents:
diff changeset
4147 // Initialize itable offset tables
a61af66fc99e Initial load
duke
parents:
diff changeset
4148 klassItable::setup_itable_offset_table(this_klass);
a61af66fc99e Initial load
duke
parents:
diff changeset
4149
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4150 // Compute transitive closure of interfaces this class implements
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4151 // Do final class setup
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4152 fill_oop_maps(this_klass, info.nonstatic_oop_map_count, info.nonstatic_oop_offsets, info.nonstatic_oop_counts);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4153
6222
6d8f36bcef55 6711908: JVM needs direct access to some annotations
jrose
parents: 6100
diff changeset
4154 // Fill in has_finalizer, has_vanilla_constructor, and layout_helper
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4155 set_precomputed_flags(this_klass);
a61af66fc99e Initial load
duke
parents:
diff changeset
4156
a61af66fc99e Initial load
duke
parents:
diff changeset
4157 // reinitialize modifiers, using the InnerClasses attribute
a61af66fc99e Initial load
duke
parents:
diff changeset
4158 int computed_modifiers = this_klass->compute_modifier_flags(CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
4159 this_klass->set_modifier_flags(computed_modifiers);
a61af66fc99e Initial load
duke
parents:
diff changeset
4160
a61af66fc99e Initial load
duke
parents:
diff changeset
4161 // check if this class can access its super class
a61af66fc99e Initial load
duke
parents:
diff changeset
4162 check_super_class_access(this_klass, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
4163
a61af66fc99e Initial load
duke
parents:
diff changeset
4164 // check if this class can access its superinterfaces
a61af66fc99e Initial load
duke
parents:
diff changeset
4165 check_super_interface_access(this_klass, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
4166
a61af66fc99e Initial load
duke
parents:
diff changeset
4167 // check if this class overrides any final method
a61af66fc99e Initial load
duke
parents:
diff changeset
4168 check_final_method_override(this_klass, CHECK_(nullHandle));
a61af66fc99e Initial load
duke
parents:
diff changeset
4169
a61af66fc99e Initial load
duke
parents:
diff changeset
4170 // check that if this class is an interface then it doesn't have static methods
a61af66fc99e Initial load
duke
parents:
diff changeset
4171 if (this_klass->is_interface()) {
7579
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4172 /* An interface in a JAVA 8 classfile can be static */
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4173 if (_major_version < JAVA_8_VERSION) {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4174 check_illegal_static_method(this_klass, CHECK_(nullHandle));
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4175 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4176 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4177
10343
6bd680e9ea35 8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents: 10340
diff changeset
4178 // Allocate mirror and initialize static fields
20415
47e3110c47e8 6642881: Improve performance of Class.getClassLoader()
coleenp
parents: 20375
diff changeset
4179 java_lang_Class::create_mirror(this_klass, class_loader, protection_domain,
47e3110c47e8 6642881: Improve performance of Class.getClassLoader()
coleenp
parents: 20375
diff changeset
4180 CHECK_(nullHandle));
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4181
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4182 // Generate any default methods - default methods are interface methods
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4183 // that have a default implementation. This is new with Lambda project.
13055
fce21ac5968d 8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents: 12924
diff changeset
4184 if (has_default_methods ) {
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4185 DefaultMethods::generate_default_methods(
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4186 this_klass(), &all_mirandas, CHECK_(nullHandle));
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4187 }
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4188
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4189 // Update the loader_data graph.
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4190 record_defined_class_dependencies(this_klass, CHECK_NULL);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4191
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4192 ClassLoadingService::notify_class_loaded(InstanceKlass::cast(this_klass()),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4193 false /* not shared class */);
a61af66fc99e Initial load
duke
parents:
diff changeset
4194
a61af66fc99e Initial load
duke
parents:
diff changeset
4195 if (TraceClassLoading) {
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4196 ResourceMark rm;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4197 // print in a single call to reduce interleaving of output
a61af66fc99e Initial load
duke
parents:
diff changeset
4198 if (cfs->source() != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4199 tty->print("[Loaded %s from %s]\n", this_klass->external_name(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4200 cfs->source());
a61af66fc99e Initial load
duke
parents:
diff changeset
4201 } else if (class_loader.is_null()) {
20561
8e15758b2e94 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents: 20528
diff changeset
4202 Klass* caller =
8e15758b2e94 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents: 20528
diff changeset
4203 THREAD->is_Java_thread()
8e15758b2e94 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents: 20528
diff changeset
4204 ? ((JavaThread*)THREAD)->security_get_caller_class(1)
8e15758b2e94 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents: 20528
diff changeset
4205 : NULL;
8e15758b2e94 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents: 20528
diff changeset
4206 // caller can be NULL, for example, during a JVMTI VM_Init hook
8e15758b2e94 8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents: 20528
diff changeset
4207 if (caller != NULL) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4208 tty->print("[Loaded %s by instance of %s]\n",
a61af66fc99e Initial load
duke
parents:
diff changeset
4209 this_klass->external_name(),
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4210 InstanceKlass::cast(caller)->external_name());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4211 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
4212 tty->print("[Loaded %s]\n", this_klass->external_name());
a61af66fc99e Initial load
duke
parents:
diff changeset
4213 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4214 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
4215 tty->print("[Loaded %s from %s]\n", this_klass->external_name(),
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4216 InstanceKlass::cast(class_loader->klass())->external_name());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4217 }
19459
18e21237807b put the code for printing a stack trace as part of -verbose:class behind the WizardMode flag
Doug Simon <doug.simon@oracle.com>
parents: 19425
diff changeset
4218 if (WizardMode) {
18e21237807b put the code for printing a stack trace as part of -verbose:class behind the WizardMode flag
Doug Simon <doug.simon@oracle.com>
parents: 19425
diff changeset
4219 // useful when investigating why a class is loaded
18e21237807b put the code for printing a stack trace as part of -verbose:class behind the WizardMode flag
Doug Simon <doug.simon@oracle.com>
parents: 19425
diff changeset
4220 JavaThread::current()->print_stack_on(tty);
18e21237807b put the code for printing a stack trace as part of -verbose:class behind the WizardMode flag
Doug Simon <doug.simon@oracle.com>
parents: 19425
diff changeset
4221 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4222 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4223
a61af66fc99e Initial load
duke
parents:
diff changeset
4224 if (TraceClassResolution) {
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4225 ResourceMark rm;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4226 // print out the superclass.
6983
070d523b96a7 8001471: Klass::cast() does nothing
hseigel
parents: 6940
diff changeset
4227 const char * from = this_klass()->external_name();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4228 if (this_klass->java_super() != NULL) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4229 tty->print("RESOLVE %s %s (super)\n", from, InstanceKlass::cast(this_klass->java_super())->external_name());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4230 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4231 // print out each of the interface classes referred to by this class.
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4232 Array<Klass*>* local_interfaces = this_klass->local_interfaces();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4233 if (local_interfaces != NULL) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4234 int length = local_interfaces->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4235 for (int i = 0; i < length; i++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4236 Klass* k = local_interfaces->at(i);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4237 InstanceKlass* to_class = InstanceKlass::cast(k);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4238 const char * to = to_class->external_name();
657
715dceaa89b7 6603316: Improve instrumentation for classes loaded at startup
acorn
parents: 652
diff changeset
4239 tty->print("RESOLVE %s %s (interface)\n", from, to);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4240 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4241 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4242 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4243
a61af66fc99e Initial load
duke
parents:
diff changeset
4244 // preserve result across HandleMark
a61af66fc99e Initial load
duke
parents:
diff changeset
4245 preserve_this_klass = this_klass();
a61af66fc99e Initial load
duke
parents:
diff changeset
4246 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4247
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4248 // Create new handle outside HandleMark (might be needed for
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4249 // Extended Class Redefinition)
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4250 instanceKlassHandle this_klass (THREAD, preserve_this_klass);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4251 debug_only(this_klass->verify();)
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4252
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4253 // Clear class if no error has occurred so destructor doesn't deallocate it
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4254 _klass = NULL;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4255 return this_klass;
a61af66fc99e Initial load
duke
parents:
diff changeset
4256 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4257
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4258 // Destructor to clean up if there's an error
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4259 ClassFileParser::~ClassFileParser() {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4260 MetadataFactory::free_metadata(_loader_data, _cp);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4261 MetadataFactory::free_array<u2>(_loader_data, _fields);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4262
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4263 // Free methods
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4264 InstanceKlass::deallocate_methods(_loader_data, _methods);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4265
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4266 // beware of the Universe::empty_blah_array!!
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4267 if (_inner_classes != Universe::the_empty_short_array()) {
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4268 MetadataFactory::free_array<u2>(_loader_data, _inner_classes);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4269 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4270
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4271 // Free interfaces
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4272 InstanceKlass::deallocate_interfaces(_loader_data, _super_klass(),
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4273 _local_interfaces, _transitive_interfaces);
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4274
20703
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4275 if (_combined_annotations != NULL) {
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4276 // After all annotations arrays have been created, they are installed into the
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4277 // Annotations object that will be assigned to the InstanceKlass being created.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4278
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4279 // Deallocate the Annotations object and the installed annotations arrays.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4280 _combined_annotations->deallocate_contents(_loader_data);
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4281
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4282 // If the _combined_annotations pointer is non-NULL,
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4283 // then the other annotations fields should have been cleared.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4284 assert(_annotations == NULL, "Should have been cleared");
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4285 assert(_type_annotations == NULL, "Should have been cleared");
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4286 assert(_fields_annotations == NULL, "Should have been cleared");
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4287 assert(_fields_type_annotations == NULL, "Should have been cleared");
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4288 } else {
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4289 // If the annotations arrays were not installed into the Annotations object,
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4290 // then they have to be deallocated explicitly.
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4291 MetadataFactory::free_array<u1>(_loader_data, _annotations);
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4292 MetadataFactory::free_array<u1>(_loader_data, _type_annotations);
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4293 Annotations::free_contents(_loader_data, _fields_annotations);
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4294 Annotations::free_contents(_loader_data, _fields_type_annotations);
0fa1f71a905b 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents: 20576
diff changeset
4295 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4296
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4297 clear_class_metadata();
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4298
17883
9428a0b94204 8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents: 17646
diff changeset
4299 // deallocate the klass if already created. Don't directly deallocate, but add
9428a0b94204 8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents: 17646
diff changeset
4300 // to the deallocate list so that the klass is removed from the CLD::_klasses list
9428a0b94204 8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents: 17646
diff changeset
4301 // at a safepoint.
9428a0b94204 8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents: 17646
diff changeset
4302 if (_klass != NULL) {
9428a0b94204 8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents: 17646
diff changeset
4303 _loader_data->add_to_deallocate_list(_klass);
9428a0b94204 8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents: 17646
diff changeset
4304 }
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4305 _klass = NULL;
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4306 }
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4307
7587
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4308 void ClassFileParser::print_field_layout(Symbol* name,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4309 Array<u2>* fields,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4310 constantPoolHandle cp,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4311 int instance_size,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4312 int instance_fields_start,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4313 int instance_fields_end,
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4314 int static_fields_end) {
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4315 tty->print("%s: field layout\n", name->as_klass_external_name());
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4316 tty->print(" @%3d %s\n", instance_fields_start, "--- instance fields start ---");
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4317 for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4318 if (!fs.access_flags().is_static()) {
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4319 tty->print(" @%3d \"%s\" %s\n",
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4320 fs.offset(),
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4321 fs.name()->as_klass_external_name(),
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4322 fs.signature()->as_klass_external_name());
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4323 }
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4324 }
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4325 tty->print(" @%3d %s\n", instance_fields_end, "--- instance fields end ---");
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4326 tty->print(" @%3d %s\n", instance_size * wordSize, "--- instance ends ---");
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4327 tty->print(" @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---");
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4328 for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4329 if (fs.access_flags().is_static()) {
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4330 tty->print(" @%3d \"%s\" %s\n",
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4331 fs.offset(),
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4332 fs.name()->as_klass_external_name(),
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4333 fs.signature()->as_klass_external_name());
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4334 }
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4335 }
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4336 tty->print(" @%3d %s\n", static_fields_end, "--- static fields end ---");
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4337 tty->print("\n");
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4338 }
4a916f2ce331 8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents: 7579
diff changeset
4339
939
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4340 unsigned int
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4341 ClassFileParser::compute_oop_map_count(instanceKlassHandle super,
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4342 unsigned int nonstatic_oop_map_count,
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4343 int first_nonstatic_oop_offset) {
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4344 unsigned int map_count =
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4345 super.is_null() ? 0 : super->nonstatic_oop_map_count();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4346 if (nonstatic_oop_map_count > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4347 // We have oops to add to map
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4348 if (map_count == 0) {
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4349 map_count = nonstatic_oop_map_count;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4350 } else {
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4351 // Check whether we should add a new map block or whether the last one can
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4352 // be extended
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4353 OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps();
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4354 OopMapBlock* const last_map = first_map + map_count - 1;
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4355
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4356 int next_offset = last_map->offset() + last_map->count() * heapOopSize;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4357 if (next_offset == first_nonstatic_oop_offset) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4358 // There is no gap bettwen superklass's last oop field and first
a61af66fc99e Initial load
duke
parents:
diff changeset
4359 // local oop field, merge maps.
a61af66fc99e Initial load
duke
parents:
diff changeset
4360 nonstatic_oop_map_count -= 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
4361 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
4362 // Superklass didn't end with a oop field, add extra maps
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4363 assert(next_offset < first_nonstatic_oop_offset, "just checking");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4364 }
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4365 map_count += nonstatic_oop_map_count;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4366 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4367 }
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4368 return map_count;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4369 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4370
a61af66fc99e Initial load
duke
parents:
diff changeset
4371
a61af66fc99e Initial load
duke
parents:
diff changeset
4372 void ClassFileParser::fill_oop_maps(instanceKlassHandle k,
939
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4373 unsigned int nonstatic_oop_map_count,
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4374 int* nonstatic_oop_offsets,
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4375 unsigned int* nonstatic_oop_counts) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4376 OopMapBlock* this_oop_map = k->start_of_nonstatic_oop_maps();
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4377 const InstanceKlass* const super = k->superklass();
939
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4378 const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0;
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4379 if (super_count > 0) {
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4380 // Copy maps from superklass
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4381 OopMapBlock* super_oop_map = super->start_of_nonstatic_oop_maps();
939
9eebd3ac74cf 6845368: large objects cause a crash or unexpected exception
jcoomes
parents: 938
diff changeset
4382 for (unsigned int i = 0; i < super_count; ++i) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4383 *this_oop_map++ = *super_oop_map++;
a61af66fc99e Initial load
duke
parents:
diff changeset
4384 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4385 }
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4386
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4387 if (nonstatic_oop_map_count > 0) {
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4388 if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) {
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4389 // The counts differ because there is no gap between superklass's last oop
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4390 // field and the first local oop field. Extend the last oop map copied
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4391 // from the superklass instead of creating new one.
a61af66fc99e Initial load
duke
parents:
diff changeset
4392 nonstatic_oop_map_count--;
a61af66fc99e Initial load
duke
parents:
diff changeset
4393 nonstatic_oop_offsets++;
a61af66fc99e Initial load
duke
parents:
diff changeset
4394 this_oop_map--;
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4395 this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4396 this_oop_map++;
a61af66fc99e Initial load
duke
parents:
diff changeset
4397 }
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4398
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4399 // Add new map blocks, fill them
a61af66fc99e Initial load
duke
parents:
diff changeset
4400 while (nonstatic_oop_map_count-- > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4401 this_oop_map->set_offset(*nonstatic_oop_offsets++);
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4402 this_oop_map->set_count(*nonstatic_oop_counts++);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4403 this_oop_map++;
a61af66fc99e Initial load
duke
parents:
diff changeset
4404 }
938
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4405 assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() ==
b37c246bf7ce 6861660: OopMapBlock count/size confusion
jcoomes
parents: 879
diff changeset
4406 this_oop_map, "sanity");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4407 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4408 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4409
a61af66fc99e Initial load
duke
parents:
diff changeset
4410
a61af66fc99e Initial load
duke
parents:
diff changeset
4411 void ClassFileParser::set_precomputed_flags(instanceKlassHandle k) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4412 Klass* super = k->super();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4413
a61af66fc99e Initial load
duke
parents:
diff changeset
4414 // Check if this klass has an empty finalize method (i.e. one with return bytecode only),
a61af66fc99e Initial load
duke
parents:
diff changeset
4415 // in which case we don't have to register objects as finalizable
a61af66fc99e Initial load
duke
parents:
diff changeset
4416 if (!_has_empty_finalizer) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4417 if (_has_finalizer ||
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4418 (super != NULL && super->has_finalizer())) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4419 k->set_has_finalizer();
a61af66fc99e Initial load
duke
parents:
diff changeset
4420 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4421 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4422
a61af66fc99e Initial load
duke
parents:
diff changeset
4423 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
4424 bool f = false;
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4425 Method* m = k->lookup_method(vmSymbols::finalize_method_name(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4426 vmSymbols::void_method_signature());
a61af66fc99e Initial load
duke
parents:
diff changeset
4427 if (m != NULL && !m->is_empty_method()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4428 f = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4429 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4430 assert(f == k->has_finalizer(), "inconsistent has_finalizer");
a61af66fc99e Initial load
duke
parents:
diff changeset
4431 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
4432
a61af66fc99e Initial load
duke
parents:
diff changeset
4433 // Check if this klass supports the java.lang.Cloneable interface
1142
4ce7240d622c 6914300: ciEnv should export all well known classes
never
parents: 1138
diff changeset
4434 if (SystemDictionary::Cloneable_klass_loaded()) {
4ce7240d622c 6914300: ciEnv should export all well known classes
never
parents: 1138
diff changeset
4435 if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4436 k->set_is_cloneable();
a61af66fc99e Initial load
duke
parents:
diff changeset
4437 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4438 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4439
a61af66fc99e Initial load
duke
parents:
diff changeset
4440 // Check if this klass has a vanilla default constructor
a61af66fc99e Initial load
duke
parents:
diff changeset
4441 if (super == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4442 // java.lang.Object has empty default constructor
a61af66fc99e Initial load
duke
parents:
diff changeset
4443 k->set_has_vanilla_constructor();
a61af66fc99e Initial load
duke
parents:
diff changeset
4444 } else {
6983
070d523b96a7 8001471: Klass::cast() does nothing
hseigel
parents: 6940
diff changeset
4445 if (super->has_vanilla_constructor() &&
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4446 _has_vanilla_constructor) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4447 k->set_has_vanilla_constructor();
a61af66fc99e Initial load
duke
parents:
diff changeset
4448 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4449 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
4450 bool v = false;
6983
070d523b96a7 8001471: Klass::cast() does nothing
hseigel
parents: 6940
diff changeset
4451 if (super->has_vanilla_constructor()) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4452 Method* constructor = k->find_method(vmSymbols::object_initializer_name(
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4453 ), vmSymbols::void_method_signature());
a61af66fc99e Initial load
duke
parents:
diff changeset
4454 if (constructor != NULL && constructor->is_vanilla_constructor()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4455 v = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4456 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4457 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4458 assert(v == k->has_vanilla_constructor(), "inconsistent has_vanilla_constructor");
a61af66fc99e Initial load
duke
parents:
diff changeset
4459 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
4460 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4461
a61af66fc99e Initial load
duke
parents:
diff changeset
4462 // If it cannot be fast-path allocated, set a bit in the layout helper.
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4463 // See documentation of InstanceKlass::can_be_fastpath_allocated().
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4464 assert(k->size_helper() > 0, "layout_helper is initialized");
a61af66fc99e Initial load
duke
parents:
diff changeset
4465 if ((!RegisterFinalizersAtInit && k->has_finalizer())
a61af66fc99e Initial load
duke
parents:
diff changeset
4466 || k->is_abstract() || k->is_interface()
7185
90273fc0a981 8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents: 6983
diff changeset
4467 || (k->name() == vmSymbols::java_lang_Class() && k->class_loader() == NULL)
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4468 || k->size_helper() >= FastAllocateSizeLimit) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4469 // Forbid fast-path allocation.
a61af66fc99e Initial load
duke
parents:
diff changeset
4470 jint lh = Klass::instance_layout_helper(k->size_helper(), true);
a61af66fc99e Initial load
duke
parents:
diff changeset
4471 k->set_layout_helper(lh);
a61af66fc99e Initial load
duke
parents:
diff changeset
4472 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4473 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4474
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4475 // Attach super classes and interface classes to class loader data
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4476 void ClassFileParser::record_defined_class_dependencies(instanceKlassHandle defined_klass, TRAPS) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4477 ClassLoaderData * defining_loader_data = defined_klass->class_loader_data();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4478 if (defining_loader_data->is_the_null_class_loader_data()) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4479 // Dependencies to null class loader data are implicit.
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4480 return;
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4481 } else {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4482 // add super class dependency
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4483 Klass* super = defined_klass->super();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4484 if (super != NULL) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4485 defining_loader_data->record_dependency(super, CHECK);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4486 }
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4487
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4488 // add super interface dependencies
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4489 Array<Klass*>* local_interfaces = defined_klass->local_interfaces();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4490 if (local_interfaces != NULL) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4491 int length = local_interfaces->length();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4492 for (int i = 0; i < length; i++) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4493 defining_loader_data->record_dependency(local_interfaces->at(i), CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4494 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4495 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4496 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4497 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4498
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4499 // utility methods for appending an array with check for duplicates
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4500
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4501 void append_interfaces(GrowableArray<Klass*>* result, Array<Klass*>* ifs) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4502 // iterate over new interfaces
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4503 for (int i = 0; i < ifs->length(); i++) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4504 Klass* e = ifs->at(i);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4505 assert(e->is_klass() && InstanceKlass::cast(e)->is_interface(), "just checking");
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4506 // add new interface
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4507 result->append_if_missing(e);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4508 }
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4509 }
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4510
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4511 Array<Klass*>* ClassFileParser::compute_transitive_interfaces(
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4512 instanceKlassHandle super,
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4513 Array<Klass*>* local_ifs, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4514 // Compute maximum size for transitive interfaces
a61af66fc99e Initial load
duke
parents:
diff changeset
4515 int max_transitive_size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4516 int super_size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4517 // Add superclass transitive interfaces size
a61af66fc99e Initial load
duke
parents:
diff changeset
4518 if (super.not_null()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4519 super_size = super->transitive_interfaces()->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4520 max_transitive_size += super_size;
a61af66fc99e Initial load
duke
parents:
diff changeset
4521 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4522 // Add local interfaces' super interfaces
a61af66fc99e Initial load
duke
parents:
diff changeset
4523 int local_size = local_ifs->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4524 for (int i = 0; i < local_size; i++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4525 Klass* l = local_ifs->at(i);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4526 max_transitive_size += InstanceKlass::cast(l)->transitive_interfaces()->length();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4527 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4528 // Finally add local interfaces
a61af66fc99e Initial load
duke
parents:
diff changeset
4529 max_transitive_size += local_size;
a61af66fc99e Initial load
duke
parents:
diff changeset
4530 // Construct array
a61af66fc99e Initial load
duke
parents:
diff changeset
4531 if (max_transitive_size == 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4532 // no interfaces, use canonicalized array
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4533 return Universe::the_empty_klass_array();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4534 } else if (max_transitive_size == super_size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4535 // no new local interfaces added, share superklass' transitive interface array
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4536 return super->transitive_interfaces();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4537 } else if (max_transitive_size == local_size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4538 // only local interfaces added, share local interface array
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4539 return local_ifs;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4540 } else {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4541 ResourceMark rm;
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4542 GrowableArray<Klass*>* result = new GrowableArray<Klass*>(max_transitive_size);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4543
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4544 // Copy down from superclass
a61af66fc99e Initial load
duke
parents:
diff changeset
4545 if (super.not_null()) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4546 append_interfaces(result, super->transitive_interfaces());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4547 }
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4548
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4549 // Copy down from local interfaces' superinterfaces
a61af66fc99e Initial load
duke
parents:
diff changeset
4550 for (int i = 0; i < local_ifs->length(); i++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4551 Klass* l = local_ifs->at(i);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4552 append_interfaces(result, InstanceKlass::cast(l)->transitive_interfaces());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4553 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4554 // Finally add local interfaces
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4555 append_interfaces(result, local_ifs);
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4556
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4557 // length will be less than the max_transitive_size if duplicates were removed
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4558 int length = result->length();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4559 assert(length <= max_transitive_size, "just checking");
8719
c8b31b461e1a 8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents: 8716
diff changeset
4560 Array<Klass*>* new_result = MetadataFactory::new_array<Klass*>(_loader_data, length, CHECK_NULL);
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4561 for (int i = 0; i < length; i++) {
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4562 Klass* e = result->at(i);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4563 assert(e != NULL, "just checking");
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4564 new_result->at_put(i, e);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4565 }
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4566 return new_result;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4567 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4568 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4569
a61af66fc99e Initial load
duke
parents:
diff changeset
4570 void ClassFileParser::check_super_class_access(instanceKlassHandle this_klass, TRAPS) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4571 Klass* super = this_klass->super();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4572 if ((super != NULL) &&
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4573 (!Reflection::verify_class_access(this_klass(), super, false))) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4574 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4575 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4576 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4577 vmSymbols::java_lang_IllegalAccessError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4578 "class %s cannot access its superclass %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
4579 this_klass->external_name(),
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4580 InstanceKlass::cast(super)->external_name()
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4581 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4582 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4583 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4584 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4585
a61af66fc99e Initial load
duke
parents:
diff changeset
4586
a61af66fc99e Initial load
duke
parents:
diff changeset
4587 void ClassFileParser::check_super_interface_access(instanceKlassHandle this_klass, TRAPS) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4588 Array<Klass*>* local_interfaces = this_klass->local_interfaces();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4589 int lng = local_interfaces->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4590 for (int i = lng - 1; i >= 0; i--) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4591 Klass* k = local_interfaces->at(i);
6983
070d523b96a7 8001471: Klass::cast() does nothing
hseigel
parents: 6940
diff changeset
4592 assert (k != NULL && k->is_interface(), "invalid interface");
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4593 if (!Reflection::verify_class_access(this_klass(), k, false)) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4594 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4595 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4596 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4597 vmSymbols::java_lang_IllegalAccessError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4598 "class %s cannot access its superinterface %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
4599 this_klass->external_name(),
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4600 InstanceKlass::cast(k)->external_name()
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4601 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4602 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4603 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4604 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4605 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4606
a61af66fc99e Initial load
duke
parents:
diff changeset
4607
a61af66fc99e Initial load
duke
parents:
diff changeset
4608 void ClassFileParser::check_final_method_override(instanceKlassHandle this_klass, TRAPS) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4609 Array<Method*>* methods = this_klass->methods();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4610 int num_methods = methods->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4611
a61af66fc99e Initial load
duke
parents:
diff changeset
4612 // go thru each method and check if it overrides a final method
a61af66fc99e Initial load
duke
parents:
diff changeset
4613 for (int index = 0; index < num_methods; index++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4614 Method* m = methods->at(index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4615
13398
19146c82b6fc 8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents: 13055
diff changeset
4616 // skip private, static, and <init> methods
19146c82b6fc 8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents: 13055
diff changeset
4617 if ((!m->is_private() && !m->is_static()) &&
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4618 (m->name() != vmSymbols::object_initializer_name())) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4619
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4620 Symbol* name = m->name();
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4621 Symbol* signature = m->signature();
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4622 Klass* k = this_klass->super();
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4623 Method* super_m = NULL;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4624 while (k != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4625 // skip supers that don't have final methods.
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4626 if (k->has_final_method()) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4627 // lookup a matching method in the super class hierarchy
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4628 super_m = InstanceKlass::cast(k)->lookup_method(name, signature);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4629 if (super_m == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4630 break; // didn't find any match; get out
a61af66fc99e Initial load
duke
parents:
diff changeset
4631 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4632
17640
4638c4d7ff10 8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents: 13398
diff changeset
4633 if (super_m->is_final() && !super_m->is_static() &&
4638c4d7ff10 8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents: 13398
diff changeset
4634 // matching method in super is final, and not static
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4635 (Reflection::verify_field_access(this_klass(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4636 super_m->method_holder(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4637 super_m->method_holder(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4638 super_m->access_flags(), false))
a61af66fc99e Initial load
duke
parents:
diff changeset
4639 // this class can access super final method and therefore override
a61af66fc99e Initial load
duke
parents:
diff changeset
4640 ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4641 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4642 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4643 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4644 vmSymbols::java_lang_VerifyError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4645 "class %s overrides final method %s.%s",
a61af66fc99e Initial load
duke
parents:
diff changeset
4646 this_klass->external_name(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4647 name->as_C_string(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4648 signature->as_C_string()
a61af66fc99e Initial load
duke
parents:
diff changeset
4649 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4650 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4651 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4652
a61af66fc99e Initial load
duke
parents:
diff changeset
4653 // continue to look from super_m's holder's super.
6940
18fb7da42534 8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents: 6934
diff changeset
4654 k = super_m->method_holder()->super();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4655 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
4656 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4657
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4658 k = k->super();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4659 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4660 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4661 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4662 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4663
a61af66fc99e Initial load
duke
parents:
diff changeset
4664
a61af66fc99e Initial load
duke
parents:
diff changeset
4665 // assumes that this_klass is an interface
a61af66fc99e Initial load
duke
parents:
diff changeset
4666 void ClassFileParser::check_illegal_static_method(instanceKlassHandle this_klass, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4667 assert(this_klass->is_interface(), "not an interface");
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4668 Array<Method*>* methods = this_klass->methods();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4669 int num_methods = methods->length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4670
a61af66fc99e Initial load
duke
parents:
diff changeset
4671 for (int index = 0; index < num_methods; index++) {
6725
da91efe96a93 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 6266
diff changeset
4672 Method* m = methods->at(index);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4673 // if m is static and not the init method, throw a verify error
a61af66fc99e Initial load
duke
parents:
diff changeset
4674 if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4675 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4676 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4677 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4678 vmSymbols::java_lang_VerifyError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4679 "Illegal static method %s in interface %s",
a61af66fc99e Initial load
duke
parents:
diff changeset
4680 m->name()->as_C_string(),
a61af66fc99e Initial load
duke
parents:
diff changeset
4681 this_klass->external_name()
a61af66fc99e Initial load
duke
parents:
diff changeset
4682 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4683 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4684 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4685 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4686 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4687
a61af66fc99e Initial load
duke
parents:
diff changeset
4688 // utility methods for format checking
a61af66fc99e Initial load
duke
parents:
diff changeset
4689
a61af66fc99e Initial load
duke
parents:
diff changeset
4690 void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4691 if (!_need_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
4692
a61af66fc99e Initial load
duke
parents:
diff changeset
4693 const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4694 const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4695 const bool is_final = (flags & JVM_ACC_FINAL) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4696 const bool is_super = (flags & JVM_ACC_SUPER) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4697 const bool is_enum = (flags & JVM_ACC_ENUM) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4698 const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4699 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION;
a61af66fc99e Initial load
duke
parents:
diff changeset
4700
a61af66fc99e Initial load
duke
parents:
diff changeset
4701 if ((is_abstract && is_final) ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4702 (is_interface && !is_abstract) ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4703 (is_interface && major_gte_15 && (is_super || is_enum)) ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4704 (!is_interface && major_gte_15 && is_annotation)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4705 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4706 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4707 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4708 vmSymbols::java_lang_ClassFormatError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4709 "Illegal class modifiers in class %s: 0x%X",
a61af66fc99e Initial load
duke
parents:
diff changeset
4710 _class_name->as_C_string(), flags
a61af66fc99e Initial load
duke
parents:
diff changeset
4711 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4712 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4713 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4714 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4715
a61af66fc99e Initial load
duke
parents:
diff changeset
4716 bool ClassFileParser::has_illegal_visibility(jint flags) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4717 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4718 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4719 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4720
a61af66fc99e Initial load
duke
parents:
diff changeset
4721 return ((is_public && is_protected) ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4722 (is_public && is_private) ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4723 (is_protected && is_private));
a61af66fc99e Initial load
duke
parents:
diff changeset
4724 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4725
a61af66fc99e Initial load
duke
parents:
diff changeset
4726 bool ClassFileParser::is_supported_version(u2 major, u2 minor) {
1124
2e8bdfdd3ba2 6899467: System property java.class.version out-of-sync with VM for jdk 5.0 with HS 16 in nightly build
xlu
parents: 977
diff changeset
4727 u2 max_version =
2e8bdfdd3ba2 6899467: System property java.class.version out-of-sync with VM for jdk 5.0 with HS 16 in nightly build
xlu
parents: 977
diff changeset
4728 JDK_Version::is_gte_jdk17x_version() ? JAVA_MAX_SUPPORTED_VERSION :
2e8bdfdd3ba2 6899467: System property java.class.version out-of-sync with VM for jdk 5.0 with HS 16 in nightly build
xlu
parents: 977
diff changeset
4729 (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4730 return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
176
6b648fefb395 6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents: 136
diff changeset
4731 (major <= max_version) &&
6b648fefb395 6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents: 136
diff changeset
4732 ((major != max_version) ||
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4733 (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION));
a61af66fc99e Initial load
duke
parents:
diff changeset
4734 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4735
a61af66fc99e Initial load
duke
parents:
diff changeset
4736 void ClassFileParser::verify_legal_field_modifiers(
a61af66fc99e Initial load
duke
parents:
diff changeset
4737 jint flags, bool is_interface, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4738 if (!_need_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
4739
a61af66fc99e Initial load
duke
parents:
diff changeset
4740 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4741 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4742 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4743 const bool is_static = (flags & JVM_ACC_STATIC) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4744 const bool is_final = (flags & JVM_ACC_FINAL) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4745 const bool is_volatile = (flags & JVM_ACC_VOLATILE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4746 const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4747 const bool is_enum = (flags & JVM_ACC_ENUM) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4748 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION;
a61af66fc99e Initial load
duke
parents:
diff changeset
4749
a61af66fc99e Initial load
duke
parents:
diff changeset
4750 bool is_illegal = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
4751
a61af66fc99e Initial load
duke
parents:
diff changeset
4752 if (is_interface) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4753 if (!is_public || !is_static || !is_final || is_private ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4754 is_protected || is_volatile || is_transient ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4755 (major_gte_15 && is_enum)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4756 is_illegal = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4757 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4758 } else { // not interface
a61af66fc99e Initial load
duke
parents:
diff changeset
4759 if (has_illegal_visibility(flags) || (is_final && is_volatile)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4760 is_illegal = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4761 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4762 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4763
a61af66fc99e Initial load
duke
parents:
diff changeset
4764 if (is_illegal) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4765 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4766 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4767 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4768 vmSymbols::java_lang_ClassFormatError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4769 "Illegal field modifiers in class %s: 0x%X",
a61af66fc99e Initial load
duke
parents:
diff changeset
4770 _class_name->as_C_string(), flags);
a61af66fc99e Initial load
duke
parents:
diff changeset
4771 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4772 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4773 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4774
a61af66fc99e Initial load
duke
parents:
diff changeset
4775 void ClassFileParser::verify_legal_method_modifiers(
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4776 jint flags, bool is_interface, Symbol* name, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4777 if (!_need_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
4778
a61af66fc99e Initial load
duke
parents:
diff changeset
4779 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4780 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4781 const bool is_static = (flags & JVM_ACC_STATIC) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4782 const bool is_final = (flags & JVM_ACC_FINAL) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4783 const bool is_native = (flags & JVM_ACC_NATIVE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4784 const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4785 const bool is_bridge = (flags & JVM_ACC_BRIDGE) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4786 const bool is_strict = (flags & JVM_ACC_STRICT) != 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4787 const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0;
7579
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4788 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4789 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION;
6934
4735d2c84362 7200776: Implement default methods in interfaces
kamg
parents: 6870
diff changeset
4790 const bool major_gte_8 = _major_version >= JAVA_8_VERSION;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4791 const bool is_initializer = (name == vmSymbols::object_initializer_name());
a61af66fc99e Initial load
duke
parents:
diff changeset
4792
a61af66fc99e Initial load
duke
parents:
diff changeset
4793 bool is_illegal = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
4794
a61af66fc99e Initial load
duke
parents:
diff changeset
4795 if (is_interface) {
7579
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4796 if (major_gte_8) {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4797 // Class file version is JAVA_8_VERSION or later Methods of
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4798 // interfaces may set any of the flags except ACC_PROTECTED,
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4799 // ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4800 // have exactly one of the ACC_PUBLIC or ACC_PRIVATE flags set.
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4801 if ((is_public == is_private) || /* Only one of private and public should be true - XNOR */
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4802 (is_native || is_protected || is_final || is_synchronized) ||
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4803 // If a specific method of a class or interface has its
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4804 // ACC_ABSTRACT flag set, it must not have any of its
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4805 // ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC,
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4806 // ACC_STRICT, or ACC_SYNCHRONIZED flags set. No need to
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4807 // check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4808 // those flags are illegal irrespective of ACC_ABSTRACT being set or not.
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4809 (is_abstract && (is_private || is_static || is_strict))) {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4810 is_illegal = true;
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4811 }
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4812 } else if (major_gte_15) {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4813 // Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION)
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4814 if (!is_public || is_static || is_final || is_synchronized ||
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4815 is_native || !is_abstract || is_strict) {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4816 is_illegal = true;
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4817 }
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4818 } else {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4819 // Class file version is pre-JAVA_1_5_VERSION
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4820 if (!is_public || is_static || is_final || is_native || !is_abstract) {
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4821 is_illegal = true;
adc176e95bf2 8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents: 7462
diff changeset
4822 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4823 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4824 } else { // not interface
a61af66fc99e Initial load
duke
parents:
diff changeset
4825 if (is_initializer) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4826 if (is_static || is_final || is_synchronized || is_native ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4827 is_abstract || (major_gte_15 && is_bridge)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4828 is_illegal = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4829 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4830 } else { // not initializer
a61af66fc99e Initial load
duke
parents:
diff changeset
4831 if (is_abstract) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4832 if ((is_final || is_native || is_private || is_static ||
a61af66fc99e Initial load
duke
parents:
diff changeset
4833 (major_gte_15 && (is_synchronized || is_strict)))) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4834 is_illegal = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4835 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4836 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4837 if (has_illegal_visibility(flags)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4838 is_illegal = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
4839 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4840 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4841 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4842
a61af66fc99e Initial load
duke
parents:
diff changeset
4843 if (is_illegal) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4844 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4845 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4846 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4847 vmSymbols::java_lang_ClassFormatError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4848 "Method %s in class %s has illegal modifiers: 0x%X",
a61af66fc99e Initial load
duke
parents:
diff changeset
4849 name->as_C_string(), _class_name->as_C_string(), flags);
a61af66fc99e Initial load
duke
parents:
diff changeset
4850 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4851 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4852 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4853
a61af66fc99e Initial load
duke
parents:
diff changeset
4854 void ClassFileParser::verify_legal_utf8(const unsigned char* buffer, int length, TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4855 assert(_need_verify, "only called when _need_verify is true");
a61af66fc99e Initial load
duke
parents:
diff changeset
4856 int i = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
4857 int count = length >> 2;
a61af66fc99e Initial load
duke
parents:
diff changeset
4858 for (int k=0; k<count; k++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4859 unsigned char b0 = buffer[i];
a61af66fc99e Initial load
duke
parents:
diff changeset
4860 unsigned char b1 = buffer[i+1];
a61af66fc99e Initial load
duke
parents:
diff changeset
4861 unsigned char b2 = buffer[i+2];
a61af66fc99e Initial load
duke
parents:
diff changeset
4862 unsigned char b3 = buffer[i+3];
a61af66fc99e Initial load
duke
parents:
diff changeset
4863 // For an unsigned char v,
a61af66fc99e Initial load
duke
parents:
diff changeset
4864 // (v | v - 1) is < 128 (highest bit 0) for 0 < v < 128;
a61af66fc99e Initial load
duke
parents:
diff changeset
4865 // (v | v - 1) is >= 128 (highest bit 1) for v == 0 or v >= 128.
a61af66fc99e Initial load
duke
parents:
diff changeset
4866 unsigned char res = b0 | b0 - 1 |
a61af66fc99e Initial load
duke
parents:
diff changeset
4867 b1 | b1 - 1 |
a61af66fc99e Initial load
duke
parents:
diff changeset
4868 b2 | b2 - 1 |
a61af66fc99e Initial load
duke
parents:
diff changeset
4869 b3 | b3 - 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
4870 if (res >= 128) break;
a61af66fc99e Initial load
duke
parents:
diff changeset
4871 i += 4;
a61af66fc99e Initial load
duke
parents:
diff changeset
4872 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4873 for(; i < length; i++) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4874 unsigned short c;
a61af66fc99e Initial load
duke
parents:
diff changeset
4875 // no embedded zeros
a61af66fc99e Initial load
duke
parents:
diff changeset
4876 guarantee_property((buffer[i] != 0), "Illegal UTF8 string in constant pool in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
4877 if(buffer[i] < 128) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4878 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
4879 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4880 if ((i + 5) < length) { // see if it's legal supplementary character
a61af66fc99e Initial load
duke
parents:
diff changeset
4881 if (UTF8::is_supplementary_character(&buffer[i])) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4882 c = UTF8::get_supplementary_character(&buffer[i]);
a61af66fc99e Initial load
duke
parents:
diff changeset
4883 i += 5;
a61af66fc99e Initial load
duke
parents:
diff changeset
4884 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
4885 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4886 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4887 switch (buffer[i] >> 4) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4888 default: break;
a61af66fc99e Initial load
duke
parents:
diff changeset
4889 case 0x8: case 0x9: case 0xA: case 0xB: case 0xF:
a61af66fc99e Initial load
duke
parents:
diff changeset
4890 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
4891 case 0xC: case 0xD: // 110xxxxx 10xxxxxx
a61af66fc99e Initial load
duke
parents:
diff changeset
4892 c = (buffer[i] & 0x1F) << 6;
a61af66fc99e Initial load
duke
parents:
diff changeset
4893 i++;
a61af66fc99e Initial load
duke
parents:
diff changeset
4894 if ((i < length) && ((buffer[i] & 0xC0) == 0x80)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4895 c += buffer[i] & 0x3F;
a61af66fc99e Initial load
duke
parents:
diff changeset
4896 if (_major_version <= 47 || c == 0 || c >= 0x80) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4897 // for classes with major > 47, c must a null or a character in its shortest form
a61af66fc99e Initial load
duke
parents:
diff changeset
4898 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
4899 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4900 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4901 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
4902 case 0xE: // 1110xxxx 10xxxxxx 10xxxxxx
a61af66fc99e Initial load
duke
parents:
diff changeset
4903 c = (buffer[i] & 0xF) << 12;
a61af66fc99e Initial load
duke
parents:
diff changeset
4904 i += 2;
a61af66fc99e Initial load
duke
parents:
diff changeset
4905 if ((i < length) && ((buffer[i-1] & 0xC0) == 0x80) && ((buffer[i] & 0xC0) == 0x80)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4906 c += ((buffer[i-1] & 0x3F) << 6) + (buffer[i] & 0x3F);
a61af66fc99e Initial load
duke
parents:
diff changeset
4907 if (_major_version <= 47 || c >= 0x800) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4908 // for classes with major > 47, c must be in its shortest form
a61af66fc99e Initial load
duke
parents:
diff changeset
4909 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
4910 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4911 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4912 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
4913 } // end of switch
a61af66fc99e Initial load
duke
parents:
diff changeset
4914 } // end of for
a61af66fc99e Initial load
duke
parents:
diff changeset
4915 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4916
a61af66fc99e Initial load
duke
parents:
diff changeset
4917 // Checks if name is a legal class name.
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4918 void ClassFileParser::verify_legal_class_name(Symbol* name, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4919 if (!_need_verify || _relax_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
4920
a61af66fc99e Initial load
duke
parents:
diff changeset
4921 char buf[fixed_buffer_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
4922 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
4923 unsigned int length = name->utf8_length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4924 bool legal = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
4925
a61af66fc99e Initial load
duke
parents:
diff changeset
4926 if (length > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4927 char* p;
a61af66fc99e Initial load
duke
parents:
diff changeset
4928 if (bytes[0] == JVM_SIGNATURE_ARRAY) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4929 p = skip_over_field_signature(bytes, false, length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
4930 legal = (p != NULL) && ((p - bytes) == (int)length);
a61af66fc99e Initial load
duke
parents:
diff changeset
4931 } else if (_major_version < JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4932 if (bytes[0] != '<') {
a61af66fc99e Initial load
duke
parents:
diff changeset
4933 p = skip_over_field_name(bytes, true, length);
a61af66fc99e Initial load
duke
parents:
diff changeset
4934 legal = (p != NULL) && ((p - bytes) == (int)length);
a61af66fc99e Initial load
duke
parents:
diff changeset
4935 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4936 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
4937 // 4900761: relax the constraints based on JSR202 spec
a61af66fc99e Initial load
duke
parents:
diff changeset
4938 // Class names may be drawn from the entire Unicode character set.
a61af66fc99e Initial load
duke
parents:
diff changeset
4939 // Identifiers between '/' must be unqualified names.
a61af66fc99e Initial load
duke
parents:
diff changeset
4940 // The utf8 string has been verified when parsing cpool entries.
a61af66fc99e Initial load
duke
parents:
diff changeset
4941 legal = verify_unqualified_name(bytes, length, LegalClass);
a61af66fc99e Initial load
duke
parents:
diff changeset
4942 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4943 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4944 if (!legal) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4945 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4946 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4947 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4948 vmSymbols::java_lang_ClassFormatError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4949 "Illegal class name \"%s\" in class file %s", bytes,
a61af66fc99e Initial load
duke
parents:
diff changeset
4950 _class_name->as_C_string()
a61af66fc99e Initial load
duke
parents:
diff changeset
4951 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4952 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4953 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4954 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4955
a61af66fc99e Initial load
duke
parents:
diff changeset
4956 // Checks if name is a legal field name.
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4957 void ClassFileParser::verify_legal_field_name(Symbol* name, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4958 if (!_need_verify || _relax_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
4959
a61af66fc99e Initial load
duke
parents:
diff changeset
4960 char buf[fixed_buffer_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
4961 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
4962 unsigned int length = name->utf8_length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4963 bool legal = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
4964
a61af66fc99e Initial load
duke
parents:
diff changeset
4965 if (length > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4966 if (_major_version < JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4967 if (bytes[0] != '<') {
a61af66fc99e Initial load
duke
parents:
diff changeset
4968 char* p = skip_over_field_name(bytes, false, length);
a61af66fc99e Initial load
duke
parents:
diff changeset
4969 legal = (p != NULL) && ((p - bytes) == (int)length);
a61af66fc99e Initial load
duke
parents:
diff changeset
4970 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4971 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
4972 // 4881221: relax the constraints based on JSR202 spec
a61af66fc99e Initial load
duke
parents:
diff changeset
4973 legal = verify_unqualified_name(bytes, length, LegalField);
a61af66fc99e Initial load
duke
parents:
diff changeset
4974 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4975 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4976
a61af66fc99e Initial load
duke
parents:
diff changeset
4977 if (!legal) {
a61af66fc99e Initial load
duke
parents:
diff changeset
4978 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
4979 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
4980 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4981 vmSymbols::java_lang_ClassFormatError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4982 "Illegal field name \"%s\" in class %s", bytes,
a61af66fc99e Initial load
duke
parents:
diff changeset
4983 _class_name->as_C_string()
a61af66fc99e Initial load
duke
parents:
diff changeset
4984 );
a61af66fc99e Initial load
duke
parents:
diff changeset
4985 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
4986 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4987 }
a61af66fc99e Initial load
duke
parents:
diff changeset
4988
a61af66fc99e Initial load
duke
parents:
diff changeset
4989 // Checks if name is a legal method name.
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4990 void ClassFileParser::verify_legal_method_name(Symbol* name, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4991 if (!_need_verify || _relax_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
4992
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
4993 assert(name != NULL, "method name is null");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
4994 char buf[fixed_buffer_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
4995 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
4996 unsigned int length = name->utf8_length();
a61af66fc99e Initial load
duke
parents:
diff changeset
4997 bool legal = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
4998
a61af66fc99e Initial load
duke
parents:
diff changeset
4999 if (length > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5000 if (bytes[0] == '<') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5001 if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5002 legal = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
5003 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5004 } else if (_major_version < JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5005 char* p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5006 p = skip_over_field_name(bytes, false, length);
a61af66fc99e Initial load
duke
parents:
diff changeset
5007 legal = (p != NULL) && ((p - bytes) == (int)length);
a61af66fc99e Initial load
duke
parents:
diff changeset
5008 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
5009 // 4881221: relax the constraints based on JSR202 spec
a61af66fc99e Initial load
duke
parents:
diff changeset
5010 legal = verify_unqualified_name(bytes, length, LegalMethod);
a61af66fc99e Initial load
duke
parents:
diff changeset
5011 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5012 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5013
a61af66fc99e Initial load
duke
parents:
diff changeset
5014 if (!legal) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5015 ResourceMark rm(THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
5016 Exceptions::fthrow(
a61af66fc99e Initial load
duke
parents:
diff changeset
5017 THREAD_AND_LOCATION,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5018 vmSymbols::java_lang_ClassFormatError(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5019 "Illegal method name \"%s\" in class %s", bytes,
a61af66fc99e Initial load
duke
parents:
diff changeset
5020 _class_name->as_C_string()
a61af66fc99e Initial load
duke
parents:
diff changeset
5021 );
a61af66fc99e Initial load
duke
parents:
diff changeset
5022 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
5023 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5024 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5025
a61af66fc99e Initial load
duke
parents:
diff changeset
5026
a61af66fc99e Initial load
duke
parents:
diff changeset
5027 // Checks if signature is a legal field signature.
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5028 void ClassFileParser::verify_legal_field_signature(Symbol* name, Symbol* signature, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5029 if (!_need_verify) { return; }
a61af66fc99e Initial load
duke
parents:
diff changeset
5030
a61af66fc99e Initial load
duke
parents:
diff changeset
5031 char buf[fixed_buffer_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
5032 char* bytes = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
5033 unsigned int length = signature->utf8_length();
a61af66fc99e Initial load
duke
parents:
diff changeset
5034 char* p = skip_over_field_signature(bytes, false, length, CHECK);
a61af66fc99e Initial load
duke
parents:
diff changeset
5035
a61af66fc99e Initial load
duke
parents:
diff changeset
5036 if (p == NULL || (p - bytes) != (int)length) {
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
5037 throwIllegalSignature("Field", name, signature, CHECK);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5038 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5039 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5040
a61af66fc99e Initial load
duke
parents:
diff changeset
5041 // Checks if signature is a legal method signature.
a61af66fc99e Initial load
duke
parents:
diff changeset
5042 // Returns number of parameters
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5043 int ClassFileParser::verify_legal_method_signature(Symbol* name, Symbol* signature, TRAPS) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5044 if (!_need_verify) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5045 // make sure caller's args_size will be less than 0 even for non-static
a61af66fc99e Initial load
duke
parents:
diff changeset
5046 // method so it will be recomputed in compute_size_of_parameters().
a61af66fc99e Initial load
duke
parents:
diff changeset
5047 return -2;
a61af66fc99e Initial load
duke
parents:
diff changeset
5048 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5049
a61af66fc99e Initial load
duke
parents:
diff changeset
5050 unsigned int args_size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
5051 char buf[fixed_buffer_size];
a61af66fc99e Initial load
duke
parents:
diff changeset
5052 char* p = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
5053 unsigned int length = signature->utf8_length();
a61af66fc99e Initial load
duke
parents:
diff changeset
5054 char* nextp;
a61af66fc99e Initial load
duke
parents:
diff changeset
5055
a61af66fc99e Initial load
duke
parents:
diff changeset
5056 // The first character must be a '('
a61af66fc99e Initial load
duke
parents:
diff changeset
5057 if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5058 length--;
a61af66fc99e Initial load
duke
parents:
diff changeset
5059 // Skip over legal field signatures
a61af66fc99e Initial load
duke
parents:
diff changeset
5060 nextp = skip_over_field_signature(p, false, length, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
5061 while ((length > 0) && (nextp != NULL)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5062 args_size++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5063 if (p[0] == 'J' || p[0] == 'D') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5064 args_size++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5065 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5066 length -= nextp - p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5067 p = nextp;
a61af66fc99e Initial load
duke
parents:
diff changeset
5068 nextp = skip_over_field_signature(p, false, length, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
5069 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5070 // The first non-signature thing better be a ')'
a61af66fc99e Initial load
duke
parents:
diff changeset
5071 if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5072 length--;
a61af66fc99e Initial load
duke
parents:
diff changeset
5073 if (name->utf8_length() > 0 && name->byte_at(0) == '<') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5074 // All internal methods must return void
a61af66fc99e Initial load
duke
parents:
diff changeset
5075 if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5076 return args_size;
a61af66fc99e Initial load
duke
parents:
diff changeset
5077 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5078 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
5079 // Now we better just have a return value
a61af66fc99e Initial load
duke
parents:
diff changeset
5080 nextp = skip_over_field_signature(p, true, length, CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
5081 if (nextp && ((int)length == (nextp - p))) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5082 return args_size;
a61af66fc99e Initial load
duke
parents:
diff changeset
5083 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5084 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5085 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5086 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5087 // Report error
1586
086d73ccd6c0 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents: 1513
diff changeset
5088 throwIllegalSignature("Method", name, signature, CHECK_0);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5089 return 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
5090 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5091
a61af66fc99e Initial load
duke
parents:
diff changeset
5092
1881
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5093 // Unqualified names may not contain the characters '.', ';', '[', or '/'.
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5094 // Method names also may not contain the characters '<' or '>', unless <init>
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5095 // or <clinit>. Note that method names may not be <init> or <clinit> in this
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5096 // method. Because these names have been checked as special cases before
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5097 // calling this method in verify_legal_method_name.
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5098 bool ClassFileParser::verify_unqualified_name(
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5099 char* name, unsigned int length, int type) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5100 jchar ch;
a61af66fc99e Initial load
duke
parents:
diff changeset
5101
a61af66fc99e Initial load
duke
parents:
diff changeset
5102 for (char* p = name; p != name + length; ) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5103 ch = *p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5104 if (ch < 128) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5105 p++;
1881
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5106 if (ch == '.' || ch == ';' || ch == '[' ) {
6412b3805cd6 6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents: 1847
diff changeset
5107 return false; // do not permit '.', ';', or '['
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5108 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5109 if (type != LegalClass && ch == '/') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5110 return false; // do not permit '/' unless it's class name
a61af66fc99e Initial load
duke
parents:
diff changeset
5111 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5112 if (type == LegalMethod && (ch == '<' || ch == '>')) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5113 return false; // do not permit '<' or '>' in method names
a61af66fc99e Initial load
duke
parents:
diff changeset
5114 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5115 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
5116 char* tmp_p = UTF8::next(p, &ch);
a61af66fc99e Initial load
duke
parents:
diff changeset
5117 p = tmp_p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5118 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5119 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5120 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
5121 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5122
a61af66fc99e Initial load
duke
parents:
diff changeset
5123
a61af66fc99e Initial load
duke
parents:
diff changeset
5124 // Take pointer to a string. Skip over the longest part of the string that could
a61af66fc99e Initial load
duke
parents:
diff changeset
5125 // be taken as a fieldname. Allow '/' if slash_ok is true.
a61af66fc99e Initial load
duke
parents:
diff changeset
5126 // Return a pointer to just past the fieldname.
a61af66fc99e Initial load
duke
parents:
diff changeset
5127 // Return NULL if no fieldname at all was found, or in the case of slash_ok
a61af66fc99e Initial load
duke
parents:
diff changeset
5128 // being true, we saw consecutive slashes (meaning we were looking for a
a61af66fc99e Initial load
duke
parents:
diff changeset
5129 // qualified path but found something that was badly-formed).
a61af66fc99e Initial load
duke
parents:
diff changeset
5130 char* ClassFileParser::skip_over_field_name(char* name, bool slash_ok, unsigned int length) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5131 char* p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5132 jchar ch;
a61af66fc99e Initial load
duke
parents:
diff changeset
5133 jboolean last_is_slash = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
5134 jboolean not_first_ch = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
5135
a61af66fc99e Initial load
duke
parents:
diff changeset
5136 for (p = name; p != name + length; not_first_ch = true) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5137 char* old_p = p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5138 ch = *p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5139 if (ch < 128) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5140 p++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5141 // quick check for ascii
a61af66fc99e Initial load
duke
parents:
diff changeset
5142 if ((ch >= 'a' && ch <= 'z') ||
a61af66fc99e Initial load
duke
parents:
diff changeset
5143 (ch >= 'A' && ch <= 'Z') ||
a61af66fc99e Initial load
duke
parents:
diff changeset
5144 (ch == '_' || ch == '$') ||
a61af66fc99e Initial load
duke
parents:
diff changeset
5145 (not_first_ch && ch >= '0' && ch <= '9')) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5146 last_is_slash = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
5147 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
5148 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5149 if (slash_ok && ch == '/') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5150 if (last_is_slash) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5151 return NULL; // Don't permit consecutive slashes
a61af66fc99e Initial load
duke
parents:
diff changeset
5152 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5153 last_is_slash = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
5154 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
5155 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5156 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
5157 jint unicode_ch;
a61af66fc99e Initial load
duke
parents:
diff changeset
5158 char* tmp_p = UTF8::next_character(p, &unicode_ch);
a61af66fc99e Initial load
duke
parents:
diff changeset
5159 p = tmp_p;
a61af66fc99e Initial load
duke
parents:
diff changeset
5160 last_is_slash = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
5161 // Check if ch is Java identifier start or is Java identifier part
a61af66fc99e Initial load
duke
parents:
diff changeset
5162 // 4672820: call java.lang.Character methods directly without generating separate tables.
a61af66fc99e Initial load
duke
parents:
diff changeset
5163 EXCEPTION_MARK;
1142
4ce7240d622c 6914300: ciEnv should export all well known classes
never
parents: 1138
diff changeset
5164 instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5165
a61af66fc99e Initial load
duke
parents:
diff changeset
5166 // return value
a61af66fc99e Initial load
duke
parents:
diff changeset
5167 JavaValue result(T_BOOLEAN);
a61af66fc99e Initial load
duke
parents:
diff changeset
5168 // Set up the arguments to isJavaIdentifierStart and isJavaIdentifierPart
a61af66fc99e Initial load
duke
parents:
diff changeset
5169 JavaCallArguments args;
a61af66fc99e Initial load
duke
parents:
diff changeset
5170 args.push_int(unicode_ch);
a61af66fc99e Initial load
duke
parents:
diff changeset
5171
a61af66fc99e Initial load
duke
parents:
diff changeset
5172 // public static boolean isJavaIdentifierStart(char ch);
a61af66fc99e Initial load
duke
parents:
diff changeset
5173 JavaCalls::call_static(&result,
a61af66fc99e Initial load
duke
parents:
diff changeset
5174 klass,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5175 vmSymbols::isJavaIdentifierStart_name(),
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5176 vmSymbols::int_bool_signature(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5177 &args,
a61af66fc99e Initial load
duke
parents:
diff changeset
5178 THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
5179
a61af66fc99e Initial load
duke
parents:
diff changeset
5180 if (HAS_PENDING_EXCEPTION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5181 CLEAR_PENDING_EXCEPTION;
a61af66fc99e Initial load
duke
parents:
diff changeset
5182 return 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
5183 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5184 if (result.get_jboolean()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5185 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
5186 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5187
a61af66fc99e Initial load
duke
parents:
diff changeset
5188 if (not_first_ch) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5189 // public static boolean isJavaIdentifierPart(char ch);
a61af66fc99e Initial load
duke
parents:
diff changeset
5190 JavaCalls::call_static(&result,
a61af66fc99e Initial load
duke
parents:
diff changeset
5191 klass,
2177
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5192 vmSymbols::isJavaIdentifierPart_name(),
3582bf76420e 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 2085
diff changeset
5193 vmSymbols::int_bool_signature(),
0
a61af66fc99e Initial load
duke
parents:
diff changeset
5194 &args,
a61af66fc99e Initial load
duke
parents:
diff changeset
5195 THREAD);
a61af66fc99e Initial load
duke
parents:
diff changeset
5196
a61af66fc99e Initial load
duke
parents:
diff changeset
5197 if (HAS_PENDING_EXCEPTION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5198 CLEAR_PENDING_EXCEPTION;
a61af66fc99e Initial load
duke
parents:
diff changeset
5199 return 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
5200 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5201
a61af66fc99e Initial load
duke
parents:
diff changeset
5202 if (result.get_jboolean()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5203 continue;
a61af66fc99e Initial load
duke
parents:
diff changeset
5204 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5205 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5206 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5207 return (not_first_ch) ? old_p : NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
5208 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5209 return (not_first_ch) ? p : NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
5210 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5211
a61af66fc99e Initial load
duke
parents:
diff changeset
5212
a61af66fc99e Initial load
duke
parents:
diff changeset
5213 // Take pointer to a string. Skip over the longest part of the string that could
a61af66fc99e Initial load
duke
parents:
diff changeset
5214 // be taken as a field signature. Allow "void" if void_ok.
a61af66fc99e Initial load
duke
parents:
diff changeset
5215 // Return a pointer to just past the signature.
a61af66fc99e Initial load
duke
parents:
diff changeset
5216 // Return NULL if no legal signature is found.
a61af66fc99e Initial load
duke
parents:
diff changeset
5217 char* ClassFileParser::skip_over_field_signature(char* signature,
a61af66fc99e Initial load
duke
parents:
diff changeset
5218 bool void_ok,
a61af66fc99e Initial load
duke
parents:
diff changeset
5219 unsigned int length,
a61af66fc99e Initial load
duke
parents:
diff changeset
5220 TRAPS) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5221 unsigned int array_dim = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
5222 while (length > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5223 switch (signature[0]) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5224 case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; }
a61af66fc99e Initial load
duke
parents:
diff changeset
5225 case JVM_SIGNATURE_BOOLEAN:
a61af66fc99e Initial load
duke
parents:
diff changeset
5226 case JVM_SIGNATURE_BYTE:
a61af66fc99e Initial load
duke
parents:
diff changeset
5227 case JVM_SIGNATURE_CHAR:
a61af66fc99e Initial load
duke
parents:
diff changeset
5228 case JVM_SIGNATURE_SHORT:
a61af66fc99e Initial load
duke
parents:
diff changeset
5229 case JVM_SIGNATURE_INT:
a61af66fc99e Initial load
duke
parents:
diff changeset
5230 case JVM_SIGNATURE_FLOAT:
a61af66fc99e Initial load
duke
parents:
diff changeset
5231 case JVM_SIGNATURE_LONG:
a61af66fc99e Initial load
duke
parents:
diff changeset
5232 case JVM_SIGNATURE_DOUBLE:
a61af66fc99e Initial load
duke
parents:
diff changeset
5233 return signature + 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
5234 case JVM_SIGNATURE_CLASS: {
a61af66fc99e Initial load
duke
parents:
diff changeset
5235 if (_major_version < JAVA_1_5_VERSION) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5236 // Skip over the class name if one is there
a61af66fc99e Initial load
duke
parents:
diff changeset
5237 char* p = skip_over_field_name(signature + 1, true, --length);
a61af66fc99e Initial load
duke
parents:
diff changeset
5238
a61af66fc99e Initial load
duke
parents:
diff changeset
5239 // The next character better be a semicolon
a61af66fc99e Initial load
duke
parents:
diff changeset
5240 if (p && (p - signature) > 1 && p[0] == ';') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5241 return p + 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
5242 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5243 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
5244 // 4900761: For class version > 48, any unicode is allowed in class name.
a61af66fc99e Initial load
duke
parents:
diff changeset
5245 length--;
a61af66fc99e Initial load
duke
parents:
diff changeset
5246 signature++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5247 while (length > 0 && signature[0] != ';') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5248 if (signature[0] == '.') {
a61af66fc99e Initial load
duke
parents:
diff changeset
5249 classfile_parse_error("Class name contains illegal character '.' in descriptor in class file %s", CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
5250 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5251 length--;
a61af66fc99e Initial load
duke
parents:
diff changeset
5252 signature++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5253 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5254 if (signature[0] == ';') { return signature + 1; }
a61af66fc99e Initial load
duke
parents:
diff changeset
5255 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5256
a61af66fc99e Initial load
duke
parents:
diff changeset
5257 return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
5258 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5259 case JVM_SIGNATURE_ARRAY:
a61af66fc99e Initial load
duke
parents:
diff changeset
5260 array_dim++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5261 if (array_dim > 255) {
a61af66fc99e Initial load
duke
parents:
diff changeset
5262 // 4277370: array descriptor is valid only if it represents 255 or fewer dimensions.
a61af66fc99e Initial load
duke
parents:
diff changeset
5263 classfile_parse_error("Array type descriptor has more than 255 dimensions in class file %s", CHECK_0);
a61af66fc99e Initial load
duke
parents:
diff changeset
5264 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5265 // The rest of what's there better be a legal signature
a61af66fc99e Initial load
duke
parents:
diff changeset
5266 signature++;
a61af66fc99e Initial load
duke
parents:
diff changeset
5267 length--;
a61af66fc99e Initial load
duke
parents:
diff changeset
5268 void_ok = false;
a61af66fc99e Initial load
duke
parents:
diff changeset
5269 break;
a61af66fc99e Initial load
duke
parents:
diff changeset
5270
a61af66fc99e Initial load
duke
parents:
diff changeset
5271 default:
a61af66fc99e Initial load
duke
parents:
diff changeset
5272 return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
5273 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5274 }
a61af66fc99e Initial load
duke
parents:
diff changeset
5275 return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
5276 }