Mercurial > hg > truffle
annotate src/share/vm/classfile/classFileParser.cpp @ 14517:3812c088b945
Merge
author | lana |
---|---|
date | Thu, 06 Mar 2014 10:37:26 -0800 |
parents | 4802ce6fbff6 |
children | d8041d695d19 |
rev | line source |
---|---|
0 | 1 /* |
14292
2e7b5143763f
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
14241
diff
changeset
|
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
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 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
26 #include "classfile/classFileParser.hpp" | |
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 | 30 #include "classfile/defaultMethods.hpp" |
1972 | 31 #include "classfile/javaClasses.hpp" |
32 #include "classfile/symbolTable.hpp" | |
33 #include "classfile/systemDictionary.hpp" | |
34 #include "classfile/verificationType.hpp" | |
35 #include "classfile/verifier.hpp" | |
36 #include "classfile/vmSymbols.hpp" | |
37 #include "memory/allocation.hpp" | |
38 #include "memory/gcLocker.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
39 #include "memory/metadataFactory.hpp" |
1972 | 40 #include "memory/oopFactory.hpp" |
10405 | 41 #include "memory/referenceType.hpp" |
1972 | 42 #include "memory/universe.inline.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
43 #include "oops/constantPool.hpp" |
3938 | 44 #include "oops/fieldStreams.hpp" |
1972 | 45 #include "oops/instanceKlass.hpp" |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
46 #include "oops/instanceMirrorKlass.hpp" |
1972 | 47 #include "oops/klass.inline.hpp" |
48 #include "oops/klassVtable.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
49 #include "oops/method.hpp" |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
50 #include "oops/symbol.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
51 #include "prims/jvm.h" |
1972 | 52 #include "prims/jvmtiExport.hpp" |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
53 #include "prims/jvmtiThreadState.hpp" |
1972 | 54 #include "runtime/javaCalls.hpp" |
55 #include "runtime/perfData.hpp" | |
56 #include "runtime/reflection.hpp" | |
57 #include "runtime/signature.hpp" | |
58 #include "runtime/timer.hpp" | |
59 #include "services/classLoadingService.hpp" | |
60 #include "services/threadService.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
61 #include "utilities/array.hpp" |
7588
f9eb431c3efe
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
7579
diff
changeset
|
62 #include "utilities/globalDefinitions.hpp" |
0 | 63 |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
64 // 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
|
65 // 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
|
66 // 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
|
67 // pool and when parsing line number tables. |
0 | 68 |
69 // We add assert in debug mode when class format is not checked. | |
70 | |
71 #define JAVA_CLASSFILE_MAGIC 0xCAFEBABE | |
72 #define JAVA_MIN_SUPPORTED_VERSION 45 | |
6868 | 73 #define JAVA_MAX_SUPPORTED_VERSION 52 |
0 | 74 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0 |
75 | |
76 // Used for two backward compatibility reasons: | |
77 // - to check for new additions to the class file format in JDK1.5 | |
78 // - to check for bug fixes in the format checker in JDK1.5 | |
79 #define JAVA_1_5_VERSION 49 | |
80 | |
81 // Used for backward compatibility reasons: | |
82 // - 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
|
83 // - also used as the max version when running in jdk6 |
0 | 84 #define JAVA_6_VERSION 50 |
85 | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
86 // 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
|
87 // - 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
|
88 #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
|
89 |
6934 | 90 // Extension method support. |
91 #define JAVA_8_VERSION 52 | |
92 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
93 void ClassFileParser::parse_constant_pool_entries(int length, TRAPS) { |
0 | 94 // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize |
95 // this function (_current can be allocated in a register, with scalar | |
96 // replacement of aggregates). The _current pointer is copied back to | |
97 // stream() when this function returns. DON'T call another method within | |
98 // this method that uses stream(). | |
99 ClassFileStream* cfs0 = stream(); | |
100 ClassFileStream cfs1 = *cfs0; | |
101 ClassFileStream* cfs = &cfs1; | |
102 #ifdef ASSERT | |
1685 | 103 assert(cfs->allocated_on_stack(),"should be local"); |
0 | 104 u1* old_current = cfs0->current(); |
105 #endif | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
106 Handle class_loader(THREAD, _loader_data->class_loader()); |
0 | 107 |
108 // Used for batching symbol allocations. | |
109 const char* names[SymbolTable::symbol_alloc_batch_size]; | |
110 int lengths[SymbolTable::symbol_alloc_batch_size]; | |
111 int indices[SymbolTable::symbol_alloc_batch_size]; | |
112 unsigned int hashValues[SymbolTable::symbol_alloc_batch_size]; | |
113 int names_count = 0; | |
114 | |
115 // parsing Index 0 is unused | |
116 for (int index = 1; index < length; index++) { | |
117 // Each of the following case guarantees one more byte in the stream | |
118 // for the following tag or the access_flags following constant pool, | |
119 // so we don't need bounds-check for reading tag. | |
120 u1 tag = cfs->get_u1_fast(); | |
121 switch (tag) { | |
122 case JVM_CONSTANT_Class : | |
123 { | |
124 cfs->guarantee_more(3, CHECK); // name_index, tag/access_flags | |
125 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
|
126 _cp->klass_index_at_put(index, name_index); |
0 | 127 } |
128 break; | |
129 case JVM_CONSTANT_Fieldref : | |
130 { | |
131 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags | |
132 u2 class_index = cfs->get_u2_fast(); | |
133 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
|
134 _cp->field_at_put(index, class_index, name_and_type_index); |
0 | 135 } |
136 break; | |
137 case JVM_CONSTANT_Methodref : | |
138 { | |
139 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags | |
140 u2 class_index = cfs->get_u2_fast(); | |
141 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
|
142 _cp->method_at_put(index, class_index, name_and_type_index); |
0 | 143 } |
144 break; | |
145 case JVM_CONSTANT_InterfaceMethodref : | |
146 { | |
147 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags | |
148 u2 class_index = cfs->get_u2_fast(); | |
149 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
|
150 _cp->interface_method_at_put(index, class_index, name_and_type_index); |
0 | 151 } |
152 break; | |
153 case JVM_CONSTANT_String : | |
154 { | |
155 cfs->guarantee_more(3, CHECK); // string_index, tag/access_flags | |
156 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
|
157 _cp->string_index_at_put(index, string_index); |
0 | 158 } |
159 break; | |
1602 | 160 case JVM_CONSTANT_MethodHandle : |
161 case JVM_CONSTANT_MethodType : | |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
162 if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
1602 | 163 classfile_parse_error( |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
164 "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
|
165 tag, CHECK); |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
166 } |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
167 if (!EnableInvokeDynamic) { |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
168 classfile_parse_error( |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
169 "This JVM does not support constant tag %u in class file %s", |
1602 | 170 tag, CHECK); |
171 } | |
172 if (tag == JVM_CONSTANT_MethodHandle) { | |
173 cfs->guarantee_more(4, CHECK); // ref_kind, method_index, tag/access_flags | |
174 u1 ref_kind = cfs->get_u1_fast(); | |
175 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
|
176 _cp->method_handle_index_at_put(index, ref_kind, method_index); |
1602 | 177 } else if (tag == JVM_CONSTANT_MethodType) { |
178 cfs->guarantee_more(3, CHECK); // signature_index, tag/access_flags | |
179 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
|
180 _cp->method_type_index_at_put(index, signature_index); |
1602 | 181 } else { |
182 ShouldNotReachHere(); | |
183 } | |
184 break; | |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
185 case JVM_CONSTANT_InvokeDynamic : |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
186 { |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
187 if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
188 classfile_parse_error( |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
189 "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
|
190 tag, CHECK); |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
191 } |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
192 if (!EnableInvokeDynamic) { |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
193 classfile_parse_error( |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
194 "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
|
195 tag, CHECK); |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
196 } |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
197 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
|
198 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
|
199 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
|
200 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
|
201 _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
|
202 _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
|
203 } |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
204 break; |
0 | 205 case JVM_CONSTANT_Integer : |
206 { | |
207 cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags | |
208 u4 bytes = cfs->get_u4_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
209 _cp->int_at_put(index, (jint) bytes); |
0 | 210 } |
211 break; | |
212 case JVM_CONSTANT_Float : | |
213 { | |
214 cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags | |
215 u4 bytes = cfs->get_u4_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
216 _cp->float_at_put(index, *(jfloat*)&bytes); |
0 | 217 } |
218 break; | |
219 case JVM_CONSTANT_Long : | |
220 // A mangled type might cause you to overrun allocated memory | |
221 guarantee_property(index+1 < length, | |
222 "Invalid constant pool entry %u in class file %s", | |
223 index, CHECK); | |
224 { | |
225 cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags | |
226 u8 bytes = cfs->get_u8_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
227 _cp->long_at_put(index, bytes); |
0 | 228 } |
229 index++; // Skip entry following eigth-byte constant, see JVM book p. 98 | |
230 break; | |
231 case JVM_CONSTANT_Double : | |
232 // A mangled type might cause you to overrun allocated memory | |
233 guarantee_property(index+1 < length, | |
234 "Invalid constant pool entry %u in class file %s", | |
235 index, CHECK); | |
236 { | |
237 cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags | |
238 u8 bytes = cfs->get_u8_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
239 _cp->double_at_put(index, *(jdouble*)&bytes); |
0 | 240 } |
241 index++; // Skip entry following eigth-byte constant, see JVM book p. 98 | |
242 break; | |
243 case JVM_CONSTANT_NameAndType : | |
244 { | |
245 cfs->guarantee_more(5, CHECK); // name_index, signature_index, tag/access_flags | |
246 u2 name_index = cfs->get_u2_fast(); | |
247 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
|
248 _cp->name_and_type_at_put(index, name_index, signature_index); |
0 | 249 } |
250 break; | |
251 case JVM_CONSTANT_Utf8 : | |
252 { | |
253 cfs->guarantee_more(2, CHECK); // utf8_length | |
254 u2 utf8_length = cfs->get_u2_fast(); | |
255 u1* utf8_buffer = cfs->get_u1_buffer(); | |
256 assert(utf8_buffer != NULL, "null utf8 buffer"); | |
257 // Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward. | |
258 cfs->guarantee_more(utf8_length+1, CHECK); // utf8 string, tag/access_flags | |
259 cfs->skip_u1_fast(utf8_length); | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
260 |
0 | 261 // Before storing the symbol, make sure it's legal |
262 if (_need_verify) { | |
263 verify_legal_utf8((unsigned char*)utf8_buffer, utf8_length, CHECK); | |
264 } | |
265 | |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
266 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
|
267 Handle patch = clear_cp_patch_at(index); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
268 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
|
269 "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
|
270 index, CHECK); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
271 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
|
272 // (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
|
273 utf8_buffer = (u1*) str; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
274 utf8_length = (int) strlen(str); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
275 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
276 |
0 | 277 unsigned int hash; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
278 Symbol* result = SymbolTable::lookup_only((char*)utf8_buffer, utf8_length, hash); |
0 | 279 if (result == NULL) { |
280 names[names_count] = (char*)utf8_buffer; | |
281 lengths[names_count] = utf8_length; | |
282 indices[names_count] = index; | |
283 hashValues[names_count++] = hash; | |
284 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
|
285 SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK); |
0 | 286 names_count = 0; |
287 } | |
288 } else { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
289 _cp->symbol_at_put(index, result); |
0 | 290 } |
291 } | |
292 break; | |
293 default: | |
294 classfile_parse_error( | |
295 "Unknown constant tag %u in class file %s", tag, CHECK); | |
296 break; | |
297 } | |
298 } | |
299 | |
300 // Allocate the remaining symbols | |
301 if (names_count > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
302 SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK); |
0 | 303 } |
304 | |
305 // Copy _current pointer of local copy back to stream(). | |
306 #ifdef ASSERT | |
307 assert(cfs0->current() == old_current, "non-exclusive use of stream()"); | |
308 #endif | |
309 cfs0->set_current(cfs1.current()); | |
310 } | |
311 | |
312 bool inline valid_cp_range(int index, int length) { return (index > 0 && index < length); } | |
313 | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
314 inline Symbol* check_symbol_at(constantPoolHandle cp, int index) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
315 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
|
316 return cp->symbol_at(index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
317 else |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
318 return NULL; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
319 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
320 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
321 constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { |
0 | 322 ClassFileStream* cfs = stream(); |
323 constantPoolHandle nullHandle; | |
324 | |
325 cfs->guarantee_more(3, CHECK_(nullHandle)); // length, first cp tag | |
326 u2 length = cfs->get_u2_fast(); | |
327 guarantee_property( | |
328 length >= 1, "Illegal constant pool size %u in class file %s", | |
329 length, CHECK_(nullHandle)); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
330 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
|
331 CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
332 _cp = constant_pool; // save in case of errors |
0 | 333 constantPoolHandle cp (THREAD, constant_pool); |
334 | |
335 // parsing constant pool entries | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
336 parse_constant_pool_entries(length, CHECK_(nullHandle)); |
0 | 337 |
338 int index = 1; // declared outside of loops for portability | |
339 | |
340 // first verification pass - validate cross references and fixup class and string constants | |
341 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
|
342 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
|
343 switch (tag) { |
0 | 344 case JVM_CONSTANT_Class : |
345 ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present | |
346 break; | |
347 case JVM_CONSTANT_Fieldref : | |
348 // fall through | |
349 case JVM_CONSTANT_Methodref : | |
350 // fall through | |
351 case JVM_CONSTANT_InterfaceMethodref : { | |
352 if (!_need_verify) break; | |
353 int klass_ref_index = cp->klass_ref_index_at(index); | |
354 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
|
355 check_property(valid_klass_reference_at(klass_ref_index), |
0 | 356 "Invalid constant pool index %u in class file %s", |
357 klass_ref_index, | |
358 CHECK_(nullHandle)); | |
359 check_property(valid_cp_range(name_and_type_ref_index, length) && | |
360 cp->tag_at(name_and_type_ref_index).is_name_and_type(), | |
361 "Invalid constant pool index %u in class file %s", | |
362 name_and_type_ref_index, | |
363 CHECK_(nullHandle)); | |
364 break; | |
365 } | |
366 case JVM_CONSTANT_String : | |
367 ShouldNotReachHere(); // Only JVM_CONSTANT_StringIndex should be present | |
368 break; | |
369 case JVM_CONSTANT_Integer : | |
370 break; | |
371 case JVM_CONSTANT_Float : | |
372 break; | |
373 case JVM_CONSTANT_Long : | |
374 case JVM_CONSTANT_Double : | |
375 index++; | |
376 check_property( | |
377 (index < length && cp->tag_at(index).is_invalid()), | |
378 "Improper constant pool long/double index %u in class file %s", | |
379 index, CHECK_(nullHandle)); | |
380 break; | |
381 case JVM_CONSTANT_NameAndType : { | |
382 if (!_need_verify) break; | |
383 int name_ref_index = cp->name_ref_index_at(index); | |
384 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
|
385 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
|
386 "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
|
387 name_ref_index, CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
388 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
|
389 "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
|
390 signature_ref_index, CHECK_(nullHandle)); |
0 | 391 break; |
392 } | |
393 case JVM_CONSTANT_Utf8 : | |
394 break; | |
395 case JVM_CONSTANT_UnresolvedClass : // fall-through | |
396 case JVM_CONSTANT_UnresolvedClassInError: | |
397 ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present | |
398 break; | |
399 case JVM_CONSTANT_ClassIndex : | |
400 { | |
401 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
|
402 check_property(valid_symbol_at(class_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
403 "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
|
404 class_index, CHECK_(nullHandle)); |
0 | 405 cp->unresolved_klass_at_put(index, cp->symbol_at(class_index)); |
406 } | |
407 break; | |
408 case JVM_CONSTANT_StringIndex : | |
409 { | |
410 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
|
411 check_property(valid_symbol_at(string_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
412 "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
|
413 string_index, CHECK_(nullHandle)); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
414 Symbol* sym = cp->symbol_at(string_index); |
0 | 415 cp->unresolved_string_at_put(index, sym); |
416 } | |
417 break; | |
1602 | 418 case JVM_CONSTANT_MethodHandle : |
419 { | |
420 int ref_index = cp->method_handle_index_at(index); | |
421 check_property( | |
422 valid_cp_range(ref_index, length) && | |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
423 EnableInvokeDynamic, |
1602 | 424 "Invalid constant pool index %u in class file %s", |
425 ref_index, CHECK_(nullHandle)); | |
426 constantTag tag = cp->tag_at(ref_index); | |
427 int ref_kind = cp->method_handle_ref_kind_at(index); | |
428 switch (ref_kind) { | |
429 case JVM_REF_getField: | |
430 case JVM_REF_getStatic: | |
431 case JVM_REF_putField: | |
432 case JVM_REF_putStatic: | |
433 check_property( | |
434 tag.is_field(), | |
435 "Invalid constant pool index %u in class file %s (not a field)", | |
436 ref_index, CHECK_(nullHandle)); | |
437 break; | |
438 case JVM_REF_invokeVirtual: | |
439 case JVM_REF_newInvokeSpecial: | |
440 check_property( | |
441 tag.is_method(), | |
442 "Invalid constant pool index %u in class file %s (not a method)", | |
443 ref_index, CHECK_(nullHandle)); | |
444 break; | |
10128
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
445 case JVM_REF_invokeStatic: |
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
446 case JVM_REF_invokeSpecial: |
10340
ccdecfece956
8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents:
10314
diff
changeset
|
447 check_property(tag.is_method() || |
ccdecfece956
8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents:
10314
diff
changeset
|
448 ((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()), |
10128
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
449 "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
|
450 ref_index, CHECK_(nullHandle)); |
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
451 break; |
1602 | 452 case JVM_REF_invokeInterface: |
453 check_property( | |
454 tag.is_interface_method(), | |
455 "Invalid constant pool index %u in class file %s (not an interface method)", | |
456 ref_index, CHECK_(nullHandle)); | |
457 break; | |
458 default: | |
459 classfile_parse_error( | |
460 "Bad method handle kind at constant pool index %u in class file %s", | |
461 index, CHECK_(nullHandle)); | |
462 } | |
463 // Keep the ref_index unchanged. It will be indirected at link-time. | |
464 } | |
465 break; | |
466 case JVM_CONSTANT_MethodType : | |
467 { | |
468 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
|
469 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
|
470 "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
|
471 ref_index, CHECK_(nullHandle)); |
1602 | 472 } |
473 break; | |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
474 case JVM_CONSTANT_InvokeDynamic : |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
475 { |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
476 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
|
477 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
|
478 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
|
479 "Invalid constant pool index %u in class file %s", |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
480 name_and_type_ref_index, |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
481 CHECK_(nullHandle)); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
482 // 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
|
483 break; |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
484 } |
0 | 485 default: |
1490
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1366
diff
changeset
|
486 fatal(err_msg("bad constant pool tag value %u", |
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1366
diff
changeset
|
487 cp->tag_at(index).value())); |
0 | 488 ShouldNotReachHere(); |
489 break; | |
490 } // end of switch | |
491 } // end of for | |
492 | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
493 if (_cp_patches != NULL) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
494 // need to treat this_class specially... |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
495 assert(EnableInvokeDynamic, ""); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
496 int this_class_index; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
497 { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
498 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
|
499 u1* mark = cfs->current(); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
500 u2 flags = cfs->get_u2_fast(); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
501 this_class_index = cfs->get_u2_fast(); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
502 cfs->set_current(mark); // revert to mark |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
503 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
504 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
505 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
|
506 if (has_cp_patch_at(index)) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
507 guarantee_property(index != this_class_index, |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
508 "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
|
509 index, CHECK_(nullHandle)); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
510 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
|
511 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
512 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
513 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
514 |
0 | 515 if (!_need_verify) { |
516 return cp; | |
517 } | |
518 | |
519 // 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
|
520 // but not yet to the other entries |
0 | 521 for (index = 1; index < length; index++) { |
522 jbyte tag = cp->tag_at(index).value(); | |
523 switch (tag) { | |
524 case JVM_CONSTANT_UnresolvedClass: { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
525 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
|
526 // check the name, even if _cp_patches will overwrite it |
0 | 527 verify_legal_class_name(class_name, CHECK_(nullHandle)); |
528 break; | |
529 } | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
530 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
|
531 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
|
532 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
|
533 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
|
534 Symbol* name = cp->symbol_at(name_index); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
535 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
|
536 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
|
537 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
|
538 } else { |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
539 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
|
540 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
541 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
542 break; |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
543 } |
2461
758ba0bf7bcc
7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents:
2460
diff
changeset
|
544 case JVM_CONSTANT_InvokeDynamic: |
0 | 545 case JVM_CONSTANT_Fieldref: |
546 case JVM_CONSTANT_Methodref: | |
547 case JVM_CONSTANT_InterfaceMethodref: { | |
548 int name_and_type_ref_index = cp->name_and_type_ref_index_at(index); | |
549 // already verified to be utf8 | |
550 int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index); | |
551 // already verified to be utf8 | |
552 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
|
553 Symbol* name = cp->symbol_at(name_ref_index); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
554 Symbol* signature = cp->symbol_at(signature_ref_index); |
0 | 555 if (tag == JVM_CONSTANT_Fieldref) { |
556 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
|
557 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
|
558 // 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
|
559 // 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
|
560 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
|
561 throwIllegalSignature( |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
562 "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
|
563 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
564 } else { |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
565 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
|
566 } |
0 | 567 } else { |
568 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
|
569 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
|
570 // 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
|
571 // 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
|
572 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
|
573 throwIllegalSignature( |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
574 "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
|
575 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
576 } else { |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
577 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
|
578 } |
0 | 579 if (tag == JVM_CONSTANT_Methodref) { |
580 // 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
|
581 assert(name != NULL, "method name in constant pool is null"); |
0 | 582 unsigned int name_len = name->utf8_length(); |
583 assert(name_len > 0, "bad method name"); // already verified as legal name | |
584 if (name->byte_at(0) == '<') { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
585 if (name != vmSymbols::object_initializer_name()) { |
0 | 586 classfile_parse_error( |
587 "Bad method name at constant pool index %u in class file %s", | |
588 name_ref_index, CHECK_(nullHandle)); | |
589 } | |
590 } | |
591 } | |
592 } | |
593 break; | |
594 } | |
1602 | 595 case JVM_CONSTANT_MethodHandle: { |
596 int ref_index = cp->method_handle_index_at(index); | |
597 int ref_kind = cp->method_handle_ref_kind_at(index); | |
598 switch (ref_kind) { | |
599 case JVM_REF_invokeVirtual: | |
600 case JVM_REF_invokeStatic: | |
601 case JVM_REF_invokeSpecial: | |
602 case JVM_REF_newInvokeSpecial: | |
603 { | |
604 int name_and_type_ref_index = cp->name_and_type_ref_index_at(ref_index); | |
605 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
|
606 Symbol* name = cp->symbol_at(name_ref_index); |
1602 | 607 if (ref_kind == JVM_REF_newInvokeSpecial) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
608 if (name != vmSymbols::object_initializer_name()) { |
1602 | 609 classfile_parse_error( |
610 "Bad constructor name at constant pool index %u in class file %s", | |
611 name_ref_index, CHECK_(nullHandle)); | |
612 } | |
613 } else { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
614 if (name == vmSymbols::object_initializer_name()) { |
1602 | 615 classfile_parse_error( |
616 "Bad method name at constant pool index %u in class file %s", | |
617 name_ref_index, CHECK_(nullHandle)); | |
618 } | |
619 } | |
620 } | |
621 break; | |
622 // Other ref_kinds are already fully checked in previous pass. | |
623 } | |
624 break; | |
625 } | |
626 case JVM_CONSTANT_MethodType: { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
627 Symbol* no_name = vmSymbols::type_name(); // place holder |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
628 Symbol* signature = cp->method_type_signature_at(index); |
1602 | 629 verify_legal_method_signature(no_name, signature, CHECK_(nullHandle)); |
630 break; | |
631 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
632 case JVM_CONSTANT_Utf8: { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
633 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
|
634 } |
0 | 635 } // end of switch |
636 } // end of for | |
637 | |
638 return cp; | |
639 } | |
640 | |
641 | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
642 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
|
643 assert(EnableInvokeDynamic, ""); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
644 BasicType patch_type = T_VOID; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
645 |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
646 switch (cp->tag_at(index).value()) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
647 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
648 case JVM_CONSTANT_UnresolvedClass : |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
649 // Patching a class means pre-resolving it. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
650 // The name in the constant pool is ignored. |
1602 | 651 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
|
652 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
|
653 "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
|
654 index, CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
655 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
|
656 } else { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
657 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
|
658 "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
|
659 index, CHECK); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
660 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
|
661 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
|
662 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
663 break; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
664 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
665 case JVM_CONSTANT_String : |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
666 // 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
|
667 // references to be created first. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
668 return; |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
669 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
670 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
|
671 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
|
672 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
|
673 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
|
674 patch_prim: |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
675 { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
676 jvalue value; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
677 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
|
678 guarantee_property(value_type == patch_type, |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
679 "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
|
680 index, CHECK); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
681 switch (value_type) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
682 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
|
683 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
|
684 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
|
685 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
|
686 default: assert(false, ""); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
687 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
688 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
689 break; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
690 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
691 default: |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
692 // %%% 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
|
693 guarantee_property(!has_cp_patch_at(index), |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
694 "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
|
695 index, CHECK); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
696 return; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
697 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
698 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
699 // 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
|
700 clear_cp_patch_at(index); |
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 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
704 |
0 | 705 class NameSigHash: public ResourceObj { |
706 public: | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
707 Symbol* _name; // name |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
708 Symbol* _sig; // signature |
0 | 709 NameSigHash* _next; // Next entry in hash table |
710 }; | |
711 | |
712 | |
713 #define HASH_ROW_SIZE 256 | |
714 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
715 unsigned int hash(Symbol* name, Symbol* sig) { |
0 | 716 unsigned int raw_hash = 0; |
717 raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2); | |
718 raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize; | |
719 | |
720 return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE; | |
721 } | |
722 | |
723 | |
724 void initialize_hashtable(NameSigHash** table) { | |
725 memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE); | |
726 } | |
727 | |
728 // Return false if the name/sig combination is found in table. | |
729 // Return true if no duplicate is found. And name/sig is added as a new entry in table. | |
730 // The old format checker uses heap sort to find duplicates. | |
731 // 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
|
732 // 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
|
733 bool put_after_lookup(Symbol* name, Symbol* sig, NameSigHash** table) { |
0 | 734 assert(name != NULL, "name in constant pool is NULL"); |
735 | |
736 // First lookup for duplicates | |
737 int index = hash(name, sig); | |
738 NameSigHash* entry = table[index]; | |
739 while (entry != NULL) { | |
740 if (entry->_name == name && entry->_sig == sig) { | |
741 return false; | |
742 } | |
743 entry = entry->_next; | |
744 } | |
745 | |
746 // No duplicate is found, allocate a new entry and fill it. | |
747 entry = new NameSigHash(); | |
748 entry->_name = name; | |
749 entry->_sig = sig; | |
750 | |
751 // Insert into hash table | |
752 entry->_next = table[index]; | |
753 table[index] = entry; | |
754 | |
755 return true; | |
756 } | |
757 | |
758 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
759 Array<Klass*>* ClassFileParser::parse_interfaces(int length, |
0 | 760 Handle protection_domain, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
761 Symbol* class_name, |
6934 | 762 bool* has_default_methods, |
0 | 763 TRAPS) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
764 if (length == 0) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
765 _local_interfaces = Universe::the_empty_klass_array(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
766 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
767 ClassFileStream* cfs = stream(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
768 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
|
769 _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
|
770 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
771 int index; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
772 for (index = 0; index < length; index++) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
773 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
|
774 KlassHandle interf; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
775 check_property( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
776 valid_klass_reference_at(interface_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
777 "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
|
778 interface_index, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
779 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
|
780 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
|
781 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
782 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
|
783 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
784 // 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
|
785 // 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
|
786 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
|
787 "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
|
788 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
|
789 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
790 // Call resolve_super so classcircularity is checked |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
791 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
|
792 unresolved_klass, class_loader, protection_domain, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
793 false, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
794 interf = KlassHandle(THREAD, k); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
795 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
796 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
797 if (!interf()->is_interface()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
798 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
|
799 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
800 if (InstanceKlass::cast(interf())->has_default_methods()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
801 *has_default_methods = true; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
802 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
803 _local_interfaces->at_put(index, interf()); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
804 } |
0 | 805 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
806 if (!_need_verify || length <= 1) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
807 return _local_interfaces; |
6934 | 808 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
809 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
810 // 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
|
811 ResourceMark rm(THREAD); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
812 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
|
813 THREAD, NameSigHash*, HASH_ROW_SIZE); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
814 initialize_hashtable(interface_names); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
815 bool dup = false; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
816 { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
817 debug_only(No_Safepoint_Verifier nsv;) |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
818 for (index = 0; index < length; index++) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
819 Klass* k = _local_interfaces->at(index); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
820 Symbol* name = InstanceKlass::cast(k)->name(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
821 // 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
|
822 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
|
823 dup = true; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
824 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
825 } |
0 | 826 } |
827 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
828 if (dup) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
829 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
|
830 } |
0 | 831 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
832 return _local_interfaces; |
0 | 833 } |
834 | |
835 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
836 void ClassFileParser::verify_constantvalue(int constantvalue_index, int signature_index, TRAPS) { |
0 | 837 // Make sure the constant pool entry is of a type appropriate to this field |
838 guarantee_property( | |
839 (constantvalue_index > 0 && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
840 constantvalue_index < _cp->length()), |
0 | 841 "Bad initial value index %u in ConstantValue attribute in class file %s", |
842 constantvalue_index, CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
843 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
|
844 switch ( _cp->basic_type_for_signature_at(signature_index) ) { |
0 | 845 case T_LONG: |
846 guarantee_property(value_type.is_long(), "Inconsistent constant value type in class file %s", CHECK); | |
847 break; | |
848 case T_FLOAT: | |
849 guarantee_property(value_type.is_float(), "Inconsistent constant value type in class file %s", CHECK); | |
850 break; | |
851 case T_DOUBLE: | |
852 guarantee_property(value_type.is_double(), "Inconsistent constant value type in class file %s", CHECK); | |
853 break; | |
854 case T_BYTE: case T_CHAR: case T_SHORT: case T_BOOLEAN: case T_INT: | |
855 guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK); | |
856 break; | |
857 case T_OBJECT: | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
858 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
|
859 && value_type.is_string()), |
0 | 860 "Bad string initial value in class file %s", CHECK); |
861 break; | |
862 default: | |
863 classfile_parse_error( | |
864 "Unable to set initial value %u in class file %s", | |
865 constantvalue_index, CHECK); | |
866 } | |
867 } | |
868 | |
869 | |
870 // Parse attributes for a field. | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
871 void ClassFileParser::parse_field_attributes(u2 attributes_count, |
0 | 872 bool is_static, u2 signature_index, |
873 u2* constantvalue_index_addr, | |
874 bool* is_synthetic_addr, | |
875 u2* generic_signature_index_addr, | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
876 ClassFileParser::FieldAnnotationCollector* parsed_annotations, |
0 | 877 TRAPS) { |
878 ClassFileStream* cfs = stream(); | |
879 assert(attributes_count > 0, "length should be greater than 0"); | |
880 u2 constantvalue_index = 0; | |
881 u2 generic_signature_index = 0; | |
882 bool is_synthetic = false; | |
883 u1* runtime_visible_annotations = NULL; | |
884 int runtime_visible_annotations_length = 0; | |
885 u1* runtime_invisible_annotations = NULL; | |
886 int runtime_invisible_annotations_length = 0; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
887 u1* runtime_visible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
888 int runtime_visible_type_annotations_length = 0; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
889 u1* runtime_invisible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
890 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
|
891 bool runtime_invisible_type_annotations_exists = false; |
0 | 892 while (attributes_count--) { |
893 cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length | |
894 u2 attribute_name_index = cfs->get_u2_fast(); | |
895 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
|
896 check_property(valid_symbol_at(attribute_name_index), |
0 | 897 "Invalid field attribute index %u in class file %s", |
898 attribute_name_index, | |
899 CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
900 Symbol* attribute_name = _cp->symbol_at(attribute_name_index); |
0 | 901 if (is_static && attribute_name == vmSymbols::tag_constant_value()) { |
902 // ignore if non-static | |
903 if (constantvalue_index != 0) { | |
904 classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK); | |
905 } | |
906 check_property( | |
907 attribute_length == 2, | |
908 "Invalid ConstantValue field attribute length %u in class file %s", | |
909 attribute_length, CHECK); | |
910 constantvalue_index = cfs->get_u2(CHECK); | |
911 if (_need_verify) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
912 verify_constantvalue(constantvalue_index, signature_index, CHECK); |
0 | 913 } |
914 } else if (attribute_name == vmSymbols::tag_synthetic()) { | |
915 if (attribute_length != 0) { | |
916 classfile_parse_error( | |
917 "Invalid Synthetic field attribute length %u in class file %s", | |
918 attribute_length, CHECK); | |
919 } | |
920 is_synthetic = true; | |
921 } else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120 | |
922 if (attribute_length != 0) { | |
923 classfile_parse_error( | |
924 "Invalid Deprecated field attribute length %u in class file %s", | |
925 attribute_length, CHECK); | |
926 } | |
927 } else if (_major_version >= JAVA_1_5_VERSION) { | |
928 if (attribute_name == vmSymbols::tag_signature()) { | |
929 if (attribute_length != 2) { | |
930 classfile_parse_error( | |
931 "Wrong size %u for field's Signature attribute in class file %s", | |
932 attribute_length, CHECK); | |
933 } | |
934 generic_signature_index = cfs->get_u2(CHECK); | |
935 } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) { | |
936 runtime_visible_annotations_length = attribute_length; | |
937 runtime_visible_annotations = cfs->get_u1_buffer(); | |
938 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
|
939 parse_annotations(runtime_visible_annotations, |
7587 | 940 runtime_visible_annotations_length, |
941 parsed_annotations, | |
942 CHECK); | |
0 | 943 cfs->skip_u1(runtime_visible_annotations_length, CHECK); |
944 } else if (PreserveAllAnnotations && attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { | |
945 runtime_invisible_annotations_length = attribute_length; | |
946 runtime_invisible_annotations = cfs->get_u1_buffer(); | |
947 assert(runtime_invisible_annotations != NULL, "null invisible annotations"); | |
948 cfs->skip_u1(runtime_invisible_annotations_length, CHECK); | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
949 } 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
|
950 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
|
951 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
952 "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
|
953 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
954 runtime_visible_type_annotations_length = attribute_length; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
955 runtime_visible_type_annotations = cfs->get_u1_buffer(); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
956 assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
957 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
|
958 } 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
|
959 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
|
960 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
961 "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
|
962 } else { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
963 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
|
964 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
965 if (PreserveAllAnnotations) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
966 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
|
967 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
|
968 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
|
969 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
970 cfs->skip_u1(attribute_length, CHECK); |
0 | 971 } else { |
972 cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes | |
973 } | |
974 } else { | |
975 cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes | |
976 } | |
977 } | |
978 | |
979 *constantvalue_index_addr = constantvalue_index; | |
980 *is_synthetic_addr = is_synthetic; | |
981 *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
|
982 AnnotationArray* a = assemble_annotations(runtime_visible_annotations, |
0 | 983 runtime_visible_annotations_length, |
984 runtime_invisible_annotations, | |
985 runtime_invisible_annotations_length, | |
986 CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
987 parsed_annotations->set_field_annotations(a); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
988 a = assemble_annotations(runtime_visible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
989 runtime_visible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
990 runtime_invisible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
991 runtime_invisible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
992 CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
993 parsed_annotations->set_field_type_annotations(a); |
0 | 994 return; |
995 } | |
996 | |
997 | |
998 // Field allocation types. Used for computing field offsets. | |
999 | |
1000 enum FieldAllocationType { | |
1001 STATIC_OOP, // Oops | |
1002 STATIC_BYTE, // Boolean, Byte, char | |
1003 STATIC_SHORT, // shorts | |
1004 STATIC_WORD, // ints | |
3938 | 1005 STATIC_DOUBLE, // aligned long or double |
0 | 1006 NONSTATIC_OOP, |
1007 NONSTATIC_BYTE, | |
1008 NONSTATIC_SHORT, | |
1009 NONSTATIC_WORD, | |
1010 NONSTATIC_DOUBLE, | |
3938 | 1011 MAX_FIELD_ALLOCATION_TYPE, |
1012 BAD_ALLOCATION_TYPE = -1 | |
0 | 1013 }; |
1014 | |
3938 | 1015 static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = { |
1016 BAD_ALLOCATION_TYPE, // 0 | |
1017 BAD_ALLOCATION_TYPE, // 1 | |
1018 BAD_ALLOCATION_TYPE, // 2 | |
1019 BAD_ALLOCATION_TYPE, // 3 | |
6848
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1020 NONSTATIC_BYTE , // T_BOOLEAN = 4, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1021 NONSTATIC_SHORT, // T_CHAR = 5, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1022 NONSTATIC_WORD, // T_FLOAT = 6, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1023 NONSTATIC_DOUBLE, // T_DOUBLE = 7, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1024 NONSTATIC_BYTE, // T_BYTE = 8, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1025 NONSTATIC_SHORT, // T_SHORT = 9, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1026 NONSTATIC_WORD, // T_INT = 10, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1027 NONSTATIC_DOUBLE, // T_LONG = 11, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1028 NONSTATIC_OOP, // T_OBJECT = 12, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1029 NONSTATIC_OOP, // T_ARRAY = 13, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1030 BAD_ALLOCATION_TYPE, // T_VOID = 14, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1031 BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1032 BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1033 BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1034 BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1035 BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
3938 | 1036 BAD_ALLOCATION_TYPE, // 0 |
1037 BAD_ALLOCATION_TYPE, // 1 | |
1038 BAD_ALLOCATION_TYPE, // 2 | |
1039 BAD_ALLOCATION_TYPE, // 3 | |
6848
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1040 STATIC_BYTE , // T_BOOLEAN = 4, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1041 STATIC_SHORT, // T_CHAR = 5, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1042 STATIC_WORD, // T_FLOAT = 6, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1043 STATIC_DOUBLE, // T_DOUBLE = 7, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1044 STATIC_BYTE, // T_BYTE = 8, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1045 STATIC_SHORT, // T_SHORT = 9, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1046 STATIC_WORD, // T_INT = 10, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1047 STATIC_DOUBLE, // T_LONG = 11, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1048 STATIC_OOP, // T_OBJECT = 12, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1049 STATIC_OOP, // T_ARRAY = 13, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1050 BAD_ALLOCATION_TYPE, // T_VOID = 14, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1051 BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1052 BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1053 BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1054 BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1055 BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
0 | 1056 }; |
1057 | |
3938 | 1058 static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) { |
1059 assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values"); | |
1060 FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)]; | |
1061 assert(result != BAD_ALLOCATION_TYPE, "bad type"); | |
1062 return result; | |
1063 } | |
1064 | |
1065 class FieldAllocationCount: public ResourceObj { | |
1066 public: | |
4744
cd5d8cafcc84
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
3938
diff
changeset
|
1067 u2 count[MAX_FIELD_ALLOCATION_TYPE]; |
3938 | 1068 |
1069 FieldAllocationCount() { | |
1070 for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) { | |
1071 count[i] = 0; | |
1072 } | |
1073 } | |
1074 | |
1075 FieldAllocationType update(bool is_static, BasicType type) { | |
1076 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
|
1077 // 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
|
1078 assert(count[atype] < 0xFFFF, "More than 65535 fields"); |
3938 | 1079 count[atype]++; |
1080 return atype; | |
1081 } | |
1082 }; | |
1083 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1084 Array<u2>* ClassFileParser::parse_fields(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1085 bool is_interface, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1086 FieldAllocationCount *fac, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1087 u2* java_fields_count_ptr, TRAPS) { |
0 | 1088 ClassFileStream* cfs = stream(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1089 cfs->guarantee_more(2, CHECK_NULL); // length |
0 | 1090 u2 length = cfs->get_u2_fast(); |
3938 | 1091 *java_fields_count_ptr = length; |
1092 | |
1093 int num_injected = 0; | |
1094 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
|
1095 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
|
1096 |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1097 // 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
|
1098 // [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
|
1099 // 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
|
1100 // 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
|
1101 // 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
|
1102 // 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
|
1103 // other fields data. |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1104 // |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1105 // 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
|
1106 // 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
|
1107 // ... |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1108 // 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
|
1109 // [generic signature index] |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1110 // [generic signature index] |
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 // |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1113 // 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
|
1114 // 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
|
1115 // 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
|
1116 // 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
|
1117 ResourceMark rm(THREAD); |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1118 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
|
1119 THREAD, u2, total_fields * (FieldInfo::field_slots + 1)); |
0 | 1120 |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1121 // 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
|
1122 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
|
1123 int num_generic_signature = 0; |
0 | 1124 for (int n = 0; n < length; n++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1125 cfs->guarantee_more(8, CHECK_NULL); // access_flags, name_index, descriptor_index, attributes_count |
0 | 1126 |
1127 AccessFlags access_flags; | |
1128 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
|
1129 verify_legal_field_modifiers(flags, is_interface, CHECK_NULL); |
0 | 1130 access_flags.set_flags(flags); |
1131 | |
1132 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
|
1133 int cp_size = _cp->length(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1134 check_property(valid_symbol_at(name_index), |
0 | 1135 "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
|
1136 name_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1137 CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1138 Symbol* name = _cp->symbol_at(name_index); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1139 verify_legal_field_name(name, CHECK_NULL); |
0 | 1140 |
1141 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
|
1142 check_property(valid_symbol_at(signature_index), |
0 | 1143 "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
|
1144 signature_index, CHECK_NULL); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1145 Symbol* sig = _cp->symbol_at(signature_index); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1146 verify_legal_field_signature(name, sig, CHECK_NULL); |
0 | 1147 |
1148 u2 constantvalue_index = 0; | |
1149 bool is_synthetic = false; | |
1150 u2 generic_signature_index = 0; | |
1151 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
|
1152 FieldAnnotationCollector parsed_annotations(_loader_data); |
0 | 1153 |
1154 u2 attributes_count = cfs->get_u2_fast(); | |
1155 if (attributes_count > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1156 parse_field_attributes(attributes_count, is_static, signature_index, |
0 | 1157 &constantvalue_index, &is_synthetic, |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1158 &generic_signature_index, &parsed_annotations, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1159 CHECK_NULL); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1160 if (parsed_annotations.field_annotations() != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1161 if (_fields_annotations == NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1162 _fields_annotations = MetadataFactory::new_array<AnnotationArray*>( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1163 _loader_data, length, NULL, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1164 CHECK_NULL); |
0 | 1165 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1166 _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
|
1167 parsed_annotations.set_field_annotations(NULL); |
0 | 1168 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1169 if (parsed_annotations.field_type_annotations() != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1170 if (_fields_type_annotations == NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1171 _fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1172 _loader_data, length, NULL, |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
1173 CHECK_NULL); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
1174 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1175 _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
|
1176 parsed_annotations.set_field_type_annotations(NULL); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
1177 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1178 |
0 | 1179 if (is_synthetic) { |
1180 access_flags.set_is_synthetic(); | |
1181 } | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1182 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
|
1183 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
|
1184 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
|
1185 generic_signature_slot ++; |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1186 num_generic_signature ++; |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1187 } |
0 | 1188 } |
1189 | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1190 FieldInfo* field = FieldInfo::from_field_array(fa, n); |
3938 | 1191 field->initialize(access_flags.as_short(), |
1192 name_index, | |
1193 signature_index, | |
7587 | 1194 constantvalue_index); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1195 BasicType type = _cp->basic_type_for_signature_at(signature_index); |
0 | 1196 |
1197 // Remember how many oops we encountered and compute allocation type | |
3938 | 1198 FieldAllocationType atype = fac->update(is_static, type); |
7587 | 1199 field->set_allocation_type(atype); |
1200 | |
1201 // After field is initialized with type, we can augment it with aux info | |
1202 if (parsed_annotations.has_any_annotations()) | |
1203 parsed_annotations.apply_to(field); | |
3938 | 1204 } |
1205 | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1206 int index = length; |
3938 | 1207 if (num_injected != 0) { |
1208 for (int n = 0; n < num_injected; n++) { | |
1209 // Check for duplicates | |
1210 if (injected[n].may_be_java) { | |
1211 Symbol* name = injected[n].name(); | |
1212 Symbol* signature = injected[n].signature(); | |
1213 bool duplicate = false; | |
1214 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
|
1215 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
|
1216 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
|
1217 signature == _cp->symbol_at(f->signature_index())) { |
3938 | 1218 // Symbol is desclared in Java so skip this one |
1219 duplicate = true; | |
1220 break; | |
1221 } | |
1222 } | |
1223 if (duplicate) { | |
1224 // These will be removed from the field array at the end | |
1225 continue; | |
1226 } | |
1227 } | |
1228 | |
1229 // Injected field | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1230 FieldInfo* field = FieldInfo::from_field_array(fa, index); |
3938 | 1231 field->initialize(JVM_ACC_FIELD_INTERNAL, |
1232 injected[n].name_index, | |
1233 injected[n].signature_index, | |
1234 0); | |
1235 | |
1236 BasicType type = FieldType::basic_type(injected[n].signature()); | |
1237 | |
1238 // Remember how many oops we encountered and compute allocation type | |
1239 FieldAllocationType atype = fac->update(false, type); | |
7587 | 1240 field->set_allocation_type(atype); |
3938 | 1241 index++; |
1242 } | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1243 } |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1244 |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1245 // 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
|
1246 // 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
|
1247 // 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
|
1248 // 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
|
1249 // for generic signature indexes are discarded. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1250 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
|
1251 _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
|
1252 CHECK_NULL); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1253 _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
|
1254 { |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1255 int i = 0; |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1256 for (; i < index * FieldInfo::field_slots; i++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1257 fields->at_put(i, fa[i]); |
3938 | 1258 } |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1259 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
|
1260 j < generic_signature_slot; j++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1261 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
|
1262 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1263 assert(i == fields->length(), ""); |
0 | 1264 } |
1265 | |
1266 if (_need_verify && length > 1) { | |
1267 // Check duplicated fields | |
1268 ResourceMark rm(THREAD); | |
1269 NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( | |
1270 THREAD, NameSigHash*, HASH_ROW_SIZE); | |
1271 initialize_hashtable(names_and_sigs); | |
1272 bool dup = false; | |
1273 { | |
1274 debug_only(No_Safepoint_Verifier nsv;) | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1275 for (AllFieldStream fs(fields, _cp); !fs.done(); fs.next()) { |
3938 | 1276 Symbol* name = fs.name(); |
1277 Symbol* sig = fs.signature(); | |
0 | 1278 // If no duplicates, add name/signature in hashtable names_and_sigs. |
1279 if (!put_after_lookup(name, sig, names_and_sigs)) { | |
1280 dup = true; | |
1281 break; | |
1282 } | |
1283 } | |
1284 } | |
1285 if (dup) { | |
1286 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
|
1287 CHECK_NULL); |
0 | 1288 } |
1289 } | |
1290 | |
1291 return fields; | |
1292 } | |
1293 | |
1294 | |
1295 static void copy_u2_with_conversion(u2* dest, u2* src, int length) { | |
1296 while (length-- > 0) { | |
1297 *dest++ = Bytes::get_Java_u2((u1*) (src++)); | |
1298 } | |
1299 } | |
1300 | |
1301 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1302 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
|
1303 u4 exception_table_length, |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1304 TRAPS) { |
0 | 1305 ClassFileStream* cfs = stream(); |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1306 |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1307 u2* exception_table_start = cfs->get_u2_buffer(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1308 assert(exception_table_start != NULL, "null exception table"); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1309 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
|
1310 // 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
|
1311 if (_need_verify) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1312 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
|
1313 u2 start_pc = cfs->get_u2_fast(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1314 u2 end_pc = cfs->get_u2_fast(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1315 u2 handler_pc = cfs->get_u2_fast(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1316 u2 catch_type_index = cfs->get_u2_fast(); |
0 | 1317 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
|
1318 "Illegal exception table range in class file %s", |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1319 CHECK_NULL); |
0 | 1320 guarantee_property(handler_pc < code_length, |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1321 "Illegal exception table handler in class file %s", |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1322 CHECK_NULL); |
0 | 1323 if (catch_type_index != 0) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1324 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
|
1325 "Catch type in exception table has bad constant type in class file %s", CHECK_NULL); |
0 | 1326 } |
1327 } | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1328 } else { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1329 cfs->skip_u2_fast(exception_table_length * 4); |
0 | 1330 } |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1331 return exception_table_start; |
0 | 1332 } |
1333 | |
1334 void ClassFileParser::parse_linenumber_table( | |
1335 u4 code_attribute_length, u4 code_length, | |
1336 CompressedLineNumberWriteStream** write_stream, TRAPS) { | |
1337 ClassFileStream* cfs = stream(); | |
1338 unsigned int num_entries = cfs->get_u2(CHECK); | |
1339 | |
1340 // Each entry is a u2 start_pc, and a u2 line_number | |
1341 unsigned int length_in_bytes = num_entries * (sizeof(u2) + sizeof(u2)); | |
1342 | |
1343 // Verify line number attribute and table length | |
1344 check_property( | |
1345 code_attribute_length == sizeof(u2) + length_in_bytes, | |
1346 "LineNumberTable attribute has wrong length in class file %s", CHECK); | |
1347 | |
1348 cfs->guarantee_more(length_in_bytes, CHECK); | |
1349 | |
1350 if ((*write_stream) == NULL) { | |
1351 if (length_in_bytes > fixed_buffer_size) { | |
1352 (*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes); | |
1353 } else { | |
1354 (*write_stream) = new CompressedLineNumberWriteStream( | |
1355 linenumbertable_buffer, fixed_buffer_size); | |
1356 } | |
1357 } | |
1358 | |
1359 while (num_entries-- > 0) { | |
1360 u2 bci = cfs->get_u2_fast(); // start_pc | |
1361 u2 line = cfs->get_u2_fast(); // line_number | |
1362 guarantee_property(bci < code_length, | |
1363 "Invalid pc in LineNumberTable in class file %s", CHECK); | |
1364 (*write_stream)->write_pair(bci, line); | |
1365 } | |
1366 } | |
1367 | |
1368 | |
1369 // Class file LocalVariableTable elements. | |
1370 class Classfile_LVT_Element VALUE_OBJ_CLASS_SPEC { | |
1371 public: | |
1372 u2 start_bci; | |
1373 u2 length; | |
1374 u2 name_cp_index; | |
1375 u2 descriptor_cp_index; | |
1376 u2 slot; | |
1377 }; | |
1378 | |
1379 | |
6197 | 1380 class LVT_Hash: public CHeapObj<mtClass> { |
0 | 1381 public: |
1382 LocalVariableTableElement *_elem; // element | |
1383 LVT_Hash* _next; // Next entry in hash table | |
1384 }; | |
1385 | |
1386 unsigned int hash(LocalVariableTableElement *elem) { | |
1387 unsigned int raw_hash = elem->start_bci; | |
1388 | |
1389 raw_hash = elem->length + raw_hash * 37; | |
1390 raw_hash = elem->name_cp_index + raw_hash * 37; | |
1391 raw_hash = elem->slot + raw_hash * 37; | |
1392 | |
1393 return raw_hash % HASH_ROW_SIZE; | |
1394 } | |
1395 | |
1396 void initialize_hashtable(LVT_Hash** table) { | |
1397 for (int i = 0; i < HASH_ROW_SIZE; i++) { | |
1398 table[i] = NULL; | |
1399 } | |
1400 } | |
1401 | |
1402 void clear_hashtable(LVT_Hash** table) { | |
1403 for (int i = 0; i < HASH_ROW_SIZE; i++) { | |
1404 LVT_Hash* current = table[i]; | |
1405 LVT_Hash* next; | |
1406 while (current != NULL) { | |
1407 next = current->_next; | |
1408 current->_next = NULL; | |
1409 delete(current); | |
1410 current = next; | |
1411 } | |
1412 table[i] = NULL; | |
1413 } | |
1414 } | |
1415 | |
1416 LVT_Hash* LVT_lookup(LocalVariableTableElement *elem, int index, LVT_Hash** table) { | |
1417 LVT_Hash* entry = table[index]; | |
1418 | |
1419 /* | |
1420 * 3-tuple start_bci/length/slot has to be unique key, | |
1421 * so the following comparison seems to be redundant: | |
1422 * && elem->name_cp_index == entry->_elem->name_cp_index | |
1423 */ | |
1424 while (entry != NULL) { | |
1425 if (elem->start_bci == entry->_elem->start_bci | |
1426 && elem->length == entry->_elem->length | |
1427 && elem->name_cp_index == entry->_elem->name_cp_index | |
1428 && elem->slot == entry->_elem->slot | |
1429 ) { | |
1430 return entry; | |
1431 } | |
1432 entry = entry->_next; | |
1433 } | |
1434 return NULL; | |
1435 } | |
1436 | |
1437 // Return false if the local variable is found in table. | |
1438 // Return true if no duplicate is found. | |
1439 // And local variable is added as a new entry in table. | |
1440 bool LVT_put_after_lookup(LocalVariableTableElement *elem, LVT_Hash** table) { | |
1441 // First lookup for duplicates | |
1442 int index = hash(elem); | |
1443 LVT_Hash* entry = LVT_lookup(elem, index, table); | |
1444 | |
1445 if (entry != NULL) { | |
1446 return false; | |
1447 } | |
1448 // No duplicate is found, allocate a new entry and fill it. | |
1449 if ((entry = new LVT_Hash()) == NULL) { | |
1450 return false; | |
1451 } | |
1452 entry->_elem = elem; | |
1453 | |
1454 // Insert into hash table | |
1455 entry->_next = table[index]; | |
1456 table[index] = entry; | |
1457 | |
1458 return true; | |
1459 } | |
1460 | |
1461 void copy_lvt_element(Classfile_LVT_Element *src, LocalVariableTableElement *lvt) { | |
1462 lvt->start_bci = Bytes::get_Java_u2((u1*) &src->start_bci); | |
1463 lvt->length = Bytes::get_Java_u2((u1*) &src->length); | |
1464 lvt->name_cp_index = Bytes::get_Java_u2((u1*) &src->name_cp_index); | |
1465 lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index); | |
1466 lvt->signature_cp_index = 0; | |
1467 lvt->slot = Bytes::get_Java_u2((u1*) &src->slot); | |
1468 } | |
1469 | |
1470 // Function is used to parse both attributes: | |
1471 // LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT) | |
1472 u2* ClassFileParser::parse_localvariable_table(u4 code_length, | |
1473 u2 max_locals, | |
1474 u4 code_attribute_length, | |
1475 u2* localvariable_table_length, | |
1476 bool isLVTT, | |
1477 TRAPS) { | |
1478 ClassFileStream* cfs = stream(); | |
1479 const char * tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable"; | |
1480 *localvariable_table_length = cfs->get_u2(CHECK_NULL); | |
1481 unsigned int size = (*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2); | |
1482 // Verify local variable table attribute has right length | |
1483 if (_need_verify) { | |
1484 guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)), | |
1485 "%s has wrong length in class file %s", tbl_name, CHECK_NULL); | |
1486 } | |
1487 u2* localvariable_table_start = cfs->get_u2_buffer(); | |
1488 assert(localvariable_table_start != NULL, "null local variable table"); | |
1489 if (!_need_verify) { | |
1490 cfs->skip_u2_fast(size); | |
1491 } else { | |
1492 cfs->guarantee_more(size * 2, CHECK_NULL); | |
1493 for(int i = 0; i < (*localvariable_table_length); i++) { | |
1494 u2 start_pc = cfs->get_u2_fast(); | |
1495 u2 length = cfs->get_u2_fast(); | |
1496 u2 name_index = cfs->get_u2_fast(); | |
1497 u2 descriptor_index = cfs->get_u2_fast(); | |
1498 u2 index = cfs->get_u2_fast(); | |
1499 // Assign to a u4 to avoid overflow | |
1500 u4 end_pc = (u4)start_pc + (u4)length; | |
1501 | |
1502 if (start_pc >= code_length) { | |
1503 classfile_parse_error( | |
1504 "Invalid start_pc %u in %s in class file %s", | |
1505 start_pc, tbl_name, CHECK_NULL); | |
1506 } | |
1507 if (end_pc > code_length) { | |
1508 classfile_parse_error( | |
1509 "Invalid length %u in %s in class file %s", | |
1510 length, tbl_name, CHECK_NULL); | |
1511 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1512 int cp_size = _cp->length(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1513 guarantee_property(valid_symbol_at(name_index), |
0 | 1514 "Name index %u in %s has bad constant type in class file %s", |
1515 name_index, tbl_name, CHECK_NULL); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1516 guarantee_property(valid_symbol_at(descriptor_index), |
0 | 1517 "Signature index %u in %s has bad constant type in class file %s", |
1518 descriptor_index, tbl_name, CHECK_NULL); | |
1519 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1520 Symbol* name = _cp->symbol_at(name_index); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1521 Symbol* sig = _cp->symbol_at(descriptor_index); |
0 | 1522 verify_legal_field_name(name, CHECK_NULL); |
1523 u2 extra_slot = 0; | |
1524 if (!isLVTT) { | |
1525 verify_legal_field_signature(name, sig, CHECK_NULL); | |
1526 | |
1527 // 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
|
1528 if (sig == vmSymbols::type_signature(T_DOUBLE) || |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
1529 sig == vmSymbols::type_signature(T_LONG)) { |
0 | 1530 extra_slot = 1; |
1531 } | |
1532 } | |
1533 guarantee_property((index + extra_slot) < max_locals, | |
1534 "Invalid index %u in %s in class file %s", | |
1535 index, tbl_name, CHECK_NULL); | |
1536 } | |
1537 } | |
1538 return localvariable_table_start; | |
1539 } | |
1540 | |
1541 | |
1542 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
|
1543 u1* u1_array, u2* u2_array, TRAPS) { |
0 | 1544 ClassFileStream* cfs = stream(); |
1545 u2 index = 0; // index in the array with long/double occupying two slots | |
1546 u4 i1 = *u1_index; | |
1547 u4 i2 = *u2_index + 1; | |
1548 for(int i = 0; i < array_length; i++) { | |
1549 u1 tag = u1_array[i1++] = cfs->get_u1(CHECK); | |
1550 index++; | |
1551 if (tag == ITEM_Long || tag == ITEM_Double) { | |
1552 index++; | |
1553 } else if (tag == ITEM_Object) { | |
1554 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
|
1555 guarantee_property(valid_klass_reference_at(class_index), |
0 | 1556 "Bad class index %u in StackMap in class file %s", |
1557 class_index, CHECK); | |
1558 } else if (tag == ITEM_Uninitialized) { | |
1559 u2 offset = u2_array[i2++] = cfs->get_u2(CHECK); | |
1560 guarantee_property( | |
1561 offset < code_length, | |
1562 "Bad uninitialized type offset %u in StackMap in class file %s", | |
1563 offset, CHECK); | |
1564 } else { | |
1565 guarantee_property( | |
1566 tag <= (u1)ITEM_Uninitialized, | |
1567 "Unknown variable type %u in StackMap in class file %s", | |
1568 tag, CHECK); | |
1569 } | |
1570 } | |
1571 u2_array[*u2_index] = index; | |
1572 *u1_index = i1; | |
1573 *u2_index = i2; | |
1574 } | |
1575 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1576 u1* ClassFileParser::parse_stackmap_table( |
0 | 1577 u4 code_attribute_length, TRAPS) { |
1578 if (code_attribute_length == 0) | |
1579 return NULL; | |
1580 | |
1581 ClassFileStream* cfs = stream(); | |
1582 u1* stackmap_table_start = cfs->get_u1_buffer(); | |
1583 assert(stackmap_table_start != NULL, "null stackmap table"); | |
1584 | |
1585 // check code_attribute_length first | |
1586 stream()->skip_u1(code_attribute_length, CHECK_NULL); | |
1587 | |
1588 if (!_need_verify && !DumpSharedSpaces) { | |
1589 return NULL; | |
1590 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1591 return stackmap_table_start; |
0 | 1592 } |
1593 | |
1594 u2* ClassFileParser::parse_checked_exceptions(u2* checked_exceptions_length, | |
1595 u4 method_attribute_length, | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1596 TRAPS) { |
0 | 1597 ClassFileStream* cfs = stream(); |
1598 cfs->guarantee_more(2, CHECK_NULL); // checked_exceptions_length | |
1599 *checked_exceptions_length = cfs->get_u2_fast(); | |
1600 unsigned int size = (*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2); | |
1601 u2* checked_exceptions_start = cfs->get_u2_buffer(); | |
1602 assert(checked_exceptions_start != NULL, "null checked exceptions"); | |
1603 if (!_need_verify) { | |
1604 cfs->skip_u2_fast(size); | |
1605 } else { | |
1606 // Verify each value in the checked exception table | |
1607 u2 checked_exception; | |
1608 u2 len = *checked_exceptions_length; | |
1609 cfs->guarantee_more(2 * len, CHECK_NULL); | |
1610 for (int i = 0; i < len; i++) { | |
1611 checked_exception = cfs->get_u2_fast(); | |
1612 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1613 valid_klass_reference_at(checked_exception), |
0 | 1614 "Exception name has bad type at constant pool %u in class file %s", |
1615 checked_exception, CHECK_NULL); | |
1616 } | |
1617 } | |
1618 // check exceptions attribute length | |
1619 if (_need_verify) { | |
1620 guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) + | |
1621 sizeof(u2) * size), | |
1622 "Exceptions attribute has wrong length in class file %s", CHECK_NULL); | |
1623 } | |
1624 return checked_exceptions_start; | |
1625 } | |
1626 | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
1627 void ClassFileParser::throwIllegalSignature( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
1628 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
|
1629 ResourceMark rm(THREAD); |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
1630 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
|
1631 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
|
1632 "%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
|
1633 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
|
1634 } |
0 | 1635 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1636 // Skip an annotation. Return >=limit if there is any problem. |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1637 int ClassFileParser::skip_annotation(u1* buffer, int limit, int index) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1638 // annotation := atype:u2 do(nmem:u2) {member:u2 value} |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1639 // value := switch (tag:u1) { ... } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1640 index += 2; // skip atype |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1641 if ((index += 2) >= limit) return limit; // read nmem |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1642 int nmem = Bytes::get_Java_u2(buffer+index-2); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1643 while (--nmem >= 0 && index < limit) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1644 index += 2; // skip member |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1645 index = skip_annotation_value(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1646 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1647 return index; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1648 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1649 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1650 // 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
|
1651 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
|
1652 // value := switch (tag:u1) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1653 // 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
|
1654 // case e: e_class:u2 e_name:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1655 // case s: s_con:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1656 // case [: do(nval:u2) {value}; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1657 // case @: annotation; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1658 // case s: s_con:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1659 // } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1660 if ((index += 1) >= limit) return limit; // read tag |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1661 u1 tag = buffer[index-1]; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1662 switch (tag) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1663 case 'B': case 'C': case 'I': case 'S': case 'Z': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1664 case 'D': case 'F': case 'J': case 'c': case 's': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1665 index += 2; // skip con or s_con |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1666 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1667 case 'e': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1668 index += 4; // skip e_class, e_name |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1669 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1670 case '[': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1671 { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1672 if ((index += 2) >= limit) return limit; // read nval |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1673 int nval = Bytes::get_Java_u2(buffer+index-2); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1674 while (--nval >= 0 && index < limit) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1675 index = skip_annotation_value(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1676 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1677 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1678 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1679 case '@': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1680 index = skip_annotation(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1681 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1682 default: |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1683 assert(false, "annotation tag"); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1684 return limit; // bad tag byte |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1685 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1686 return index; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1687 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1688 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1689 // 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
|
1690 void ClassFileParser::parse_annotations(u1* buffer, int limit, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1691 ClassFileParser::AnnotationCollector* coll, |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1692 TRAPS) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1693 // annotations := do(nann:u2) {annotation} |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1694 int index = 0; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1695 if ((index += 2) >= limit) return; // read nann |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1696 int nann = Bytes::get_Java_u2(buffer+index-2); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1697 enum { // initial annotation layout |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1698 atype_off = 0, // utf8 such as 'Ljava/lang/annotation/Retention;' |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1699 count_off = 2, // u2 such as 1 (one value) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1700 member_off = 4, // utf8 such as 'value' |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1701 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
|
1702 e_tag_val = 'e', |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1703 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
|
1704 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
|
1705 e_size = 11, // end of 'e' annotation |
7587 | 1706 c_tag_val = 'c', // payload is type |
1707 c_con_off = 7, // utf8 payload, such as 'I' | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1708 c_size = 9, // end of 'c' annotation |
7587 | 1709 s_tag_val = 's', // payload is String |
1710 s_con_off = 7, // utf8 payload, such as 'Ljava/lang/String;' | |
1711 s_size = 9, | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1712 min_size = 6 // smallest possible size (zero members) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1713 }; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1714 while ((--nann) >= 0 && (index-2 + min_size <= limit)) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1715 int index0 = index; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1716 index = skip_annotation(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1717 u1* abase = buffer + index0; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1718 int atype = Bytes::get_Java_u2(abase + atype_off); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1719 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
|
1720 Symbol* aname = check_symbol_at(_cp, atype); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1721 if (aname == NULL) break; // invalid annotation name |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1722 Symbol* member = NULL; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1723 if (count >= 1) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1724 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
|
1725 member = check_symbol_at(_cp, member_index); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1726 if (member == NULL) break; // invalid member name |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1727 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1728 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1729 // 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
|
1730 AnnotationCollector::ID id = coll->annotation_index(_loader_data, aname); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1731 if (id == AnnotationCollector::_unknown) continue; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1732 coll->set_annotation(id); |
7587 | 1733 |
1734 if (id == AnnotationCollector::_sun_misc_Contended) { | |
10305
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1735 // @Contended can optionally specify the contention group. |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1736 // |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1737 // 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
|
1738 // 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
|
1739 // 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
|
1740 // 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
|
1741 // |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1742 // 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
|
1743 // 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
|
1744 // pool index as the group tag. |
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 u2 group_index = 0; // default contended group |
7587 | 1747 if (count == 1 |
1748 && s_size == (index - index0) // match size | |
1749 && s_tag_val == *(abase + tag_off) | |
1750 && member == vmSymbols::value_name()) { | |
10305
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1751 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
|
1752 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
|
1753 group_index = 0; // default contended group |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1754 } |
7587 | 1755 } |
10305
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1756 coll->set_contended_group(group_index); |
7587 | 1757 } |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1758 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1759 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1760 |
7587 | 1761 ClassFileParser::AnnotationCollector::ID |
1762 ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_data, | |
1763 Symbol* name) { | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1764 vmSymbols::SID sid = vmSymbols::find_sid(name); |
7639
22ead76da3f4
8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents:
7615
diff
changeset
|
1765 // 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
|
1766 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
|
1767 loader_data->is_ext_class_loader_data() || |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1768 loader_data->is_anonymous(); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1769 switch (sid) { |
8866
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1770 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
|
1771 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
|
1772 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
|
1773 return _method_CallerSensitive; |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1774 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
|
1775 if (_location != _in_method) break; // only allow for methods |
7587 | 1776 if (!privileged) break; // only allow in privileged code |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1777 return _method_ForceInline; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1778 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
|
1779 if (_location != _in_method) break; // only allow for methods |
7587 | 1780 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
|
1781 return _method_DontInline; |
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_LambdaForm_Compiled_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 | 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_LambdaForm_Compiled; |
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_Hidden_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 | 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_Hidden; |
12333
cacc4c6bfc80
8025233: Move sun.invoke.Stable into java.lang.invoke package
vlivanov
parents:
12269
diff
changeset
|
1790 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
|
1791 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
|
1792 if (!privileged) break; // only allow in privileged code |
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1793 return _field_Stable; |
7587 | 1794 case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature): |
1795 if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes | |
1796 if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges | |
1797 return _sun_misc_Contended; | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1798 default: break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1799 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1800 return AnnotationCollector::_unknown; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1801 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1802 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1803 void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) { |
7587 | 1804 if (is_contended()) |
1805 f->set_contended_group(contended_group()); | |
12190
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1806 if (is_stable()) |
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1807 f->set_stable(true); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1808 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1809 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1810 ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1811 // 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
|
1812 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
|
1813 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
|
1814 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1815 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1816 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
|
1817 if (has_annotation(_method_CallerSensitive)) |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1818 m->set_caller_sensitive(true); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1819 if (has_annotation(_method_ForceInline)) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1820 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
|
1821 if (has_annotation(_method_DontInline)) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1822 m->set_dont_inline(true); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1823 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
|
1824 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
|
1825 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
|
1826 m->set_hidden(true); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1827 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1828 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1829 void ClassFileParser::ClassAnnotationCollector::apply_to(instanceKlassHandle k) { |
7587 | 1830 k->set_is_contended(is_contended()); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1831 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1832 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1833 |
0 | 1834 #define MAX_ARGS_SIZE 255 |
1835 #define MAX_CODE_SIZE 65535 | |
1836 #define INITIAL_MAX_LVT_NUMBER 256 | |
1837 | |
8031 | 1838 /* Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
1839 * | |
1840 * Rules for LVT's and LVTT's are: | |
1841 * - There can be any number of LVT's and LVTT's. | |
1842 * - If there are n LVT's, it is the same as if there was just | |
1843 * one LVT containing all the entries from the n LVT's. | |
1844 * - There may be no more than one LVT entry per local variable. | |
1845 * Two LVT entries are 'equal' if these fields are the same: | |
1846 * start_pc, length, name, slot | |
1847 * - There may be no more than one LVTT entry per each LVT entry. | |
1848 * Each LVTT entry has to match some LVT entry. | |
1849 * - HotSpot internal LVT keeps natural ordering of class file LVT entries. | |
1850 */ | |
1851 void ClassFileParser::copy_localvariable_table(ConstMethod* cm, | |
1852 int lvt_cnt, | |
1853 u2* localvariable_table_length, | |
1854 u2** localvariable_table_start, | |
1855 int lvtt_cnt, | |
1856 u2* localvariable_type_table_length, | |
1857 u2** localvariable_type_table_start, | |
1858 TRAPS) { | |
1859 | |
1860 LVT_Hash** lvt_Hash = NEW_RESOURCE_ARRAY(LVT_Hash*, HASH_ROW_SIZE); | |
1861 initialize_hashtable(lvt_Hash); | |
1862 | |
1863 // To fill LocalVariableTable in | |
1864 Classfile_LVT_Element* cf_lvt; | |
1865 LocalVariableTableElement* lvt = cm->localvariable_table_start(); | |
1866 | |
1867 for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) { | |
1868 cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no]; | |
1869 for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) { | |
1870 copy_lvt_element(&cf_lvt[idx], lvt); | |
1871 // If no duplicates, add LVT elem in hashtable lvt_Hash. | |
1872 if (LVT_put_after_lookup(lvt, lvt_Hash) == false | |
1873 && _need_verify | |
1874 && _major_version >= JAVA_1_5_VERSION) { | |
1875 clear_hashtable(lvt_Hash); | |
1876 classfile_parse_error("Duplicated LocalVariableTable attribute " | |
1877 "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
|
1878 _cp->symbol_at(lvt->name_cp_index)->as_utf8(), |
8031 | 1879 CHECK); |
1880 } | |
1881 } | |
1882 } | |
1883 | |
1884 // To merge LocalVariableTable and LocalVariableTypeTable | |
1885 Classfile_LVT_Element* cf_lvtt; | |
1886 LocalVariableTableElement lvtt_elem; | |
1887 | |
1888 for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) { | |
1889 cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no]; | |
1890 for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) { | |
1891 copy_lvt_element(&cf_lvtt[idx], &lvtt_elem); | |
1892 int index = hash(&lvtt_elem); | |
1893 LVT_Hash* entry = LVT_lookup(&lvtt_elem, index, lvt_Hash); | |
1894 if (entry == NULL) { | |
1895 if (_need_verify) { | |
1896 clear_hashtable(lvt_Hash); | |
1897 classfile_parse_error("LVTT entry for '%s' in class file %s " | |
1898 "does not match any LVT entry", | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1899 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
8031 | 1900 CHECK); |
1901 } | |
1902 } else if (entry->_elem->signature_cp_index != 0 && _need_verify) { | |
1903 clear_hashtable(lvt_Hash); | |
1904 classfile_parse_error("Duplicated LocalVariableTypeTable attribute " | |
1905 "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
|
1906 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
8031 | 1907 CHECK); |
1908 } else { | |
1909 // to add generic signatures into LocalVariableTable | |
1910 entry->_elem->signature_cp_index = lvtt_elem.descriptor_cp_index; | |
1911 } | |
1912 } | |
1913 } | |
1914 clear_hashtable(lvt_Hash); | |
1915 } | |
1916 | |
1917 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1918 void ClassFileParser::copy_method_annotations(ConstMethod* cm, |
8031 | 1919 u1* runtime_visible_annotations, |
1920 int runtime_visible_annotations_length, | |
1921 u1* runtime_invisible_annotations, | |
1922 int runtime_invisible_annotations_length, | |
1923 u1* runtime_visible_parameter_annotations, | |
1924 int runtime_visible_parameter_annotations_length, | |
1925 u1* runtime_invisible_parameter_annotations, | |
1926 int runtime_invisible_parameter_annotations_length, | |
1927 u1* runtime_visible_type_annotations, | |
1928 int runtime_visible_type_annotations_length, | |
1929 u1* runtime_invisible_type_annotations, | |
1930 int runtime_invisible_type_annotations_length, | |
1931 u1* annotation_default, | |
1932 int annotation_default_length, | |
1933 TRAPS) { | |
1934 | |
1935 AnnotationArray* a; | |
1936 | |
1937 if (runtime_visible_annotations_length + | |
1938 runtime_invisible_annotations_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1939 a = assemble_annotations(runtime_visible_annotations, |
8031 | 1940 runtime_visible_annotations_length, |
1941 runtime_invisible_annotations, | |
1942 runtime_invisible_annotations_length, | |
1943 CHECK); | |
1944 cm->set_method_annotations(a); | |
1945 } | |
1946 | |
1947 if (runtime_visible_parameter_annotations_length + | |
1948 runtime_invisible_parameter_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_parameter_annotations, |
8031 | 1950 runtime_visible_parameter_annotations_length, |
1951 runtime_invisible_parameter_annotations, | |
1952 runtime_invisible_parameter_annotations_length, | |
1953 CHECK); | |
1954 cm->set_parameter_annotations(a); | |
1955 } | |
1956 | |
1957 if (annotation_default_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1958 a = assemble_annotations(annotation_default, |
8031 | 1959 annotation_default_length, |
1960 NULL, | |
1961 0, | |
1962 CHECK); | |
1963 cm->set_default_annotations(a); | |
1964 } | |
1965 | |
1966 if (runtime_visible_type_annotations_length + | |
1967 runtime_invisible_type_annotations_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1968 a = assemble_annotations(runtime_visible_type_annotations, |
8031 | 1969 runtime_visible_type_annotations_length, |
1970 runtime_invisible_type_annotations, | |
1971 runtime_invisible_type_annotations_length, | |
1972 CHECK); | |
1973 cm->set_type_annotations(a); | |
1974 } | |
1975 } | |
1976 | |
1977 | |
0 | 1978 // 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
|
1979 // 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
|
1980 // Method* to save footprint, so we only know the size of the resulting Method* when the |
0 | 1981 // entire method attribute is parsed. |
1982 // | |
1983 // The promoted_flags parameter is used to pass relevant access_flags | |
1984 // from the method back up to the containing klass. These flag values | |
1985 // are added to klass's access_flags. | |
1986 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1987 methodHandle ClassFileParser::parse_method(bool is_interface, |
0 | 1988 AccessFlags *promoted_flags, |
1989 TRAPS) { | |
1990 ClassFileStream* cfs = stream(); | |
1991 methodHandle nullHandle; | |
1992 ResourceMark rm(THREAD); | |
1993 // Parse fixed parts | |
1994 cfs->guarantee_more(8, CHECK_(nullHandle)); // access_flags, name_index, descriptor_index, attributes_count | |
1995 | |
1996 int flags = cfs->get_u2_fast(); | |
1997 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
|
1998 int cp_size = _cp->length(); |
0 | 1999 check_property( |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2000 valid_symbol_at(name_index), |
0 | 2001 "Illegal constant pool index %u for method name in class file %s", |
2002 name_index, CHECK_(nullHandle)); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2003 Symbol* name = _cp->symbol_at(name_index); |
0 | 2004 verify_legal_method_name(name, CHECK_(nullHandle)); |
2005 | |
2006 u2 signature_index = cfs->get_u2_fast(); | |
2007 guarantee_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2008 valid_symbol_at(signature_index), |
0 | 2009 "Illegal constant pool index %u for method signature in class file %s", |
2010 signature_index, CHECK_(nullHandle)); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2011 Symbol* signature = _cp->symbol_at(signature_index); |
0 | 2012 |
2013 AccessFlags access_flags; | |
2014 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
|
2015 // 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
|
2016 // (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
|
2017 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
|
2018 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
|
2019 } 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
|
2020 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
|
2021 } |
0 | 2022 } else { |
2023 verify_legal_method_modifiers(flags, is_interface, name, CHECK_(nullHandle)); | |
2024 } | |
2025 | |
2026 int args_size = -1; // only used when _need_verify is true | |
2027 if (_need_verify) { | |
2028 args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) + | |
2029 verify_legal_method_signature(name, signature, CHECK_(nullHandle)); | |
2030 if (args_size > MAX_ARGS_SIZE) { | |
2031 classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_(nullHandle)); | |
2032 } | |
2033 } | |
2034 | |
2035 access_flags.set_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS); | |
2036 | |
2037 // Default values for code and exceptions attribute elements | |
2038 u2 max_stack = 0; | |
2039 u2 max_locals = 0; | |
2040 u4 code_length = 0; | |
2041 u1* code_start = 0; | |
2042 u2 exception_table_length = 0; | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2043 u2* exception_table_start = NULL; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2044 Array<int>* exception_handlers = Universe::the_empty_int_array(); |
0 | 2045 u2 checked_exceptions_length = 0; |
2046 u2* checked_exceptions_start = NULL; | |
2047 CompressedLineNumberWriteStream* linenumber_table = NULL; | |
2048 int linenumber_table_length = 0; | |
2049 int total_lvt_length = 0; | |
2050 u2 lvt_cnt = 0; | |
2051 u2 lvtt_cnt = 0; | |
2052 bool lvt_allocated = false; | |
2053 u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER; | |
2054 u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER; | |
2055 u2* localvariable_table_length; | |
2056 u2** localvariable_table_start; | |
2057 u2* localvariable_type_table_length; | |
2058 u2** localvariable_type_table_start; | |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2059 u2 method_parameters_length = 0; |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2060 u1* method_parameters_data = NULL; |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2061 bool method_parameters_seen = false; |
0 | 2062 bool parsed_code_attribute = false; |
2063 bool parsed_checked_exceptions_attribute = false; | |
2064 bool parsed_stackmap_attribute = false; | |
2065 // stackmap attribute - JDK1.5 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2066 u1* stackmap_data = NULL; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2067 int stackmap_data_length = 0; |
0 | 2068 u2 generic_signature_index = 0; |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2069 MethodAnnotationCollector parsed_annotations; |
0 | 2070 u1* runtime_visible_annotations = NULL; |
2071 int runtime_visible_annotations_length = 0; | |
2072 u1* runtime_invisible_annotations = NULL; | |
2073 int runtime_invisible_annotations_length = 0; | |
2074 u1* runtime_visible_parameter_annotations = NULL; | |
2075 int runtime_visible_parameter_annotations_length = 0; | |
2076 u1* runtime_invisible_parameter_annotations = NULL; | |
2077 int runtime_invisible_parameter_annotations_length = 0; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2078 u1* runtime_visible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2079 int runtime_visible_type_annotations_length = 0; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2080 u1* runtime_invisible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2081 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
|
2082 bool runtime_invisible_type_annotations_exists = false; |
0 | 2083 u1* annotation_default = NULL; |
2084 int annotation_default_length = 0; | |
2085 | |
2086 // Parse code and exceptions attribute | |
2087 u2 method_attributes_count = cfs->get_u2_fast(); | |
2088 while (method_attributes_count--) { | |
2089 cfs->guarantee_more(6, CHECK_(nullHandle)); // method_attribute_name_index, method_attribute_length | |
2090 u2 method_attribute_name_index = cfs->get_u2_fast(); | |
2091 u4 method_attribute_length = cfs->get_u4_fast(); | |
2092 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2093 valid_symbol_at(method_attribute_name_index), |
0 | 2094 "Invalid method attribute name index %u in class file %s", |
2095 method_attribute_name_index, CHECK_(nullHandle)); | |
2096 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2097 Symbol* method_attribute_name = _cp->symbol_at(method_attribute_name_index); |
0 | 2098 if (method_attribute_name == vmSymbols::tag_code()) { |
2099 // Parse Code attribute | |
2100 if (_need_verify) { | |
6934 | 2101 guarantee_property( |
2102 !access_flags.is_native() && !access_flags.is_abstract(), | |
0 | 2103 "Code attribute in native or abstract methods in class file %s", |
2104 CHECK_(nullHandle)); | |
2105 } | |
2106 if (parsed_code_attribute) { | |
2107 classfile_parse_error("Multiple Code attributes in class file %s", CHECK_(nullHandle)); | |
2108 } | |
2109 parsed_code_attribute = true; | |
2110 | |
2111 // Stack size, locals size, and code size | |
2112 if (_major_version == 45 && _minor_version <= 2) { | |
2113 cfs->guarantee_more(4, CHECK_(nullHandle)); | |
2114 max_stack = cfs->get_u1_fast(); | |
2115 max_locals = cfs->get_u1_fast(); | |
2116 code_length = cfs->get_u2_fast(); | |
2117 } else { | |
2118 cfs->guarantee_more(8, CHECK_(nullHandle)); | |
2119 max_stack = cfs->get_u2_fast(); | |
2120 max_locals = cfs->get_u2_fast(); | |
2121 code_length = cfs->get_u4_fast(); | |
2122 } | |
2123 if (_need_verify) { | |
2124 guarantee_property(args_size <= max_locals, | |
2125 "Arguments can't fit into locals in class file %s", CHECK_(nullHandle)); | |
2126 guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE, | |
2127 "Invalid method Code length %u in class file %s", | |
2128 code_length, CHECK_(nullHandle)); | |
2129 } | |
2130 // Code pointer | |
2131 code_start = cfs->get_u1_buffer(); | |
2132 assert(code_start != NULL, "null code start"); | |
2133 cfs->guarantee_more(code_length, CHECK_(nullHandle)); | |
2134 cfs->skip_u1_fast(code_length); | |
2135 | |
2136 // Exception handler table | |
2137 cfs->guarantee_more(2, CHECK_(nullHandle)); // exception_table_length | |
2138 exception_table_length = cfs->get_u2_fast(); | |
2139 if (exception_table_length > 0) { | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2140 exception_table_start = |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2141 parse_exception_table(code_length, exception_table_length, CHECK_(nullHandle)); |
0 | 2142 } |
2143 | |
2144 // Parse additional attributes in code attribute | |
2145 cfs->guarantee_more(2, CHECK_(nullHandle)); // code_attributes_count | |
2146 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
|
2147 |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2148 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
|
2149 |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2150 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
|
2151 calculated_attribute_length = |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2152 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
|
2153 } else { |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2154 // 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
|
2155 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
|
2156 } |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2157 calculated_attribute_length += |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2158 code_length + |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2159 sizeof(exception_table_length) + |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2160 sizeof(code_attributes_count) + |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2161 exception_table_length * |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2162 ( sizeof(u2) + // start_pc |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2163 sizeof(u2) + // end_pc |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2164 sizeof(u2) + // handler_pc |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2165 sizeof(u2) ); // catch_type_index |
0 | 2166 |
2167 while (code_attributes_count--) { | |
2168 cfs->guarantee_more(6, CHECK_(nullHandle)); // code_attribute_name_index, code_attribute_length | |
2169 u2 code_attribute_name_index = cfs->get_u2_fast(); | |
2170 u4 code_attribute_length = cfs->get_u4_fast(); | |
2171 calculated_attribute_length += code_attribute_length + | |
2172 sizeof(code_attribute_name_index) + | |
2173 sizeof(code_attribute_length); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2174 check_property(valid_symbol_at(code_attribute_name_index), |
0 | 2175 "Invalid code attribute name index %u in class file %s", |
2176 code_attribute_name_index, | |
2177 CHECK_(nullHandle)); | |
2178 if (LoadLineNumberTables && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2179 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) { |
0 | 2180 // Parse and compress line number table |
2181 parse_linenumber_table(code_attribute_length, code_length, | |
2182 &linenumber_table, CHECK_(nullHandle)); | |
2183 | |
2184 } else if (LoadLocalVariableTables && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2185 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) { |
0 | 2186 // Parse local variable table |
2187 if (!lvt_allocated) { | |
2188 localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2189 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2190 localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2191 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2192 localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2193 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2194 localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2195 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2196 lvt_allocated = true; | |
2197 } | |
2198 if (lvt_cnt == max_lvt_cnt) { | |
2199 max_lvt_cnt <<= 1; | |
12922 | 2200 localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt); |
2201 localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt); | |
0 | 2202 } |
2203 localvariable_table_start[lvt_cnt] = | |
2204 parse_localvariable_table(code_length, | |
2205 max_locals, | |
2206 code_attribute_length, | |
2207 &localvariable_table_length[lvt_cnt], | |
2208 false, // is not LVTT | |
2209 CHECK_(nullHandle)); | |
2210 total_lvt_length += localvariable_table_length[lvt_cnt]; | |
2211 lvt_cnt++; | |
2212 } else if (LoadLocalVariableTypeTables && | |
2213 _major_version >= JAVA_1_5_VERSION && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2214 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) { |
0 | 2215 if (!lvt_allocated) { |
2216 localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2217 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2218 localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2219 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2220 localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2221 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2222 localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2223 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2224 lvt_allocated = true; | |
2225 } | |
2226 // Parse local variable type table | |
2227 if (lvtt_cnt == max_lvtt_cnt) { | |
2228 max_lvtt_cnt <<= 1; | |
12922 | 2229 localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt); |
2230 localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt); | |
0 | 2231 } |
2232 localvariable_type_table_start[lvtt_cnt] = | |
2233 parse_localvariable_table(code_length, | |
2234 max_locals, | |
2235 code_attribute_length, | |
2236 &localvariable_type_table_length[lvtt_cnt], | |
2237 true, // is LVTT | |
2238 CHECK_(nullHandle)); | |
2239 lvtt_cnt++; | |
8819
36376b540a98
8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents:
8719
diff
changeset
|
2240 } 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
|
2241 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) { |
0 | 2242 // Stack map is only needed by the new verifier in JDK1.5. |
2243 if (parsed_stackmap_attribute) { | |
2244 classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_(nullHandle)); | |
2245 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2246 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
|
2247 stackmap_data_length = code_attribute_length; |
0 | 2248 parsed_stackmap_attribute = true; |
2249 } else { | |
2250 // Skip unknown attributes | |
2251 cfs->skip_u1(code_attribute_length, CHECK_(nullHandle)); | |
2252 } | |
2253 } | |
2254 // check method attribute length | |
2255 if (_need_verify) { | |
2256 guarantee_property(method_attribute_length == calculated_attribute_length, | |
2257 "Code segment has wrong length in class file %s", CHECK_(nullHandle)); | |
2258 } | |
2259 } else if (method_attribute_name == vmSymbols::tag_exceptions()) { | |
2260 // Parse Exceptions attribute | |
2261 if (parsed_checked_exceptions_attribute) { | |
2262 classfile_parse_error("Multiple Exceptions attributes in class file %s", CHECK_(nullHandle)); | |
2263 } | |
2264 parsed_checked_exceptions_attribute = true; | |
2265 checked_exceptions_start = | |
2266 parse_checked_exceptions(&checked_exceptions_length, | |
2267 method_attribute_length, | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2268 CHECK_(nullHandle)); |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2269 } else if (method_attribute_name == vmSymbols::tag_method_parameters()) { |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2270 // reject multiple method parameters |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2271 if (method_parameters_seen) { |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2272 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
|
2273 } |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2274 method_parameters_seen = true; |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2275 method_parameters_length = cfs->get_u1_fast(); |
10154
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2276 if (method_attribute_length != (method_parameters_length * 4u) + 1u) { |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2277 classfile_parse_error( |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2278 "Invalid MethodParameters method attribute length %u in class file", |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2279 method_attribute_length, CHECK_(nullHandle)); |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2280 } |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2281 method_parameters_data = cfs->get_u1_buffer(); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2282 cfs->skip_u2_fast(method_parameters_length); |
10154
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2283 cfs->skip_u2_fast(method_parameters_length); |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2284 // ignore this attribute if it cannot be reflected |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2285 if (!SystemDictionary::Parameter_klass_loaded()) |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2286 method_parameters_length = 0; |
0 | 2287 } else if (method_attribute_name == vmSymbols::tag_synthetic()) { |
2288 if (method_attribute_length != 0) { | |
2289 classfile_parse_error( | |
2290 "Invalid Synthetic method attribute length %u in class file %s", | |
2291 method_attribute_length, CHECK_(nullHandle)); | |
2292 } | |
2293 // Should we check that there hasn't already been a synthetic attribute? | |
2294 access_flags.set_is_synthetic(); | |
2295 } else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120 | |
2296 if (method_attribute_length != 0) { | |
2297 classfile_parse_error( | |
2298 "Invalid Deprecated method attribute length %u in class file %s", | |
2299 method_attribute_length, CHECK_(nullHandle)); | |
2300 } | |
2301 } else if (_major_version >= JAVA_1_5_VERSION) { | |
2302 if (method_attribute_name == vmSymbols::tag_signature()) { | |
2303 if (method_attribute_length != 2) { | |
2304 classfile_parse_error( | |
2305 "Invalid Signature attribute length %u in class file %s", | |
2306 method_attribute_length, CHECK_(nullHandle)); | |
2307 } | |
2308 cfs->guarantee_more(2, CHECK_(nullHandle)); // generic_signature_index | |
2309 generic_signature_index = cfs->get_u2_fast(); | |
2310 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) { | |
2311 runtime_visible_annotations_length = method_attribute_length; | |
2312 runtime_visible_annotations = cfs->get_u1_buffer(); | |
2313 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
|
2314 parse_annotations(runtime_visible_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2315 runtime_visible_annotations_length, &parsed_annotations, |
6934 | 2316 CHECK_(nullHandle)); |
0 | 2317 cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle)); |
2318 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { | |
2319 runtime_invisible_annotations_length = method_attribute_length; | |
2320 runtime_invisible_annotations = cfs->get_u1_buffer(); | |
2321 assert(runtime_invisible_annotations != NULL, "null invisible annotations"); | |
2322 cfs->skip_u1(runtime_invisible_annotations_length, CHECK_(nullHandle)); | |
2323 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_parameter_annotations()) { | |
2324 runtime_visible_parameter_annotations_length = method_attribute_length; | |
2325 runtime_visible_parameter_annotations = cfs->get_u1_buffer(); | |
2326 assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations"); | |
2327 cfs->skip_u1(runtime_visible_parameter_annotations_length, CHECK_(nullHandle)); | |
2328 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_parameter_annotations()) { | |
2329 runtime_invisible_parameter_annotations_length = method_attribute_length; | |
2330 runtime_invisible_parameter_annotations = cfs->get_u1_buffer(); | |
2331 assert(runtime_invisible_parameter_annotations != NULL, "null invisible parameter annotations"); | |
2332 cfs->skip_u1(runtime_invisible_parameter_annotations_length, CHECK_(nullHandle)); | |
2333 } else if (method_attribute_name == vmSymbols::tag_annotation_default()) { | |
2334 annotation_default_length = method_attribute_length; | |
2335 annotation_default = cfs->get_u1_buffer(); | |
2336 assert(annotation_default != NULL, "null annotation default"); | |
2337 cfs->skip_u1(annotation_default_length, CHECK_(nullHandle)); | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2338 } 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
|
2339 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
|
2340 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2341 "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
|
2342 CHECK_(nullHandle)); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2343 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2344 runtime_visible_type_annotations_length = method_attribute_length; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2345 runtime_visible_type_annotations = cfs->get_u1_buffer(); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2346 assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2347 // No need for the VM to parse Type annotations |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2348 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
|
2349 } 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
|
2350 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
|
2351 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2352 "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
|
2353 CHECK_(nullHandle)); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2354 } else { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2355 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
|
2356 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2357 if (PreserveAllAnnotations) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2358 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
|
2359 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
|
2360 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
|
2361 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2362 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
0 | 2363 } else { |
2364 // Skip unknown attributes | |
2365 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); | |
2366 } | |
2367 } else { | |
2368 // Skip unknown attributes | |
2369 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); | |
2370 } | |
2371 } | |
2372 | |
2373 if (linenumber_table != NULL) { | |
2374 linenumber_table->write_terminator(); | |
2375 linenumber_table_length = linenumber_table->position(); | |
2376 } | |
2377 | |
2378 // Make sure there's at least one Code attribute in non-native/non-abstract method | |
2379 if (_need_verify) { | |
2380 guarantee_property(access_flags.is_native() || access_flags.is_abstract() || parsed_code_attribute, | |
2381 "Absent Code attribute in method that is not native or abstract in class file %s", CHECK_(nullHandle)); | |
2382 } | |
2383 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2384 // All sizing information for a Method* is finally available, now create it |
8031 | 2385 InlineTableSizes sizes( |
2386 total_lvt_length, | |
2387 linenumber_table_length, | |
2388 exception_table_length, | |
2389 checked_exceptions_length, | |
2390 method_parameters_length, | |
2391 generic_signature_index, | |
2392 runtime_visible_annotations_length + | |
2393 runtime_invisible_annotations_length, | |
2394 runtime_visible_parameter_annotations_length + | |
2395 runtime_invisible_parameter_annotations_length, | |
2396 runtime_visible_type_annotations_length + | |
2397 runtime_invisible_type_annotations_length, | |
2398 annotation_default_length, | |
2399 0); | |
2400 | |
6934 | 2401 Method* m = Method::allocate( |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2402 _loader_data, code_length, access_flags, &sizes, |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2403 ConstMethod::NORMAL, CHECK_(nullHandle)); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2404 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2405 ClassLoadingService::add_class_method_size(m->size()*HeapWordSize); |
0 | 2406 |
2407 // 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
|
2408 m->set_constants(_cp); |
0 | 2409 m->set_name_index(name_index); |
2410 m->set_signature_index(signature_index); | |
2411 #ifdef CC_INTERP | |
2412 // 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
|
2413 ResultTypeFinder rtf(_cp->symbol_at(signature_index)); |
0 | 2414 m->set_result_index(rtf.type()); |
2415 #endif | |
2416 | |
2417 if (args_size >= 0) { | |
2418 m->set_size_of_parameters(args_size); | |
2419 } else { | |
2420 m->compute_size_of_parameters(THREAD); | |
2421 } | |
2422 #ifdef ASSERT | |
2423 if (args_size >= 0) { | |
2424 m->compute_size_of_parameters(THREAD); | |
2425 assert(args_size == m->size_of_parameters(), ""); | |
2426 } | |
2427 #endif | |
2428 | |
2429 // Fill in code attribute information | |
2430 m->set_max_stack(max_stack); | |
2431 m->set_max_locals(max_locals); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2432 if (stackmap_data != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2433 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
|
2434 stackmap_data_length, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2435 } |
0 | 2436 |
2437 // Copy byte codes | |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1108
diff
changeset
|
2438 m->set_code(code_start); |
0 | 2439 |
2440 // Copy line number table | |
2441 if (linenumber_table != NULL) { | |
2442 memcpy(m->compressed_linenumber_table(), | |
2443 linenumber_table->buffer(), linenumber_table_length); | |
2444 } | |
2445 | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2446 // Copy exception table |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2447 if (exception_table_length > 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2448 int size = |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2449 exception_table_length * sizeof(ExceptionTableElement) / sizeof(u2); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2450 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
|
2451 exception_table_start, size); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2452 } |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2453 |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2454 // Copy method parameters |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2455 if (method_parameters_length > 0) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2456 MethodParametersElement* elem = m->constMethod()->method_parameters_start(); |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2457 for (int i = 0; i < method_parameters_length; i++) { |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2458 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
|
2459 method_parameters_data += 2; |
10154
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2460 elem[i].flags = Bytes::get_Java_u2(method_parameters_data); |
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2461 method_parameters_data += 2; |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2462 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2463 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2464 |
0 | 2465 // Copy checked exceptions |
2466 if (checked_exceptions_length > 0) { | |
2467 int size = checked_exceptions_length * sizeof(CheckedExceptionElement) / sizeof(u2); | |
2468 copy_u2_with_conversion((u2*) m->checked_exceptions_start(), checked_exceptions_start, size); | |
2469 } | |
2470 | |
8031 | 2471 // Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
0 | 2472 if (total_lvt_length > 0) { |
2473 promoted_flags->set_has_localvariable_table(); | |
8031 | 2474 copy_localvariable_table(m->constMethod(), lvt_cnt, |
2475 localvariable_table_length, | |
2476 localvariable_table_start, | |
2477 lvtt_cnt, | |
2478 localvariable_type_table_length, | |
2479 localvariable_type_table_start, CHECK_NULL); | |
0 | 2480 } |
2481 | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2482 if (parsed_annotations.has_any_annotations()) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2483 parsed_annotations.apply_to(m); |
8031 | 2484 |
2485 // Copy annotations | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2486 copy_method_annotations(m->constMethod(), |
8031 | 2487 runtime_visible_annotations, |
2488 runtime_visible_annotations_length, | |
2489 runtime_invisible_annotations, | |
2490 runtime_invisible_annotations_length, | |
2491 runtime_visible_parameter_annotations, | |
2492 runtime_visible_parameter_annotations_length, | |
2493 runtime_invisible_parameter_annotations, | |
2494 runtime_invisible_parameter_annotations_length, | |
2495 runtime_visible_type_annotations, | |
2496 runtime_visible_type_annotations_length, | |
2497 runtime_invisible_type_annotations, | |
2498 runtime_invisible_type_annotations_length, | |
2499 annotation_default, | |
2500 annotation_default_length, | |
2501 CHECK_NULL); | |
0 | 2502 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2503 if (name == vmSymbols::finalize_method_name() && |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2504 signature == vmSymbols::void_method_signature()) { |
0 | 2505 if (m->is_empty_method()) { |
2506 _has_empty_finalizer = true; | |
2507 } else { | |
2508 _has_finalizer = true; | |
2509 } | |
2510 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2511 if (name == vmSymbols::object_initializer_name() && |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2512 signature == vmSymbols::void_method_signature() && |
0 | 2513 m->is_vanilla_constructor()) { |
2514 _has_vanilla_constructor = true; | |
2515 } | |
2516 | |
8031 | 2517 NOT_PRODUCT(m->verify()); |
0 | 2518 return m; |
2519 } | |
2520 | |
2521 | |
2522 // The promoted_flags parameter is used to pass relevant access_flags | |
2523 // from the methods back up to the containing klass. These flag values | |
2524 // are added to klass's access_flags. | |
2525 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2526 Array<Method*>* ClassFileParser::parse_methods(bool is_interface, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2527 AccessFlags* promoted_flags, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2528 bool* has_final_method, |
6934 | 2529 bool* has_default_methods, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2530 TRAPS) { |
0 | 2531 ClassFileStream* cfs = stream(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2532 cfs->guarantee_more(2, CHECK_NULL); // length |
0 | 2533 u2 length = cfs->get_u2_fast(); |
2534 if (length == 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2535 _methods = Universe::the_empty_method_array(); |
0 | 2536 } else { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2537 _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
|
2538 |
0 | 2539 HandleMark hm(THREAD); |
2540 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
|
2541 methodHandle method = parse_method(is_interface, |
0 | 2542 promoted_flags, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2543 CHECK_NULL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2544 |
0 | 2545 if (method->is_final()) { |
2546 *has_final_method = true; | |
2547 } | |
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12269
diff
changeset
|
2548 if (is_interface && !(*has_default_methods) |
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12269
diff
changeset
|
2549 && !method->is_abstract() && !method->is_static() |
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12269
diff
changeset
|
2550 && !method->is_private()) { |
6934 | 2551 // default method |
2552 *has_default_methods = true; | |
2553 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2554 _methods->at_put(index, method()); |
0 | 2555 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2556 |
0 | 2557 if (_need_verify && length > 1) { |
2558 // Check duplicated methods | |
2559 ResourceMark rm(THREAD); | |
2560 NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2561 THREAD, NameSigHash*, HASH_ROW_SIZE); | |
2562 initialize_hashtable(names_and_sigs); | |
2563 bool dup = false; | |
2564 { | |
2565 debug_only(No_Safepoint_Verifier nsv;) | |
2566 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
|
2567 Method* m = _methods->at(i); |
0 | 2568 // If no duplicates, add name/signature in hashtable names_and_sigs. |
2569 if (!put_after_lookup(m->name(), m->signature(), names_and_sigs)) { | |
2570 dup = true; | |
2571 break; | |
2572 } | |
2573 } | |
2574 } | |
2575 if (dup) { | |
2576 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
|
2577 CHECK_NULL); |
0 | 2578 } |
2579 } | |
2580 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2581 return _methods; |
0 | 2582 } |
2583 | |
2584 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2585 intArray* ClassFileParser::sort_methods(Array<Method*>* methods) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2586 int length = methods->length(); |
3245
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2587 // If JVMTI original method ordering or sharing is enabled we have to |
0 | 2588 // remember the original class file ordering. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2589 // We temporarily use the vtable_index field in the Method* to store the |
0 | 2590 // 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
|
2591 // Put the method ordering in the shared archive. |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2592 if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { |
0 | 2593 for (int index = 0; index < length; index++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2594 Method* m = methods->at(index); |
0 | 2595 assert(!m->valid_vtable_index(), "vtable index should not be set"); |
2596 m->set_vtable_index(index); | |
2597 } | |
2598 } | |
2599 // 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
|
2600 // Note that the ordering is not alphabetical, see Symbol::fast_compare |
8031 | 2601 Method::sort_methods(methods); |
0 | 2602 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2603 intArray* method_ordering = NULL; |
3245
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2604 // 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
|
2605 // array remembering the original ordering |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2606 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
|
2607 method_ordering = new intArray(length); |
0 | 2608 for (int index = 0; index < length; index++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2609 Method* m = methods->at(index); |
0 | 2610 int old_index = m->vtable_index(); |
2611 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
|
2612 method_ordering->at_put(index, old_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2613 m->set_vtable_index(Method::invalid_vtable_index); |
0 | 2614 } |
2615 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2616 return method_ordering; |
0 | 2617 } |
2618 | |
2619 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2620 void ClassFileParser::parse_classfile_sourcefile_attribute(TRAPS) { |
0 | 2621 ClassFileStream* cfs = stream(); |
2622 cfs->guarantee_more(2, CHECK); // sourcefile_index | |
2623 u2 sourcefile_index = cfs->get_u2_fast(); | |
2624 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2625 valid_symbol_at(sourcefile_index), |
0 | 2626 "Invalid SourceFile attribute at constant pool index %u in class file %s", |
2627 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
|
2628 set_class_sourcefile_index(sourcefile_index); |
0 | 2629 } |
2630 | |
2631 | |
2632 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2633 void ClassFileParser::parse_classfile_source_debug_extension_attribute(int length, TRAPS) { |
0 | 2634 ClassFileStream* cfs = stream(); |
2635 u1* sde_buffer = cfs->get_u1_buffer(); | |
2636 assert(sde_buffer != NULL, "null sde buffer"); | |
2637 | |
2638 // Don't bother storing it if there is no way to retrieve it | |
2639 if (JvmtiExport::can_get_source_debug_extension()) { | |
6226 | 2640 assert((length+1) > length, "Overflow checking"); |
2641 u1* sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1); | |
2642 for (int i = 0; i < length; i++) { | |
2643 sde[i] = sde_buffer[i]; | |
2644 } | |
2645 sde[length] = '\0'; | |
2646 set_class_sde_buffer((char*)sde, length); | |
0 | 2647 } |
2648 // Got utf8 string, set stream position forward | |
2649 cfs->skip_u1(length, CHECK); | |
2650 } | |
2651 | |
2652 | |
2653 // Inner classes can be static, private or protected (classic VM does this) | |
2654 #define RECOGNIZED_INNER_CLASS_MODIFIERS (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED | JVM_ACC_STATIC) | |
2655 | |
2656 // 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
|
2657 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
|
2658 bool parsed_enclosingmethod_attribute, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2659 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
|
2660 u2 enclosing_method_method_index, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2661 TRAPS) { |
0 | 2662 ClassFileStream* cfs = stream(); |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2663 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
|
2664 u2 length = 0; |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2665 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
|
2666 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
|
2667 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
|
2668 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
|
2669 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2670 |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2671 // 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
|
2672 // method data: |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2673 // [inner_class_info_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2674 // outer_class_info_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2675 // inner_name_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2676 // inner_class_access_flags, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2677 // ... |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2678 // enclosing_method_class_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2679 // enclosing_method_method_index] |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2680 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
|
2681 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
|
2682 _inner_classes = inner_classes; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2683 |
0 | 2684 int index = 0; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2685 int cp_size = _cp->length(); |
0 | 2686 cfs->guarantee_more(8 * length, CHECK_0); // 4-tuples of u2 |
2687 for (int n = 0; n < length; n++) { | |
2688 // Inner class index | |
2689 u2 inner_class_info_index = cfs->get_u2_fast(); | |
2690 check_property( | |
2691 inner_class_info_index == 0 || | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2692 valid_klass_reference_at(inner_class_info_index), |
0 | 2693 "inner_class_info_index %u has bad constant type in class file %s", |
2694 inner_class_info_index, CHECK_0); | |
2695 // Outer class index | |
2696 u2 outer_class_info_index = cfs->get_u2_fast(); | |
2697 check_property( | |
2698 outer_class_info_index == 0 || | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2699 valid_klass_reference_at(outer_class_info_index), |
0 | 2700 "outer_class_info_index %u has bad constant type in class file %s", |
2701 outer_class_info_index, CHECK_0); | |
2702 // Inner class name | |
2703 u2 inner_name_index = cfs->get_u2_fast(); | |
2704 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2705 inner_name_index == 0 || valid_symbol_at(inner_name_index), |
0 | 2706 "inner_name_index %u has bad constant type in class file %s", |
2707 inner_name_index, CHECK_0); | |
2708 if (_need_verify) { | |
2709 guarantee_property(inner_class_info_index != outer_class_info_index, | |
2710 "Class is both outer and inner class in class file %s", CHECK_0); | |
2711 } | |
2712 // Access flags | |
2713 AccessFlags inner_access_flags; | |
2714 jint flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS; | |
2715 if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { | |
2716 // Set abstract bit for old class files for backward compatibility | |
2717 flags |= JVM_ACC_ABSTRACT; | |
2718 } | |
2719 verify_legal_class_modifiers(flags, CHECK_0); | |
2720 inner_access_flags.set_flags(flags); | |
2721 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2722 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
|
2723 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
|
2724 inner_classes->at_put(index++, inner_name_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2725 inner_classes->at_put(index++, inner_access_flags.as_short()); |
0 | 2726 } |
2727 | |
2728 // 4347400: make sure there's no duplicate entry in the classes array | |
2729 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
|
2730 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
|
2731 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
|
2732 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
|
2733 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
|
2734 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
|
2735 inner_classes->at(i+3) != inner_classes->at(j+3)), |
0 | 2736 "Duplicate entry in InnerClasses in class file %s", |
2737 CHECK_0); | |
2738 } | |
2739 } | |
2740 } | |
2741 | |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2742 // 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
|
2743 if (parsed_enclosingmethod_attribute) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2744 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
|
2745 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
|
2746 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2747 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
|
2748 |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2749 // 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
|
2750 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
|
2751 |
0 | 2752 return length; |
2753 } | |
2754 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2755 void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) { |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2756 set_class_synthetic_flag(true); |
0 | 2757 } |
2758 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2759 void ClassFileParser::parse_classfile_signature_attribute(TRAPS) { |
0 | 2760 ClassFileStream* cfs = stream(); |
2761 u2 signature_index = cfs->get_u2(CHECK); | |
2762 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2763 valid_symbol_at(signature_index), |
0 | 2764 "Invalid constant pool index %u in Signature attribute in class file %s", |
2765 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
|
2766 set_class_generic_signature_index(signature_index); |
0 | 2767 } |
2768 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2769 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
|
2770 ClassFileStream* cfs = stream(); |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2771 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
|
2772 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2773 cfs->guarantee_more(2, CHECK); // length |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2774 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
|
2775 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2776 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
|
2777 "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
|
2778 CHECK); |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2779 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2780 // 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
|
2781 // represending bootstrap specifiers: |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2782 // 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
|
2783 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
|
2784 // 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
|
2785 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2786 // 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
|
2787 // 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
|
2788 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
|
2789 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2790 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
|
2791 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2792 // 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
|
2793 // pool if there is an error. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2794 _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
|
2795 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2796 int operand_fill_index = index_size; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2797 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
|
2798 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2799 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
|
2800 // 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
|
2801 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
|
2802 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2803 // 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
|
2804 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
|
2805 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
|
2806 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
|
2807 check_property( |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2808 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
|
2809 _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
|
2810 "bootstrap_method_index %u has bad constant type in class file %s", |
2085 | 2811 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
|
2812 CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2813 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
|
2814 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
|
2815 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2816 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
|
2817 for (int j = 0; j < argument_count; j++) { |
2085 | 2818 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
|
2819 check_property( |
2085 | 2820 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
|
2821 _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
|
2822 "argument_index %u has bad constant type in class file %s", |
2085 | 2823 argument_index, |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2824 CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2825 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
|
2826 } |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2827 } |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2828 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2829 assert(operand_fill_index == operands->length(), "exact fill"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2830 assert(ConstantPool::operand_array_length(operands) == attribute_array_length, "correct decode"); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2831 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2832 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
|
2833 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
|
2834 "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
|
2835 CHECK); |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2836 } |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2837 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2838 void ClassFileParser::parse_classfile_attributes(ClassFileParser::ClassAnnotationCollector* parsed_annotations, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2839 TRAPS) { |
0 | 2840 ClassFileStream* cfs = stream(); |
2841 // 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
|
2842 _inner_classes = Universe::the_empty_short_array(); |
0 | 2843 cfs->guarantee_more(2, CHECK); // attributes_count |
2844 u2 attributes_count = cfs->get_u2_fast(); | |
2845 bool parsed_sourcefile_attribute = false; | |
2846 bool parsed_innerclasses_attribute = false; | |
2847 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
|
2848 bool parsed_bootstrap_methods_attribute = false; |
0 | 2849 u1* runtime_visible_annotations = NULL; |
2850 int runtime_visible_annotations_length = 0; | |
2851 u1* runtime_invisible_annotations = NULL; | |
2852 int runtime_invisible_annotations_length = 0; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2853 u1* runtime_visible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2854 int runtime_visible_type_annotations_length = 0; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2855 u1* runtime_invisible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2856 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
|
2857 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
|
2858 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
|
2859 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
|
2860 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
|
2861 u2 enclosing_method_method_index = 0; |
0 | 2862 // Iterate over attributes |
2863 while (attributes_count--) { | |
2864 cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length | |
2865 u2 attribute_name_index = cfs->get_u2_fast(); | |
2866 u4 attribute_length = cfs->get_u4_fast(); | |
2867 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2868 valid_symbol_at(attribute_name_index), |
0 | 2869 "Attribute name has bad constant pool index %u in class file %s", |
2870 attribute_name_index, CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2871 Symbol* tag = _cp->symbol_at(attribute_name_index); |
0 | 2872 if (tag == vmSymbols::tag_source_file()) { |
2873 // Check for SourceFile tag | |
2874 if (_need_verify) { | |
2875 guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK); | |
2876 } | |
2877 if (parsed_sourcefile_attribute) { | |
2878 classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK); | |
2879 } else { | |
2880 parsed_sourcefile_attribute = true; | |
2881 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2882 parse_classfile_sourcefile_attribute(CHECK); |
0 | 2883 } else if (tag == vmSymbols::tag_source_debug_extension()) { |
2884 // Check for SourceDebugExtension tag | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2885 parse_classfile_source_debug_extension_attribute((int)attribute_length, CHECK); |
0 | 2886 } else if (tag == vmSymbols::tag_inner_classes()) { |
2887 // Check for InnerClasses tag | |
2888 if (parsed_innerclasses_attribute) { | |
2889 classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK); | |
2890 } else { | |
2891 parsed_innerclasses_attribute = true; | |
2892 } | |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2893 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
|
2894 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
|
2895 cfs->skip_u1(inner_classes_attribute_length, CHECK); |
0 | 2896 } else if (tag == vmSymbols::tag_synthetic()) { |
2897 // Check for Synthetic tag | |
2898 // Shouldn't we check that the synthetic flags wasn't already set? - not required in spec | |
2899 if (attribute_length != 0) { | |
2900 classfile_parse_error( | |
2901 "Invalid Synthetic classfile attribute length %u in class file %s", | |
2902 attribute_length, CHECK); | |
2903 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2904 parse_classfile_synthetic_attribute(CHECK); |
0 | 2905 } else if (tag == vmSymbols::tag_deprecated()) { |
2906 // Check for Deprecatd tag - 4276120 | |
2907 if (attribute_length != 0) { | |
2908 classfile_parse_error( | |
2909 "Invalid Deprecated classfile attribute length %u in class file %s", | |
2910 attribute_length, CHECK); | |
2911 } | |
2912 } else if (_major_version >= JAVA_1_5_VERSION) { | |
2913 if (tag == vmSymbols::tag_signature()) { | |
2914 if (attribute_length != 2) { | |
2915 classfile_parse_error( | |
2916 "Wrong Signature attribute length %u in class file %s", | |
2917 attribute_length, CHECK); | |
2918 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2919 parse_classfile_signature_attribute(CHECK); |
0 | 2920 } else if (tag == vmSymbols::tag_runtime_visible_annotations()) { |
2921 runtime_visible_annotations_length = attribute_length; | |
2922 runtime_visible_annotations = cfs->get_u1_buffer(); | |
2923 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
|
2924 parse_annotations(runtime_visible_annotations, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2925 runtime_visible_annotations_length, |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2926 parsed_annotations, |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2927 CHECK); |
0 | 2928 cfs->skip_u1(runtime_visible_annotations_length, CHECK); |
2929 } else if (PreserveAllAnnotations && tag == vmSymbols::tag_runtime_invisible_annotations()) { | |
2930 runtime_invisible_annotations_length = attribute_length; | |
2931 runtime_invisible_annotations = cfs->get_u1_buffer(); | |
2932 assert(runtime_invisible_annotations != NULL, "null invisible annotations"); | |
2933 cfs->skip_u1(runtime_invisible_annotations_length, CHECK); | |
2934 } else if (tag == vmSymbols::tag_enclosing_method()) { | |
2935 if (parsed_enclosingmethod_attribute) { | |
2936 classfile_parse_error("Multiple EnclosingMethod attributes in class file %s", CHECK); | |
2937 } else { | |
2938 parsed_enclosingmethod_attribute = true; | |
2939 } | |
2940 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
|
2941 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
|
2942 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
|
2943 if (enclosing_method_class_index == 0) { |
0 | 2944 classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK); |
2945 } | |
2946 // 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
|
2947 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
|
2948 "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
|
2949 if (enclosing_method_method_index != 0 && |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2950 (!_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
|
2951 !_cp->tag_at(enclosing_method_method_index).is_name_and_type())) { |
0 | 2952 classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK); |
2953 } | |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2954 } 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
|
2955 _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
|
2956 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
|
2957 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
|
2958 parsed_bootstrap_methods_attribute = true; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2959 parse_classfile_bootstrap_methods_attribute(attribute_length, CHECK); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2960 } 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
|
2961 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
|
2962 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2963 "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
|
2964 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2965 runtime_visible_type_annotations_length = attribute_length; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2966 runtime_visible_type_annotations = cfs->get_u1_buffer(); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2967 assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2968 // No need for the VM to parse Type annotations |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2969 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
|
2970 } 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
|
2971 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
|
2972 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2973 "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
|
2974 } else { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2975 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
|
2976 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2977 if (PreserveAllAnnotations) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2978 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
|
2979 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
|
2980 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
|
2981 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2982 cfs->skip_u1(attribute_length, CHECK); |
0 | 2983 } else { |
2984 // Unknown attribute | |
2985 cfs->skip_u1(attribute_length, CHECK); | |
2986 } | |
2987 } else { | |
2988 // Unknown attribute | |
2989 cfs->skip_u1(attribute_length, CHECK); | |
2990 } | |
2991 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2992 _annotations = assemble_annotations(runtime_visible_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2993 runtime_visible_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2994 runtime_invisible_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2995 runtime_invisible_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2996 CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2997 _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
|
2998 runtime_visible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2999 runtime_invisible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3000 runtime_invisible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3001 CHECK); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
3002 |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3003 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
|
3004 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
|
3005 inner_classes_attribute_start, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3006 parsed_innerclasses_attribute, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3007 enclosing_method_class_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3008 enclosing_method_method_index, |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3009 CHECK); |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3010 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
|
3011 guarantee_property( |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3012 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
|
3013 "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
|
3014 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3015 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3016 |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
3017 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
|
3018 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
|
3019 "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
|
3020 } |
0 | 3021 } |
3022 | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3023 void ClassFileParser::apply_parsed_class_attributes(instanceKlassHandle k) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3024 if (_synthetic_flag) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3025 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
|
3026 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
|
3027 k->set_source_file_name_index(_sourcefile_index); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3028 } |
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
3029 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
|
3030 k->set_generic_signature_index(_generic_signature_index); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3031 } |
6226 | 3032 if (_sde_buffer != NULL) { |
3033 k->set_source_debug_extension(_sde_buffer, _sde_length); | |
3034 } | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3035 } |
0 | 3036 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3037 // Transfer ownership of metadata allocated to the InstanceKlass. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3038 void ClassFileParser::apply_parsed_class_metadata( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3039 instanceKlassHandle this_klass, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3040 int java_fields_count, TRAPS) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3041 // Assign annotations if needed |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3042 if (_annotations != NULL || _type_annotations != NULL || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3043 _fields_annotations != NULL || _fields_type_annotations != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3044 Annotations* annotations = Annotations::allocate(_loader_data, CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3045 annotations->set_class_annotations(_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3046 annotations->set_class_type_annotations(_type_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3047 annotations->set_fields_annotations(_fields_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3048 annotations->set_fields_type_annotations(_fields_type_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3049 this_klass->set_annotations(annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3050 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3051 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3052 _cp->set_pool_holder(this_klass()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3053 this_klass->set_constants(_cp); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3054 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
|
3055 this_klass->set_methods(_methods); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3056 this_klass->set_inner_classes(_inner_classes); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3057 this_klass->set_local_interfaces(_local_interfaces); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3058 this_klass->set_transitive_interfaces(_transitive_interfaces); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3059 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3060 // 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
|
3061 clear_class_metadata(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3062 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3063 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3064 AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annotations, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3065 int runtime_visible_annotations_length, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3066 u1* runtime_invisible_annotations, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3067 int runtime_invisible_annotations_length, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3068 AnnotationArray* annotations = NULL; |
0 | 3069 if (runtime_visible_annotations != NULL || |
3070 runtime_invisible_annotations != NULL) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3071 annotations = MetadataFactory::new_array<u1>(_loader_data, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3072 runtime_visible_annotations_length + |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3073 runtime_invisible_annotations_length, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3074 CHECK_(annotations)); |
0 | 3075 if (runtime_visible_annotations != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3076 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
|
3077 annotations->at_put(i, runtime_visible_annotations[i]); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3078 } |
0 | 3079 } |
3080 if (runtime_invisible_annotations != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3081 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
|
3082 int append = runtime_visible_annotations_length+i; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3083 annotations->at_put(append, runtime_invisible_annotations[i]); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3084 } |
0 | 3085 } |
3086 } | |
3087 return annotations; | |
3088 } | |
3089 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3090 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
|
3091 TRAPS) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3092 instanceKlassHandle super_klass; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3093 if (super_class_index == 0) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3094 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
|
3095 "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
|
3096 super_class_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3097 CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3098 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3099 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
|
3100 "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
|
3101 super_class_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3102 CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3103 // 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
|
3104 // 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
|
3105 bool is_array = false; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3106 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
|
3107 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
|
3108 if (_need_verify) |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3109 is_array = super_klass->oop_is_array(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3110 } else if (_need_verify) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3111 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
|
3112 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3113 if (_need_verify) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3114 guarantee_property(!is_array, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3115 "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
|
3116 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3117 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3118 return super_klass; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3119 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3120 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3121 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3122 // Values needed for oopmap and InstanceKlass creation |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3123 class FieldLayoutInfo : public StackObj { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3124 public: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3125 int* nonstatic_oop_offsets; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3126 unsigned int* nonstatic_oop_counts; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3127 unsigned int nonstatic_oop_map_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3128 unsigned int total_oop_map_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3129 int instance_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3130 int nonstatic_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3131 int static_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3132 bool has_nonstatic_fields; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3133 }; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3134 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3135 // 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
|
3136 void ClassFileParser::layout_fields(Handle class_loader, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3137 FieldAllocationCount* fac, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3138 ClassAnnotationCollector* parsed_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3139 FieldLayoutInfo* info, |
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 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3142 // Field size and offset computation |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3143 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
|
3144 int next_static_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3145 int next_static_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3146 int next_static_word_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3147 int next_static_short_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3148 int next_static_byte_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3149 int next_nonstatic_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3150 int next_nonstatic_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3151 int next_nonstatic_word_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3152 int next_nonstatic_short_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3153 int next_nonstatic_byte_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3154 int first_nonstatic_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3155 int next_nonstatic_field_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3156 int next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3157 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3158 // Count the contended fields by type. |
10314 | 3159 // |
3160 // We ignore static fields, because @Contended is not supported for them. | |
3161 // 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
|
3162 int nonstatic_contended_count = 0; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3163 FieldAllocationCount fac_contended; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3164 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
|
3165 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3166 if (fs.is_contended()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3167 fac_contended.count[atype]++; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3168 if (!fs.access_flags().is_static()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3169 nonstatic_contended_count++; |
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 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3172 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3173 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3174 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3175 // Calculate the starting byte offsets |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3176 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
|
3177 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
|
3178 ((fac->count[STATIC_OOP]) * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3179 if ( fac->count[STATIC_DOUBLE] && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3180 (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
|
3181 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
|
3182 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
|
3183 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3184 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3185 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
|
3186 ((fac->count[STATIC_DOUBLE]) * BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3187 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
|
3188 ((fac->count[STATIC_WORD]) * BytesPerInt); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3189 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
|
3190 ((fac->count[STATIC_SHORT]) * BytesPerShort); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3191 |
10314 | 3192 int nonstatic_fields_start = instanceOopDesc::base_offset_in_bytes() + |
3193 nonstatic_field_size * heapOopSize; | |
3194 | |
3195 next_nonstatic_field_offset = nonstatic_fields_start; | |
3196 | |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3197 bool is_contended_class = parsed_annotations->is_contended(); |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3198 |
10314 | 3199 // Class is contended, pad before all the fields |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3200 if (is_contended_class) { |
10314 | 3201 next_nonstatic_field_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3202 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3203 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3204 // Compute the non-contended fields count. |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3205 // 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
|
3206 // 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
|
3207 // exempt from that. |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3208 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
|
3209 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
|
3210 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
|
3211 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
|
3212 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
|
3213 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3214 // Total non-static fields count, including every contended field |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3215 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
|
3216 fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] + |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3217 fac->count[NONSTATIC_OOP]; |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3218 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3219 bool super_has_nonstatic_fields = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3220 (_super_klass() != NULL && _super_klass->has_nonstatic_fields()); |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3221 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
|
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 // Prepare list of oops for oop map generation. |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3225 // |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3226 // "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
|
3227 // 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
|
3228 // 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
|
3229 // 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
|
3230 // distinct regions. |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3231 // |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3232 // 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
|
3233 // 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
|
3234 int* nonstatic_oop_offsets; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3235 unsigned int* nonstatic_oop_counts; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3236 unsigned int nonstatic_oop_map_count = 0; |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3237 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
|
3238 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3239 nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD( |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3240 THREAD, int, max_nonstatic_oop_maps); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3241 nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD( |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3242 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
|
3243 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3244 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
|
3245 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3246 bool compact_fields = CompactFields; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3247 int allocation_style = FieldsAllocationStyle; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3248 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
|
3249 assert(false, "0 <= FieldsAllocationStyle <= 2"); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3250 allocation_style = 1; // Optimistic |
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 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3253 // 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
|
3254 // (see in JavaClasses::compute_hard_coded_offsets()). |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3255 // Use default fields allocation order for them. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3256 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
|
3257 (_class_name == vmSymbols::java_lang_AssertionStatusDirectives() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3258 _class_name == vmSymbols::java_lang_Class() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3259 _class_name == vmSymbols::java_lang_ClassLoader() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3260 _class_name == vmSymbols::java_lang_ref_Reference() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3261 _class_name == vmSymbols::java_lang_ref_SoftReference() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3262 _class_name == vmSymbols::java_lang_StackTraceElement() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3263 _class_name == vmSymbols::java_lang_String() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3264 _class_name == vmSymbols::java_lang_Throwable() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3265 _class_name == vmSymbols::java_lang_Boolean() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3266 _class_name == vmSymbols::java_lang_Character() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3267 _class_name == vmSymbols::java_lang_Float() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3268 _class_name == vmSymbols::java_lang_Double() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3269 _class_name == vmSymbols::java_lang_Byte() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3270 _class_name == vmSymbols::java_lang_Short() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3271 _class_name == vmSymbols::java_lang_Integer() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3272 _class_name == vmSymbols::java_lang_Long())) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3273 allocation_style = 0; // Allocate oops first |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3274 compact_fields = false; // Don't compact fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3275 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3276 |
10314 | 3277 // 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
|
3278 if( allocation_style == 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3279 // 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
|
3280 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
|
3281 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
|
3282 (nonstatic_oop_count * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3283 } else if( allocation_style == 1 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3284 // 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
|
3285 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
|
3286 } else if( allocation_style == 2 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3287 // 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
|
3288 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
|
3289 _super_klass->nonstatic_oop_map_size() > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3290 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
|
3291 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
|
3292 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
|
3293 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
|
3294 if (next_offset == next_nonstatic_field_offset) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3295 allocation_style = 0; // allocate oops first |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3296 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
|
3297 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
|
3298 (nonstatic_oop_count * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3299 } |
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 if( allocation_style == 2 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3302 allocation_style = 1; // allocate oops last |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3303 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
|
3304 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3305 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3306 ShouldNotReachHere(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3307 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3308 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3309 int nonstatic_oop_space_count = 0; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3310 int nonstatic_word_space_count = 0; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3311 int nonstatic_short_space_count = 0; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3312 int nonstatic_byte_space_count = 0; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3313 int nonstatic_oop_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3314 int nonstatic_word_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3315 int nonstatic_short_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3316 int nonstatic_byte_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3317 |
10314 | 3318 // Try to squeeze some of the fields into the gaps due to |
3319 // long/double alignment. | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3320 if( nonstatic_double_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3321 int offset = next_nonstatic_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3322 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
|
3323 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
|
3324 // 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
|
3325 int length = next_nonstatic_double_offset - offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3326 assert(length == BytesPerInt, ""); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3327 nonstatic_word_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3328 if( nonstatic_word_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3329 nonstatic_word_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3330 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
|
3331 length -= BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3332 offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3333 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3334 nonstatic_short_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3335 while( length >= BytesPerShort && nonstatic_short_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3336 nonstatic_short_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3337 nonstatic_short_space_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3338 length -= BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3339 offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3340 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3341 nonstatic_byte_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3342 while( length > 0 && nonstatic_byte_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3343 nonstatic_byte_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3344 nonstatic_byte_space_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3345 length -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3346 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3347 // 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
|
3348 nonstatic_oop_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3349 if( length >= heapOopSize && nonstatic_oop_count > 0 && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3350 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
|
3351 nonstatic_oop_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3352 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
|
3353 length -= heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3354 offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3355 } |
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 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3359 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
|
3360 (nonstatic_double_count * BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3361 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
|
3362 (nonstatic_word_count * BytesPerInt); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3363 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
|
3364 (nonstatic_short_count * BytesPerShort); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3365 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
|
3366 nonstatic_byte_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3367 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3368 // 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
|
3369 if( allocation_style == 1 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3370 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
|
3371 if( nonstatic_oop_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3372 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
|
3373 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3374 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
|
3375 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3376 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3377 // 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
|
3378 // 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
|
3379 // 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
|
3380 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
|
3381 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3382 // skip already laid out fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3383 if (fs.is_offset_set()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3384 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3385 // contended instance fields are handled below |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3386 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
|
3387 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3388 int real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3389 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3390 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3391 // pack the rest of the fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3392 switch (atype) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3393 case STATIC_OOP: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3394 real_offset = next_static_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3395 next_static_oop_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3396 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3397 case STATIC_BYTE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3398 real_offset = next_static_byte_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3399 next_static_byte_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3400 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3401 case STATIC_SHORT: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3402 real_offset = next_static_short_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3403 next_static_short_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3404 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3405 case STATIC_WORD: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3406 real_offset = next_static_word_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3407 next_static_word_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3408 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3409 case STATIC_DOUBLE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3410 real_offset = next_static_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3411 next_static_double_offset += BytesPerLong; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3412 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3413 case NONSTATIC_OOP: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3414 if( nonstatic_oop_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3415 real_offset = nonstatic_oop_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3416 nonstatic_oop_space_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3417 nonstatic_oop_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3418 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3419 real_offset = next_nonstatic_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3420 next_nonstatic_oop_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3421 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3422 // Update oop maps |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3423 if( nonstatic_oop_map_count > 0 && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3424 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
|
3425 real_offset - |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3426 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
|
3427 heapOopSize ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3428 // Extend current oop map |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3429 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
|
3430 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
|
3431 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3432 // Create new oop map |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3433 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
|
3434 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
|
3435 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
|
3436 nonstatic_oop_map_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3437 if( first_nonstatic_oop_offset == 0 ) { // Undefined |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3438 first_nonstatic_oop_offset = real_offset; |
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 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3441 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3442 case NONSTATIC_BYTE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3443 if( nonstatic_byte_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3444 real_offset = nonstatic_byte_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3445 nonstatic_byte_space_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3446 nonstatic_byte_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3447 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3448 real_offset = next_nonstatic_byte_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3449 next_nonstatic_byte_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3450 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3451 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3452 case NONSTATIC_SHORT: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3453 if( nonstatic_short_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3454 real_offset = nonstatic_short_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3455 nonstatic_short_space_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3456 nonstatic_short_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3457 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3458 real_offset = next_nonstatic_short_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3459 next_nonstatic_short_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3460 } |
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_WORD: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3463 if( nonstatic_word_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3464 real_offset = nonstatic_word_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3465 nonstatic_word_space_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3466 nonstatic_word_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_word_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3469 next_nonstatic_word_offset += BytesPerInt; |
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 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3472 case NONSTATIC_DOUBLE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3473 real_offset = next_nonstatic_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3474 next_nonstatic_double_offset += BytesPerLong; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3475 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3476 default: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3477 ShouldNotReachHere(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3478 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3479 fs.set_offset(real_offset); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3480 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3481 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3482 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3483 // Handle the contended cases. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3484 // |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3485 // 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
|
3486 // 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
|
3487 // the fields with full-width padding. |
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 // 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
|
3490 // for each field. |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3491 if (nonstatic_contended_count > 0) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3492 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3493 // 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
|
3494 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3495 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3496 // collect all contended groups |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3497 BitMap bm(_cp->size()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3498 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
|
3499 // skip already laid out fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3500 if (fs.is_offset_set()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3501 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3502 if (fs.is_contended()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3503 bm.set_bit(fs.contended_group()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3504 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3505 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3506 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3507 int current_group = -1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3508 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
|
3509 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3510 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
|
3511 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3512 // skip already laid out fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3513 if (fs.is_offset_set()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3514 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3515 // 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
|
3516 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
|
3517 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3518 // handle statics below |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3519 if (fs.access_flags().is_static()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3520 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3521 int real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3522 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3523 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3524 switch (atype) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3525 case NONSTATIC_BYTE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3526 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
|
3527 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3528 next_nonstatic_padded_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3529 break; |
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 case NONSTATIC_SHORT: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3532 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
|
3533 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3534 next_nonstatic_padded_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3535 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3536 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3537 case NONSTATIC_WORD: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3538 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
|
3539 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3540 next_nonstatic_padded_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3541 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3542 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3543 case NONSTATIC_DOUBLE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3544 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
|
3545 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3546 next_nonstatic_padded_offset += BytesPerLong; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3547 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3548 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3549 case NONSTATIC_OOP: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3550 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
|
3551 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3552 next_nonstatic_padded_offset += heapOopSize; |
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 // Create new oop map |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3555 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
|
3556 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
|
3557 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
|
3558 nonstatic_oop_map_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3559 if( first_nonstatic_oop_offset == 0 ) { // Undefined |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3560 first_nonstatic_oop_offset = real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3561 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3562 break; |
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 default: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3565 ShouldNotReachHere(); |
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 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3568 if (fs.contended_group() == 0) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3569 // 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
|
3570 // 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
|
3571 // 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
|
3572 // equivalence, and so requires intra-padding. |
10314 | 3573 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3574 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3575 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3576 fs.set_offset(real_offset); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3577 } // for |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3578 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3579 // Start laying out the next group. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3580 // 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
|
3581 // 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
|
3582 // subclass fields and/or adjacent object. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3583 // 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
|
3584 if (current_group != 0) { |
10314 | 3585 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3586 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3587 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3588 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3589 // handle static fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3590 } |
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 // 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
|
3593 // 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
|
3594 // and/or adjacent object. |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3595 if (is_contended_class) { |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3596 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
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 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3599 int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset; |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3600 |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3601 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
|
3602 int instance_end = align_size_up(notaligned_nonstatic_fields_end, wordSize); |
10314 | 3603 int static_fields_end = align_size_up(next_static_byte_offset, wordSize); |
3604 | |
3605 int static_field_size = (static_fields_end - | |
3606 InstanceMirrorKlass::offset_of_static_fields()) / wordSize; | |
3607 nonstatic_field_size = nonstatic_field_size + | |
3608 (nonstatic_fields_end - nonstatic_fields_start) / heapOopSize; | |
3609 | |
3610 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
|
3611 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3612 assert(instance_size == align_object_size(align_size_up( |
10303
205dd30230e1
8012939: @Contended doesn't work correctly with inheritance
shade
parents:
10269
diff
changeset
|
3613 (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
|
3614 wordSize) / wordSize), "consistent layout helper value"); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3615 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3616 // 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
|
3617 // 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
|
3618 // 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
|
3619 // assert without actually having the fields. |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3620 assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) || |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3621 is_contended_class || |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3622 (nonstatic_fields_count > 0), "double-check nonstatic start/end"); |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3623 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3624 // 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
|
3625 const unsigned int total_oop_map_count = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3626 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
|
3627 first_nonstatic_oop_offset); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3628 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3629 #ifndef PRODUCT |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3630 if (PrintFieldLayout) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3631 print_field_layout(_class_name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3632 _fields, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3633 _cp, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3634 instance_size, |
10314 | 3635 nonstatic_fields_start, |
3636 nonstatic_fields_end, | |
3637 static_fields_end); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3638 } |
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 #endif |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3641 // Pass back information needed for InstanceKlass creation |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3642 info->nonstatic_oop_offsets = nonstatic_oop_offsets; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3643 info->nonstatic_oop_counts = nonstatic_oop_counts; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3644 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
|
3645 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
|
3646 info->instance_size = instance_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3647 info->static_field_size = static_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3648 info->nonstatic_field_size = nonstatic_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3649 info->has_nonstatic_fields = has_nonstatic_fields; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3650 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3651 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3652 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3653 instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
3654 ClassLoaderData* loader_data, |
0 | 3655 Handle protection_domain, |
710 | 3656 KlassHandle host_klass, |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3657 GrowableArray<Handle>* cp_patches, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3658 TempNewSymbol& parsed_name, |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
879
diff
changeset
|
3659 bool verify, |
0 | 3660 TRAPS) { |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
3661 |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3662 // When a retransformable agent is attached, JVMTI caches the |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3663 // class bytes that existed before the first retransformation. |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3664 // If RedefineClasses() was used before the retransformable |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3665 // agent attached, then the cached class bytes may not be the |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3666 // original class bytes. |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
3667 JvmtiCachedClassFileData *cached_class_file = NULL; |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
3668 Handle class_loader(THREAD, loader_data->class_loader()); |
6934 | 3669 bool has_default_methods = false; |
3670 ResourceMark rm(THREAD); | |
0 | 3671 |
3672 ClassFileStream* cfs = stream(); | |
3673 // Timing | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3674 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
|
3675 JavaThread* jt = (JavaThread*) THREAD; |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3676 |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3677 PerfClassTraceTime ctimer(ClassLoader::perf_class_parse_time(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3678 ClassLoader::perf_class_parse_selftime(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3679 NULL, |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3680 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
|
3681 jt->get_thread_stat()->perf_timers_addr(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3682 PerfClassTraceTime::PARSE_CLASS); |
0 | 3683 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3684 init_parsed_class_attributes(loader_data); |
0 | 3685 |
3686 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
|
3687 // 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
|
3688 // 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
|
3689 // 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
|
3690 // 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
|
3691 // avoid the bug described by 7126851. |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3692 JvmtiThreadState *state = jt->jvmti_thread_state(); |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3693 if (state != NULL) { |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3694 KlassHandle *h_class_being_redefined = |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3695 state->get_class_being_redefined(); |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3696 if (h_class_being_redefined != NULL) { |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3697 instanceKlassHandle ikh_class_being_redefined = |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3698 instanceKlassHandle(THREAD, (*h_class_being_redefined)()); |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
3699 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
|
3700 } |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3701 } |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3702 |
0 | 3703 unsigned char* ptr = cfs->buffer(); |
3704 unsigned char* end_ptr = cfs->buffer() + cfs->length(); | |
3705 | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
3706 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
|
3707 &ptr, &end_ptr, &cached_class_file); |
0 | 3708 |
3709 if (ptr != cfs->buffer()) { | |
3710 // JVMTI agent has modified class file data. | |
3711 // Set new class file stream using JVMTI agent modified | |
3712 // class file data. | |
3713 cfs = new ClassFileStream(ptr, end_ptr - ptr, cfs->source()); | |
3714 set_stream(cfs); | |
3715 } | |
3716 } | |
3717 | |
710 | 3718 _host_klass = host_klass; |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3719 _cp_patches = cp_patches; |
0 | 3720 |
3721 instanceKlassHandle nullHandle; | |
3722 | |
3723 // Figure out whether we can skip format checking (matching classic VM behavior) | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
879
diff
changeset
|
3724 _need_verify = Verifier::should_verify_for(class_loader(), verify); |
0 | 3725 |
3726 // Set the verify flag in stream | |
3727 cfs->set_verify(_need_verify); | |
3728 | |
3729 // 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
|
3730 _class_name = (name != NULL) ? name : vmSymbols::unknown_class_name(); |
0 | 3731 |
3732 cfs->guarantee_more(8, CHECK_(nullHandle)); // magic, major, minor | |
3733 // Magic value | |
3734 u4 magic = cfs->get_u4_fast(); | |
3735 guarantee_property(magic == JAVA_CLASSFILE_MAGIC, | |
3736 "Incompatible magic value %u in class file %s", | |
3737 magic, CHECK_(nullHandle)); | |
3738 | |
3739 // Version numbers | |
3740 u2 minor_version = cfs->get_u2_fast(); | |
3741 u2 major_version = cfs->get_u2_fast(); | |
3742 | |
3743 // Check version numbers - we check this even with verifier off | |
3744 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
|
3745 if (name == NULL) { |
0 | 3746 Exceptions::fthrow( |
3747 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3748 vmSymbols::java_lang_UnsupportedClassVersionError(), |
14335
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3749 "Unsupported class file version %u.%u, " |
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3750 "this version of the Java Runtime only recognizes class file versions up to %u.%u", |
0 | 3751 major_version, |
14335
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3752 minor_version, |
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3753 JAVA_MAX_SUPPORTED_VERSION, |
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3754 JAVA_MAX_SUPPORTED_MINOR_VERSION); |
0 | 3755 } else { |
3756 ResourceMark rm(THREAD); | |
3757 Exceptions::fthrow( | |
3758 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3759 vmSymbols::java_lang_UnsupportedClassVersionError(), |
14335
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3760 "%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), " |
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3761 "this version of the Java Runtime only recognizes class file versions up to %u.%u", |
0 | 3762 name->as_C_string(), |
3763 major_version, | |
14335
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3764 minor_version, |
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3765 JAVA_MAX_SUPPORTED_VERSION, |
4802ce6fbff6
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
14292
diff
changeset
|
3766 JAVA_MAX_SUPPORTED_MINOR_VERSION); |
0 | 3767 } |
3768 return nullHandle; | |
3769 } | |
3770 | |
3771 _major_version = major_version; | |
3772 _minor_version = minor_version; | |
3773 | |
3774 | |
3775 // Check if verification needs to be relaxed for this class file | |
3776 // Do not restrict it to jdk1.0 or jdk1.1 to maintain backward compatibility (4982376) | |
3777 _relax_verify = Verifier::relax_verify_for(class_loader()); | |
3778 | |
3779 // Constant pool | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3780 constantPoolHandle cp = parse_constant_pool(CHECK_(nullHandle)); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3781 |
0 | 3782 int cp_size = cp->length(); |
3783 | |
3784 cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len | |
3785 | |
3786 // Access flags | |
3787 AccessFlags access_flags; | |
3788 jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS; | |
3789 | |
3790 if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { | |
3791 // Set abstract bit for old class files for backward compatibility | |
3792 flags |= JVM_ACC_ABSTRACT; | |
3793 } | |
3794 verify_legal_class_modifiers(flags, CHECK_(nullHandle)); | |
3795 access_flags.set_flags(flags); | |
3796 | |
3797 // This class and superclass | |
3798 u2 this_class_index = cfs->get_u2_fast(); | |
3799 check_property( | |
3800 valid_cp_range(this_class_index, cp_size) && | |
3801 cp->tag_at(this_class_index).is_unresolved_klass(), | |
3802 "Invalid this class index %u in constant pool in class file %s", | |
3803 this_class_index, CHECK_(nullHandle)); | |
3804 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3805 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
|
3806 assert(class_name != NULL, "class_name can't be null"); |
0 | 3807 |
3808 // It's important to set parsed_name *before* resolving the super class. | |
3809 // (it's used for cleanup by the caller if parsing fails) | |
3810 parsed_name = class_name; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3811 // 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
|
3812 // its reference count. Caller will decrement the refcount. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3813 parsed_name->increment_refcount(); |
0 | 3814 |
3815 // Update _class_name which could be null previously to be class_name | |
3816 _class_name = class_name; | |
3817 | |
3818 // Don't need to check whether this class name is legal or not. | |
3819 // It has been checked when constant pool is parsed. | |
3820 // However, make sure it is not an array type. | |
3821 if (_need_verify) { | |
3822 guarantee_property(class_name->byte_at(0) != JVM_SIGNATURE_ARRAY, | |
3823 "Bad class name in class file %s", | |
3824 CHECK_(nullHandle)); | |
3825 } | |
3826 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3827 Klass* preserve_this_klass; // for storing result across HandleMark |
0 | 3828 |
3829 // release all handles when parsing is done | |
3830 { HandleMark hm(THREAD); | |
3831 | |
3832 // 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
|
3833 if (name != NULL && class_name != name) { |
0 | 3834 ResourceMark rm(THREAD); |
3835 Exceptions::fthrow( | |
3836 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3837 vmSymbols::java_lang_NoClassDefFoundError(), |
0 | 3838 "%s (wrong name: %s)", |
3839 name->as_C_string(), | |
3840 class_name->as_C_string() | |
3841 ); | |
3842 return nullHandle; | |
3843 } | |
3844 | |
3845 if (TraceClassLoadingPreorder) { | |
10128
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
3846 tty->print("[Loading %s", (name != NULL) ? name->as_klass_external_name() : "NoName"); |
0 | 3847 if (cfs->source() != NULL) tty->print(" from %s", cfs->source()); |
3848 tty->print_cr("]"); | |
3849 } | |
3850 | |
3851 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
|
3852 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
|
3853 CHECK_NULL); |
0 | 3854 |
3855 // Interfaces | |
3856 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
|
3857 Array<Klass*>* local_interfaces = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3858 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
|
3859 &has_default_methods, CHECK_(nullHandle)); |
0 | 3860 |
4744
cd5d8cafcc84
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
3938
diff
changeset
|
3861 u2 java_fields_count = 0; |
0 | 3862 // Fields (offsets are filled in later) |
3938 | 3863 FieldAllocationCount fac; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3864 Array<u2>* fields = parse_fields(class_name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3865 access_flags.is_interface(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3866 &fac, &java_fields_count, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3867 CHECK_(nullHandle)); |
0 | 3868 // Methods |
3869 bool has_final_method = false; | |
3870 AccessFlags promoted_flags; | |
3871 promoted_flags.set_flags(0); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3872 Array<Method*>* methods = parse_methods(access_flags.is_interface(), |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3873 &promoted_flags, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3874 &has_final_method, |
6934 | 3875 &has_default_methods, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3876 CHECK_(nullHandle)); |
0 | 3877 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3878 // Additional attributes |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3879 ClassAnnotationCollector parsed_annotations; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3880 parse_classfile_attributes(&parsed_annotations, CHECK_(nullHandle)); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3881 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3882 // Make sure this is the end of class file stream |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3883 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
|
3884 |
0 | 3885 // 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
|
3886 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
|
3887 Symbol* sk = cp->klass_name_at(super_class_index); |
0 | 3888 if (access_flags.is_interface()) { |
3889 // Before attempting to resolve the superclass, check for class format | |
3890 // errors not checked yet. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3891 guarantee_property(sk == vmSymbols::java_lang_Object(), |
0 | 3892 "Interfaces must have java.lang.Object as superclass in class file %s", |
3893 CHECK_(nullHandle)); | |
3894 } | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3895 Klass* k = SystemDictionary::resolve_super_or_fail(class_name, sk, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3896 class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3897 protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3898 true, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3899 CHECK_(nullHandle)); |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3900 |
0 | 3901 KlassHandle kh (THREAD, k); |
3902 super_klass = instanceKlassHandle(THREAD, kh()); | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3903 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3904 if (super_klass.not_null()) { |
6934 | 3905 |
3906 if (super_klass->has_default_methods()) { | |
3907 has_default_methods = true; | |
3908 } | |
3909 | |
0 | 3910 if (super_klass->is_interface()) { |
3911 ResourceMark rm(THREAD); | |
3912 Exceptions::fthrow( | |
3913 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3914 vmSymbols::java_lang_IncompatibleClassChangeError(), |
0 | 3915 "class %s has interface %s as super class", |
3916 class_name->as_klass_external_name(), | |
3917 super_klass->external_name() | |
3918 ); | |
3919 return nullHandle; | |
3920 } | |
3921 // Make sure super class is not final | |
3922 if (super_klass->is_final()) { | |
3923 THROW_MSG_(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class", nullHandle); | |
3924 } | |
3925 } | |
3926 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3927 // save super klass for error handling. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3928 _super_klass = super_klass; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3929 |
0 | 3930 // 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
|
3931 _transitive_interfaces = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3932 compute_transitive_interfaces(super_klass, local_interfaces, CHECK_(nullHandle)); |
0 | 3933 |
3934 // sort methods | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3935 intArray* method_ordering = sort_methods(methods); |
0 | 3936 |
3937 // promote flags from parse_methods() to the klass' flags | |
3938 access_flags.add_promoted_flags(promoted_flags.as_int()); | |
3939 | |
3940 // Size of Java vtable (in words) | |
3941 int vtable_size = 0; | |
3942 int itable_size = 0; | |
3943 int num_miranda_methods = 0; | |
3944 | |
6934 | 3945 GrowableArray<Method*> all_mirandas(20); |
3946 | |
3947 klassVtable::compute_vtable_size_and_num_mirandas( | |
3948 &vtable_size, &num_miranda_methods, &all_mirandas, super_klass(), methods, | |
3949 access_flags, class_loader, class_name, local_interfaces, | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
579
diff
changeset
|
3950 CHECK_(nullHandle)); |
0 | 3951 |
3952 // Size of Java itable (in words) | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3953 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
|
3954 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3955 FieldLayoutInfo info; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3956 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
|
3957 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3958 int total_oop_map_size2 = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3959 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
|
3960 |
0 | 3961 // Compute reference type |
3962 ReferenceType rt; | |
3963 if (super_klass() == NULL) { | |
3964 rt = REF_NONE; | |
3965 } else { | |
3966 rt = super_klass->reference_type(); | |
3967 } | |
3968 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3969 // 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
|
3970 _klass = InstanceKlass::allocate_instance_klass(loader_data, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3971 vtable_size, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3972 itable_size, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3973 info.static_field_size, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3974 total_oop_map_size2, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3975 rt, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3976 access_flags, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3977 name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3978 super_klass(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3979 !host_klass.is_null(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3980 CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3981 instanceKlassHandle this_klass (THREAD, _klass); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3982 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3983 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
|
3984 assert(this_klass->nonstatic_oop_map_count() == info.total_oop_map_count, |
938 | 3985 "sanity"); |
0 | 3986 |
3987 // Fill in information already parsed | |
975 | 3988 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
|
3989 jint lh = Klass::instance_layout_helper(info.instance_size, false); |
0 | 3990 this_klass->set_layout_helper(lh); |
3991 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
|
3992 assert(this_klass->size_helper() == info.instance_size, "correct size_helper"); |
0 | 3993 // Not yet: supers are done below to support the new subtype-checking fields |
3994 //this_klass->set_super(super_klass()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3995 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
|
3996 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
|
3997 this_klass->set_has_nonstatic_fields(info.has_nonstatic_fields); |
3938 | 3998 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
|
3999 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4000 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
|
4001 |
0 | 4002 if (has_final_method) { |
4003 this_klass->set_has_final_method(); | |
4004 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4005 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
|
4006 // 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
|
4007 // 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
|
4008 // 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
|
4009 // 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
|
4010 // has to be changed accordingly. |
0 | 4011 this_klass->set_initial_method_idnum(methods->length()); |
4012 this_klass->set_name(cp->klass_name_at(this_class_index)); | |
6852 | 4013 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
|
4014 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
|
4015 |
0 | 4016 this_klass->set_minor_version(minor_version); |
4017 this_klass->set_major_version(major_version); | |
6934 | 4018 this_klass->set_has_default_methods(has_default_methods); |
0 | 4019 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4020 // 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
|
4021 // (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
|
4022 // 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
|
4023 // when everything is fresh in memory.) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4024 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
|
4025 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
|
4026 methods->at(j)->init_intrinsic_id(); |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4027 } |
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4028 } |
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4029 |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
4030 if (cached_class_file != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4031 // 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
|
4032 this_klass->set_cached_class_file(cached_class_file); |
0 | 4033 } |
4034 | |
6934 | 4035 // Fill in field values obtained by parse_classfile_attributes |
4036 if (parsed_annotations.has_any_annotations()) | |
4037 parsed_annotations.apply_to(this_klass); | |
4038 apply_parsed_class_attributes(this_klass); | |
4039 | |
0 | 4040 // Miranda methods |
4041 if ((num_miranda_methods > 0) || | |
4042 // if this class introduced new miranda methods or | |
4043 (super_klass.not_null() && (super_klass->has_miranda_methods())) | |
4044 // super class exists and this class inherited miranda methods | |
4045 ) { | |
4046 this_klass->set_has_miranda_methods(); // then set a flag | |
4047 } | |
4048 | |
4049 // Fill in information needed to compute superclasses. | |
4050 this_klass->initialize_supers(super_klass(), CHECK_(nullHandle)); | |
4051 | |
4052 // Initialize itable offset tables | |
4053 klassItable::setup_itable_offset_table(this_klass); | |
4054 | |
6934 | 4055 // Compute transitive closure of interfaces this class implements |
0 | 4056 // Do final class setup |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4057 fill_oop_maps(this_klass, info.nonstatic_oop_map_count, info.nonstatic_oop_offsets, info.nonstatic_oop_counts); |
0 | 4058 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
4059 // Fill in has_finalizer, has_vanilla_constructor, and layout_helper |
0 | 4060 set_precomputed_flags(this_klass); |
4061 | |
4062 // reinitialize modifiers, using the InnerClasses attribute | |
4063 int computed_modifiers = this_klass->compute_modifier_flags(CHECK_(nullHandle)); | |
4064 this_klass->set_modifier_flags(computed_modifiers); | |
4065 | |
4066 // check if this class can access its super class | |
4067 check_super_class_access(this_klass, CHECK_(nullHandle)); | |
4068 | |
4069 // check if this class can access its superinterfaces | |
4070 check_super_interface_access(this_klass, CHECK_(nullHandle)); | |
4071 | |
4072 // check if this class overrides any final method | |
4073 check_final_method_override(this_klass, CHECK_(nullHandle)); | |
4074 | |
4075 // check that if this class is an interface then it doesn't have static methods | |
4076 if (this_klass->is_interface()) { | |
7579
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4077 /* An interface in a JAVA 8 classfile can be static */ |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4078 if (_major_version < JAVA_8_VERSION) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4079 check_illegal_static_method(this_klass, CHECK_(nullHandle)); |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4080 } |
0 | 4081 } |
4082 | |
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10340
diff
changeset
|
4083 // Allocate mirror and initialize static fields |
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10340
diff
changeset
|
4084 java_lang_Class::create_mirror(this_klass, protection_domain, CHECK_(nullHandle)); |
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10340
diff
changeset
|
4085 |
6934 | 4086 |
4087 // Generate any default methods - default methods are interface methods | |
4088 // 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
|
4089 if (has_default_methods ) { |
6934 | 4090 DefaultMethods::generate_default_methods( |
4091 this_klass(), &all_mirandas, CHECK_(nullHandle)); | |
4092 } | |
4093 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4094 // Update the loader_data graph. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4095 record_defined_class_dependencies(this_klass, CHECK_NULL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4096 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4097 ClassLoadingService::notify_class_loaded(InstanceKlass::cast(this_klass()), |
0 | 4098 false /* not shared class */); |
4099 | |
4100 if (TraceClassLoading) { | |
6934 | 4101 ResourceMark rm; |
0 | 4102 // print in a single call to reduce interleaving of output |
4103 if (cfs->source() != NULL) { | |
4104 tty->print("[Loaded %s from %s]\n", this_klass->external_name(), | |
4105 cfs->source()); | |
4106 } else if (class_loader.is_null()) { | |
14241
715bc50198c1
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
13398
diff
changeset
|
4107 Klass* caller = |
715bc50198c1
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
13398
diff
changeset
|
4108 THREAD->is_Java_thread() |
715bc50198c1
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
13398
diff
changeset
|
4109 ? ((JavaThread*)THREAD)->security_get_caller_class(1) |
715bc50198c1
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
13398
diff
changeset
|
4110 : NULL; |
715bc50198c1
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
13398
diff
changeset
|
4111 // caller can be NULL, for example, during a JVMTI VM_Init hook |
715bc50198c1
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
13398
diff
changeset
|
4112 if (caller != NULL) { |
0 | 4113 tty->print("[Loaded %s by instance of %s]\n", |
4114 this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4115 InstanceKlass::cast(caller)->external_name()); |
0 | 4116 } else { |
4117 tty->print("[Loaded %s]\n", this_klass->external_name()); | |
4118 } | |
4119 } else { | |
4120 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
|
4121 InstanceKlass::cast(class_loader->klass())->external_name()); |
0 | 4122 } |
4123 } | |
4124 | |
4125 if (TraceClassResolution) { | |
6934 | 4126 ResourceMark rm; |
0 | 4127 // print out the superclass. |
6983 | 4128 const char * from = this_klass()->external_name(); |
0 | 4129 if (this_klass->java_super() != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4130 tty->print("RESOLVE %s %s (super)\n", from, InstanceKlass::cast(this_klass->java_super())->external_name()); |
0 | 4131 } |
4132 // 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
|
4133 Array<Klass*>* local_interfaces = this_klass->local_interfaces(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4134 if (local_interfaces != NULL) { |
0 | 4135 int length = local_interfaces->length(); |
4136 for (int i = 0; i < length; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4137 Klass* k = local_interfaces->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4138 InstanceKlass* to_class = InstanceKlass::cast(k); |
0 | 4139 const char * to = to_class->external_name(); |
657
715dceaa89b7
6603316: Improve instrumentation for classes loaded at startup
acorn
parents:
652
diff
changeset
|
4140 tty->print("RESOLVE %s %s (interface)\n", from, to); |
0 | 4141 } |
4142 } | |
4143 } | |
4144 | |
4145 // preserve result across HandleMark | |
4146 preserve_this_klass = this_klass(); | |
4147 } | |
4148 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4149 // 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
|
4150 // Extended Class Redefinition) |
0 | 4151 instanceKlassHandle this_klass (THREAD, preserve_this_klass); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4152 debug_only(this_klass->verify();) |
0 | 4153 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4154 // 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
|
4155 _klass = NULL; |
0 | 4156 return this_klass; |
4157 } | |
4158 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4159 // 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
|
4160 ClassFileParser::~ClassFileParser() { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4161 MetadataFactory::free_metadata(_loader_data, _cp); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4162 MetadataFactory::free_array<u2>(_loader_data, _fields); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4163 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4164 // Free methods |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4165 InstanceKlass::deallocate_methods(_loader_data, _methods); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4166 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4167 // beware of the Universe::empty_blah_array!! |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4168 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
|
4169 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
|
4170 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4171 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4172 // Free interfaces |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4173 InstanceKlass::deallocate_interfaces(_loader_data, _super_klass(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4174 _local_interfaces, _transitive_interfaces); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4175 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4176 MetadataFactory::free_array<u1>(_loader_data, _annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4177 MetadataFactory::free_array<u1>(_loader_data, _type_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4178 Annotations::free_contents(_loader_data, _fields_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4179 Annotations::free_contents(_loader_data, _fields_type_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4180 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4181 clear_class_metadata(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4182 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4183 // deallocate the klass if already created. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4184 MetadataFactory::free_metadata(_loader_data, _klass); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4185 _klass = NULL; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4186 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4187 |
7587 | 4188 void ClassFileParser::print_field_layout(Symbol* name, |
4189 Array<u2>* fields, | |
4190 constantPoolHandle cp, | |
4191 int instance_size, | |
4192 int instance_fields_start, | |
4193 int instance_fields_end, | |
4194 int static_fields_end) { | |
4195 tty->print("%s: field layout\n", name->as_klass_external_name()); | |
4196 tty->print(" @%3d %s\n", instance_fields_start, "--- instance fields start ---"); | |
4197 for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { | |
4198 if (!fs.access_flags().is_static()) { | |
4199 tty->print(" @%3d \"%s\" %s\n", | |
4200 fs.offset(), | |
4201 fs.name()->as_klass_external_name(), | |
4202 fs.signature()->as_klass_external_name()); | |
4203 } | |
4204 } | |
4205 tty->print(" @%3d %s\n", instance_fields_end, "--- instance fields end ---"); | |
4206 tty->print(" @%3d %s\n", instance_size * wordSize, "--- instance ends ---"); | |
4207 tty->print(" @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---"); | |
4208 for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { | |
4209 if (fs.access_flags().is_static()) { | |
4210 tty->print(" @%3d \"%s\" %s\n", | |
4211 fs.offset(), | |
4212 fs.name()->as_klass_external_name(), | |
4213 fs.signature()->as_klass_external_name()); | |
4214 } | |
4215 } | |
4216 tty->print(" @%3d %s\n", static_fields_end, "--- static fields end ---"); | |
4217 tty->print("\n"); | |
4218 } | |
4219 | |
939
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4220 unsigned int |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4221 ClassFileParser::compute_oop_map_count(instanceKlassHandle super, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4222 unsigned int nonstatic_oop_map_count, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4223 int first_nonstatic_oop_offset) { |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4224 unsigned int map_count = |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4225 super.is_null() ? 0 : super->nonstatic_oop_map_count(); |
0 | 4226 if (nonstatic_oop_map_count > 0) { |
4227 // We have oops to add to map | |
938 | 4228 if (map_count == 0) { |
4229 map_count = nonstatic_oop_map_count; | |
0 | 4230 } else { |
938 | 4231 // Check whether we should add a new map block or whether the last one can |
4232 // be extended | |
4233 OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps(); | |
4234 OopMapBlock* const last_map = first_map + map_count - 1; | |
4235 | |
4236 int next_offset = last_map->offset() + last_map->count() * heapOopSize; | |
0 | 4237 if (next_offset == first_nonstatic_oop_offset) { |
4238 // There is no gap bettwen superklass's last oop field and first | |
4239 // local oop field, merge maps. | |
4240 nonstatic_oop_map_count -= 1; | |
4241 } else { | |
4242 // Superklass didn't end with a oop field, add extra maps | |
938 | 4243 assert(next_offset < first_nonstatic_oop_offset, "just checking"); |
0 | 4244 } |
938 | 4245 map_count += nonstatic_oop_map_count; |
0 | 4246 } |
4247 } | |
938 | 4248 return map_count; |
0 | 4249 } |
4250 | |
4251 | |
4252 void ClassFileParser::fill_oop_maps(instanceKlassHandle k, | |
939
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4253 unsigned int nonstatic_oop_map_count, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4254 int* nonstatic_oop_offsets, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4255 unsigned int* nonstatic_oop_counts) { |
0 | 4256 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
|
4257 const InstanceKlass* const super = k->superklass(); |
939
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4258 const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0; |
938 | 4259 if (super_count > 0) { |
4260 // Copy maps from superklass | |
0 | 4261 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
|
4262 for (unsigned int i = 0; i < super_count; ++i) { |
0 | 4263 *this_oop_map++ = *super_oop_map++; |
4264 } | |
4265 } | |
938 | 4266 |
0 | 4267 if (nonstatic_oop_map_count > 0) { |
938 | 4268 if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) { |
4269 // The counts differ because there is no gap between superklass's last oop | |
4270 // field and the first local oop field. Extend the last oop map copied | |
0 | 4271 // from the superklass instead of creating new one. |
4272 nonstatic_oop_map_count--; | |
4273 nonstatic_oop_offsets++; | |
4274 this_oop_map--; | |
938 | 4275 this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++); |
0 | 4276 this_oop_map++; |
4277 } | |
938 | 4278 |
0 | 4279 // Add new map blocks, fill them |
4280 while (nonstatic_oop_map_count-- > 0) { | |
4281 this_oop_map->set_offset(*nonstatic_oop_offsets++); | |
938 | 4282 this_oop_map->set_count(*nonstatic_oop_counts++); |
0 | 4283 this_oop_map++; |
4284 } | |
938 | 4285 assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() == |
4286 this_oop_map, "sanity"); | |
0 | 4287 } |
4288 } | |
4289 | |
4290 | |
4291 void ClassFileParser::set_precomputed_flags(instanceKlassHandle k) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4292 Klass* super = k->super(); |
0 | 4293 |
4294 // Check if this klass has an empty finalize method (i.e. one with return bytecode only), | |
4295 // in which case we don't have to register objects as finalizable | |
4296 if (!_has_empty_finalizer) { | |
4297 if (_has_finalizer || | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4298 (super != NULL && super->has_finalizer())) { |
0 | 4299 k->set_has_finalizer(); |
4300 } | |
4301 } | |
4302 | |
4303 #ifdef ASSERT | |
4304 bool f = false; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4305 Method* m = k->lookup_method(vmSymbols::finalize_method_name(), |
0 | 4306 vmSymbols::void_method_signature()); |
4307 if (m != NULL && !m->is_empty_method()) { | |
4308 f = true; | |
4309 } | |
4310 assert(f == k->has_finalizer(), "inconsistent has_finalizer"); | |
4311 #endif | |
4312 | |
4313 // Check if this klass supports the java.lang.Cloneable interface | |
1142 | 4314 if (SystemDictionary::Cloneable_klass_loaded()) { |
4315 if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) { | |
0 | 4316 k->set_is_cloneable(); |
4317 } | |
4318 } | |
4319 | |
4320 // Check if this klass has a vanilla default constructor | |
4321 if (super == NULL) { | |
4322 // java.lang.Object has empty default constructor | |
4323 k->set_has_vanilla_constructor(); | |
4324 } else { | |
6983 | 4325 if (super->has_vanilla_constructor() && |
0 | 4326 _has_vanilla_constructor) { |
4327 k->set_has_vanilla_constructor(); | |
4328 } | |
4329 #ifdef ASSERT | |
4330 bool v = false; | |
6983 | 4331 if (super->has_vanilla_constructor()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4332 Method* constructor = k->find_method(vmSymbols::object_initializer_name( |
0 | 4333 ), vmSymbols::void_method_signature()); |
4334 if (constructor != NULL && constructor->is_vanilla_constructor()) { | |
4335 v = true; | |
4336 } | |
4337 } | |
4338 assert(v == k->has_vanilla_constructor(), "inconsistent has_vanilla_constructor"); | |
4339 #endif | |
4340 } | |
4341 | |
4342 // 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
|
4343 // See documentation of InstanceKlass::can_be_fastpath_allocated(). |
0 | 4344 assert(k->size_helper() > 0, "layout_helper is initialized"); |
4345 if ((!RegisterFinalizersAtInit && k->has_finalizer()) | |
4346 || 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
|
4347 || (k->name() == vmSymbols::java_lang_Class() && k->class_loader() == NULL) |
0 | 4348 || k->size_helper() >= FastAllocateSizeLimit) { |
4349 // Forbid fast-path allocation. | |
4350 jint lh = Klass::instance_layout_helper(k->size_helper(), true); | |
4351 k->set_layout_helper(lh); | |
4352 } | |
4353 } | |
4354 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4355 // 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
|
4356 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
|
4357 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
|
4358 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
|
4359 // Dependencies to null class loader data are implicit. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4360 return; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4361 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4362 // add super class dependency |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4363 Klass* super = defined_klass->super(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4364 if (super != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4365 defining_loader_data->record_dependency(super, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4366 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4367 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4368 // add super interface dependencies |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4369 Array<Klass*>* local_interfaces = defined_klass->local_interfaces(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4370 if (local_interfaces != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4371 int length = local_interfaces->length(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4372 for (int i = 0; i < length; i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4373 defining_loader_data->record_dependency(local_interfaces->at(i), CHECK); |
0 | 4374 } |
4375 } | |
4376 } | |
4377 } | |
4378 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4379 // 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
|
4380 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4381 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
|
4382 // iterate over new interfaces |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4383 for (int i = 0; i < ifs->length(); i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4384 Klass* e = ifs->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4385 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
|
4386 // add new interface |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4387 result->append_if_missing(e); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4388 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4389 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4390 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4391 Array<Klass*>* ClassFileParser::compute_transitive_interfaces( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4392 instanceKlassHandle super, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4393 Array<Klass*>* local_ifs, TRAPS) { |
0 | 4394 // Compute maximum size for transitive interfaces |
4395 int max_transitive_size = 0; | |
4396 int super_size = 0; | |
4397 // Add superclass transitive interfaces size | |
4398 if (super.not_null()) { | |
4399 super_size = super->transitive_interfaces()->length(); | |
4400 max_transitive_size += super_size; | |
4401 } | |
4402 // Add local interfaces' super interfaces | |
4403 int local_size = local_ifs->length(); | |
4404 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
|
4405 Klass* l = local_ifs->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4406 max_transitive_size += InstanceKlass::cast(l)->transitive_interfaces()->length(); |
0 | 4407 } |
4408 // Finally add local interfaces | |
4409 max_transitive_size += local_size; | |
4410 // Construct array | |
4411 if (max_transitive_size == 0) { | |
4412 // no interfaces, use canonicalized array | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4413 return Universe::the_empty_klass_array(); |
0 | 4414 } else if (max_transitive_size == super_size) { |
4415 // 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
|
4416 return super->transitive_interfaces(); |
0 | 4417 } else if (max_transitive_size == local_size) { |
4418 // 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
|
4419 return local_ifs; |
0 | 4420 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4421 ResourceMark rm; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4422 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
|
4423 |
0 | 4424 // Copy down from superclass |
4425 if (super.not_null()) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4426 append_interfaces(result, super->transitive_interfaces()); |
0 | 4427 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4428 |
0 | 4429 // Copy down from local interfaces' superinterfaces |
4430 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
|
4431 Klass* l = local_ifs->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4432 append_interfaces(result, InstanceKlass::cast(l)->transitive_interfaces()); |
0 | 4433 } |
4434 // Finally add local interfaces | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4435 append_interfaces(result, local_ifs); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4436 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4437 // 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
|
4438 int length = result->length(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4439 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
|
4440 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
|
4441 for (int i = 0; i < length; i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4442 Klass* e = result->at(i); |
0 | 4443 assert(e != NULL, "just checking"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4444 new_result->at_put(i, e); |
0 | 4445 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4446 return new_result; |
0 | 4447 } |
4448 } | |
4449 | |
4450 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
|
4451 Klass* super = this_klass->super(); |
0 | 4452 if ((super != NULL) && |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4453 (!Reflection::verify_class_access(this_klass(), super, false))) { |
0 | 4454 ResourceMark rm(THREAD); |
4455 Exceptions::fthrow( | |
4456 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4457 vmSymbols::java_lang_IllegalAccessError(), |
0 | 4458 "class %s cannot access its superclass %s", |
4459 this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4460 InstanceKlass::cast(super)->external_name() |
0 | 4461 ); |
4462 return; | |
4463 } | |
4464 } | |
4465 | |
4466 | |
4467 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
|
4468 Array<Klass*>* local_interfaces = this_klass->local_interfaces(); |
0 | 4469 int lng = local_interfaces->length(); |
4470 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
|
4471 Klass* k = local_interfaces->at(i); |
6983 | 4472 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
|
4473 if (!Reflection::verify_class_access(this_klass(), k, false)) { |
0 | 4474 ResourceMark rm(THREAD); |
4475 Exceptions::fthrow( | |
4476 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4477 vmSymbols::java_lang_IllegalAccessError(), |
0 | 4478 "class %s cannot access its superinterface %s", |
4479 this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4480 InstanceKlass::cast(k)->external_name() |
0 | 4481 ); |
4482 return; | |
4483 } | |
4484 } | |
4485 } | |
4486 | |
4487 | |
4488 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
|
4489 Array<Method*>* methods = this_klass->methods(); |
0 | 4490 int num_methods = methods->length(); |
4491 | |
4492 // go thru each method and check if it overrides a final method | |
4493 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
|
4494 Method* m = methods->at(index); |
0 | 4495 |
13398
19146c82b6fc
8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents:
13055
diff
changeset
|
4496 // 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
|
4497 if ((!m->is_private() && !m->is_static()) && |
0 | 4498 (m->name() != vmSymbols::object_initializer_name())) { |
4499 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4500 Symbol* name = m->name(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4501 Symbol* signature = m->signature(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4502 Klass* k = this_klass->super(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4503 Method* super_m = NULL; |
0 | 4504 while (k != NULL) { |
4505 // 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
|
4506 if (k->has_final_method()) { |
0 | 4507 // 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
|
4508 super_m = InstanceKlass::cast(k)->lookup_method(name, signature); |
0 | 4509 if (super_m == NULL) { |
4510 break; // didn't find any match; get out | |
4511 } | |
4512 | |
14292
2e7b5143763f
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
14241
diff
changeset
|
4513 if (super_m->is_final() && !super_m->is_static() && |
2e7b5143763f
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
14241
diff
changeset
|
4514 // 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
|
4515 (Reflection::verify_field_access(this_klass(), |
0 | 4516 super_m->method_holder(), |
4517 super_m->method_holder(), | |
4518 super_m->access_flags(), false)) | |
4519 // this class can access super final method and therefore override | |
4520 ) { | |
4521 ResourceMark rm(THREAD); | |
4522 Exceptions::fthrow( | |
4523 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4524 vmSymbols::java_lang_VerifyError(), |
0 | 4525 "class %s overrides final method %s.%s", |
4526 this_klass->external_name(), | |
4527 name->as_C_string(), | |
4528 signature->as_C_string() | |
4529 ); | |
4530 return; | |
4531 } | |
4532 | |
4533 // 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
|
4534 k = super_m->method_holder()->super(); |
0 | 4535 continue; |
4536 } | |
4537 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4538 k = k->super(); |
0 | 4539 } |
4540 } | |
4541 } | |
4542 } | |
4543 | |
4544 | |
4545 // assumes that this_klass is an interface | |
4546 void ClassFileParser::check_illegal_static_method(instanceKlassHandle this_klass, TRAPS) { | |
4547 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
|
4548 Array<Method*>* methods = this_klass->methods(); |
0 | 4549 int num_methods = methods->length(); |
4550 | |
4551 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
|
4552 Method* m = methods->at(index); |
0 | 4553 // if m is static and not the init method, throw a verify error |
4554 if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) { | |
4555 ResourceMark rm(THREAD); | |
4556 Exceptions::fthrow( | |
4557 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4558 vmSymbols::java_lang_VerifyError(), |
0 | 4559 "Illegal static method %s in interface %s", |
4560 m->name()->as_C_string(), | |
4561 this_klass->external_name() | |
4562 ); | |
4563 return; | |
4564 } | |
4565 } | |
4566 } | |
4567 | |
4568 // utility methods for format checking | |
4569 | |
4570 void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) { | |
4571 if (!_need_verify) { return; } | |
4572 | |
4573 const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0; | |
4574 const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; | |
4575 const bool is_final = (flags & JVM_ACC_FINAL) != 0; | |
4576 const bool is_super = (flags & JVM_ACC_SUPER) != 0; | |
4577 const bool is_enum = (flags & JVM_ACC_ENUM) != 0; | |
4578 const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0; | |
4579 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; | |
4580 | |
4581 if ((is_abstract && is_final) || | |
4582 (is_interface && !is_abstract) || | |
4583 (is_interface && major_gte_15 && (is_super || is_enum)) || | |
4584 (!is_interface && major_gte_15 && is_annotation)) { | |
4585 ResourceMark rm(THREAD); | |
4586 Exceptions::fthrow( | |
4587 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4588 vmSymbols::java_lang_ClassFormatError(), |
0 | 4589 "Illegal class modifiers in class %s: 0x%X", |
4590 _class_name->as_C_string(), flags | |
4591 ); | |
4592 return; | |
4593 } | |
4594 } | |
4595 | |
4596 bool ClassFileParser::has_illegal_visibility(jint flags) { | |
4597 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; | |
4598 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; | |
4599 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; | |
4600 | |
4601 return ((is_public && is_protected) || | |
4602 (is_public && is_private) || | |
4603 (is_protected && is_private)); | |
4604 } | |
4605 | |
4606 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
|
4607 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
|
4608 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
|
4609 (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION); |
0 | 4610 return (major >= JAVA_MIN_SUPPORTED_VERSION) && |
176
6b648fefb395
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
136
diff
changeset
|
4611 (major <= max_version) && |
6b648fefb395
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
136
diff
changeset
|
4612 ((major != max_version) || |
0 | 4613 (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION)); |
4614 } | |
4615 | |
4616 void ClassFileParser::verify_legal_field_modifiers( | |
4617 jint flags, bool is_interface, TRAPS) { | |
4618 if (!_need_verify) { return; } | |
4619 | |
4620 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; | |
4621 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; | |
4622 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; | |
4623 const bool is_static = (flags & JVM_ACC_STATIC) != 0; | |
4624 const bool is_final = (flags & JVM_ACC_FINAL) != 0; | |
4625 const bool is_volatile = (flags & JVM_ACC_VOLATILE) != 0; | |
4626 const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0; | |
4627 const bool is_enum = (flags & JVM_ACC_ENUM) != 0; | |
4628 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; | |
4629 | |
4630 bool is_illegal = false; | |
4631 | |
4632 if (is_interface) { | |
4633 if (!is_public || !is_static || !is_final || is_private || | |
4634 is_protected || is_volatile || is_transient || | |
4635 (major_gte_15 && is_enum)) { | |
4636 is_illegal = true; | |
4637 } | |
4638 } else { // not interface | |
4639 if (has_illegal_visibility(flags) || (is_final && is_volatile)) { | |
4640 is_illegal = true; | |
4641 } | |
4642 } | |
4643 | |
4644 if (is_illegal) { | |
4645 ResourceMark rm(THREAD); | |
4646 Exceptions::fthrow( | |
4647 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4648 vmSymbols::java_lang_ClassFormatError(), |
0 | 4649 "Illegal field modifiers in class %s: 0x%X", |
4650 _class_name->as_C_string(), flags); | |
4651 return; | |
4652 } | |
4653 } | |
4654 | |
4655 void ClassFileParser::verify_legal_method_modifiers( | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4656 jint flags, bool is_interface, Symbol* name, TRAPS) { |
0 | 4657 if (!_need_verify) { return; } |
4658 | |
4659 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; | |
4660 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; | |
4661 const bool is_static = (flags & JVM_ACC_STATIC) != 0; | |
4662 const bool is_final = (flags & JVM_ACC_FINAL) != 0; | |
4663 const bool is_native = (flags & JVM_ACC_NATIVE) != 0; | |
4664 const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; | |
4665 const bool is_bridge = (flags & JVM_ACC_BRIDGE) != 0; | |
4666 const bool is_strict = (flags & JVM_ACC_STRICT) != 0; | |
4667 const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0; | |
7579
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4668 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
0 | 4669 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
6934 | 4670 const bool major_gte_8 = _major_version >= JAVA_8_VERSION; |
0 | 4671 const bool is_initializer = (name == vmSymbols::object_initializer_name()); |
4672 | |
4673 bool is_illegal = false; | |
4674 | |
4675 if (is_interface) { | |
7579
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4676 if (major_gte_8) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4677 // Class file version is JAVA_8_VERSION or later Methods of |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4678 // interfaces may set any of the flags except ACC_PROTECTED, |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4679 // ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4680 // 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
|
4681 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
|
4682 (is_native || is_protected || is_final || is_synchronized) || |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4683 // If a specific method of a class or interface has its |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4684 // ACC_ABSTRACT flag set, it must not have any of its |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4685 // ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC, |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4686 // ACC_STRICT, or ACC_SYNCHRONIZED flags set. No need to |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4687 // check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4688 // 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
|
4689 (is_abstract && (is_private || is_static || is_strict))) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4690 is_illegal = true; |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4691 } |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4692 } else if (major_gte_15) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4693 // 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
|
4694 if (!is_public || is_static || is_final || is_synchronized || |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4695 is_native || !is_abstract || is_strict) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4696 is_illegal = true; |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4697 } |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4698 } else { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4699 // Class file version is pre-JAVA_1_5_VERSION |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4700 if (!is_public || is_static || is_final || is_native || !is_abstract) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4701 is_illegal = true; |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4702 } |
0 | 4703 } |
4704 } else { // not interface | |
4705 if (is_initializer) { | |
4706 if (is_static || is_final || is_synchronized || is_native || | |
4707 is_abstract || (major_gte_15 && is_bridge)) { | |
4708 is_illegal = true; | |
4709 } | |
4710 } else { // not initializer | |
4711 if (is_abstract) { | |
4712 if ((is_final || is_native || is_private || is_static || | |
4713 (major_gte_15 && (is_synchronized || is_strict)))) { | |
4714 is_illegal = true; | |
4715 } | |
4716 } | |
4717 if (has_illegal_visibility(flags)) { | |
4718 is_illegal = true; | |
4719 } | |
4720 } | |
4721 } | |
4722 | |
4723 if (is_illegal) { | |
4724 ResourceMark rm(THREAD); | |
4725 Exceptions::fthrow( | |
4726 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4727 vmSymbols::java_lang_ClassFormatError(), |
0 | 4728 "Method %s in class %s has illegal modifiers: 0x%X", |
4729 name->as_C_string(), _class_name->as_C_string(), flags); | |
4730 return; | |
4731 } | |
4732 } | |
4733 | |
4734 void ClassFileParser::verify_legal_utf8(const unsigned char* buffer, int length, TRAPS) { | |
4735 assert(_need_verify, "only called when _need_verify is true"); | |
4736 int i = 0; | |
4737 int count = length >> 2; | |
4738 for (int k=0; k<count; k++) { | |
4739 unsigned char b0 = buffer[i]; | |
4740 unsigned char b1 = buffer[i+1]; | |
4741 unsigned char b2 = buffer[i+2]; | |
4742 unsigned char b3 = buffer[i+3]; | |
4743 // For an unsigned char v, | |
4744 // (v | v - 1) is < 128 (highest bit 0) for 0 < v < 128; | |
4745 // (v | v - 1) is >= 128 (highest bit 1) for v == 0 or v >= 128. | |
4746 unsigned char res = b0 | b0 - 1 | | |
4747 b1 | b1 - 1 | | |
4748 b2 | b2 - 1 | | |
4749 b3 | b3 - 1; | |
4750 if (res >= 128) break; | |
4751 i += 4; | |
4752 } | |
4753 for(; i < length; i++) { | |
4754 unsigned short c; | |
4755 // no embedded zeros | |
4756 guarantee_property((buffer[i] != 0), "Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4757 if(buffer[i] < 128) { | |
4758 continue; | |
4759 } | |
4760 if ((i + 5) < length) { // see if it's legal supplementary character | |
4761 if (UTF8::is_supplementary_character(&buffer[i])) { | |
4762 c = UTF8::get_supplementary_character(&buffer[i]); | |
4763 i += 5; | |
4764 continue; | |
4765 } | |
4766 } | |
4767 switch (buffer[i] >> 4) { | |
4768 default: break; | |
4769 case 0x8: case 0x9: case 0xA: case 0xB: case 0xF: | |
4770 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4771 case 0xC: case 0xD: // 110xxxxx 10xxxxxx | |
4772 c = (buffer[i] & 0x1F) << 6; | |
4773 i++; | |
4774 if ((i < length) && ((buffer[i] & 0xC0) == 0x80)) { | |
4775 c += buffer[i] & 0x3F; | |
4776 if (_major_version <= 47 || c == 0 || c >= 0x80) { | |
4777 // for classes with major > 47, c must a null or a character in its shortest form | |
4778 break; | |
4779 } | |
4780 } | |
4781 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4782 case 0xE: // 1110xxxx 10xxxxxx 10xxxxxx | |
4783 c = (buffer[i] & 0xF) << 12; | |
4784 i += 2; | |
4785 if ((i < length) && ((buffer[i-1] & 0xC0) == 0x80) && ((buffer[i] & 0xC0) == 0x80)) { | |
4786 c += ((buffer[i-1] & 0x3F) << 6) + (buffer[i] & 0x3F); | |
4787 if (_major_version <= 47 || c >= 0x800) { | |
4788 // for classes with major > 47, c must be in its shortest form | |
4789 break; | |
4790 } | |
4791 } | |
4792 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4793 } // end of switch | |
4794 } // end of for | |
4795 } | |
4796 | |
4797 // 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
|
4798 void ClassFileParser::verify_legal_class_name(Symbol* name, TRAPS) { |
0 | 4799 if (!_need_verify || _relax_verify) { return; } |
4800 | |
4801 char buf[fixed_buffer_size]; | |
4802 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4803 unsigned int length = name->utf8_length(); | |
4804 bool legal = false; | |
4805 | |
4806 if (length > 0) { | |
4807 char* p; | |
4808 if (bytes[0] == JVM_SIGNATURE_ARRAY) { | |
4809 p = skip_over_field_signature(bytes, false, length, CHECK); | |
4810 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4811 } else if (_major_version < JAVA_1_5_VERSION) { | |
4812 if (bytes[0] != '<') { | |
4813 p = skip_over_field_name(bytes, true, length); | |
4814 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4815 } | |
4816 } else { | |
4817 // 4900761: relax the constraints based on JSR202 spec | |
4818 // Class names may be drawn from the entire Unicode character set. | |
4819 // Identifiers between '/' must be unqualified names. | |
4820 // The utf8 string has been verified when parsing cpool entries. | |
4821 legal = verify_unqualified_name(bytes, length, LegalClass); | |
4822 } | |
4823 } | |
4824 if (!legal) { | |
4825 ResourceMark rm(THREAD); | |
4826 Exceptions::fthrow( | |
4827 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4828 vmSymbols::java_lang_ClassFormatError(), |
0 | 4829 "Illegal class name \"%s\" in class file %s", bytes, |
4830 _class_name->as_C_string() | |
4831 ); | |
4832 return; | |
4833 } | |
4834 } | |
4835 | |
4836 // 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
|
4837 void ClassFileParser::verify_legal_field_name(Symbol* name, TRAPS) { |
0 | 4838 if (!_need_verify || _relax_verify) { return; } |
4839 | |
4840 char buf[fixed_buffer_size]; | |
4841 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4842 unsigned int length = name->utf8_length(); | |
4843 bool legal = false; | |
4844 | |
4845 if (length > 0) { | |
4846 if (_major_version < JAVA_1_5_VERSION) { | |
4847 if (bytes[0] != '<') { | |
4848 char* p = skip_over_field_name(bytes, false, length); | |
4849 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4850 } | |
4851 } else { | |
4852 // 4881221: relax the constraints based on JSR202 spec | |
4853 legal = verify_unqualified_name(bytes, length, LegalField); | |
4854 } | |
4855 } | |
4856 | |
4857 if (!legal) { | |
4858 ResourceMark rm(THREAD); | |
4859 Exceptions::fthrow( | |
4860 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4861 vmSymbols::java_lang_ClassFormatError(), |
0 | 4862 "Illegal field name \"%s\" in class %s", bytes, |
4863 _class_name->as_C_string() | |
4864 ); | |
4865 return; | |
4866 } | |
4867 } | |
4868 | |
4869 // 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
|
4870 void ClassFileParser::verify_legal_method_name(Symbol* name, TRAPS) { |
0 | 4871 if (!_need_verify || _relax_verify) { return; } |
4872 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4873 assert(name != NULL, "method name is null"); |
0 | 4874 char buf[fixed_buffer_size]; |
4875 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4876 unsigned int length = name->utf8_length(); | |
4877 bool legal = false; | |
4878 | |
4879 if (length > 0) { | |
4880 if (bytes[0] == '<') { | |
4881 if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) { | |
4882 legal = true; | |
4883 } | |
4884 } else if (_major_version < JAVA_1_5_VERSION) { | |
4885 char* p; | |
4886 p = skip_over_field_name(bytes, false, length); | |
4887 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4888 } else { | |
4889 // 4881221: relax the constraints based on JSR202 spec | |
4890 legal = verify_unqualified_name(bytes, length, LegalMethod); | |
4891 } | |
4892 } | |
4893 | |
4894 if (!legal) { | |
4895 ResourceMark rm(THREAD); | |
4896 Exceptions::fthrow( | |
4897 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4898 vmSymbols::java_lang_ClassFormatError(), |
0 | 4899 "Illegal method name \"%s\" in class %s", bytes, |
4900 _class_name->as_C_string() | |
4901 ); | |
4902 return; | |
4903 } | |
4904 } | |
4905 | |
4906 | |
4907 // 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
|
4908 void ClassFileParser::verify_legal_field_signature(Symbol* name, Symbol* signature, TRAPS) { |
0 | 4909 if (!_need_verify) { return; } |
4910 | |
4911 char buf[fixed_buffer_size]; | |
4912 char* bytes = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4913 unsigned int length = signature->utf8_length(); | |
4914 char* p = skip_over_field_signature(bytes, false, length, CHECK); | |
4915 | |
4916 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
|
4917 throwIllegalSignature("Field", name, signature, CHECK); |
0 | 4918 } |
4919 } | |
4920 | |
4921 // Checks if signature is a legal method signature. | |
4922 // Returns number of parameters | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4923 int ClassFileParser::verify_legal_method_signature(Symbol* name, Symbol* signature, TRAPS) { |
0 | 4924 if (!_need_verify) { |
4925 // make sure caller's args_size will be less than 0 even for non-static | |
4926 // method so it will be recomputed in compute_size_of_parameters(). | |
4927 return -2; | |
4928 } | |
4929 | |
4930 unsigned int args_size = 0; | |
4931 char buf[fixed_buffer_size]; | |
4932 char* p = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4933 unsigned int length = signature->utf8_length(); | |
4934 char* nextp; | |
4935 | |
4936 // The first character must be a '(' | |
4937 if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) { | |
4938 length--; | |
4939 // Skip over legal field signatures | |
4940 nextp = skip_over_field_signature(p, false, length, CHECK_0); | |
4941 while ((length > 0) && (nextp != NULL)) { | |
4942 args_size++; | |
4943 if (p[0] == 'J' || p[0] == 'D') { | |
4944 args_size++; | |
4945 } | |
4946 length -= nextp - p; | |
4947 p = nextp; | |
4948 nextp = skip_over_field_signature(p, false, length, CHECK_0); | |
4949 } | |
4950 // The first non-signature thing better be a ')' | |
4951 if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { | |
4952 length--; | |
4953 if (name->utf8_length() > 0 && name->byte_at(0) == '<') { | |
4954 // All internal methods must return void | |
4955 if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { | |
4956 return args_size; | |
4957 } | |
4958 } else { | |
4959 // Now we better just have a return value | |
4960 nextp = skip_over_field_signature(p, true, length, CHECK_0); | |
4961 if (nextp && ((int)length == (nextp - p))) { | |
4962 return args_size; | |
4963 } | |
4964 } | |
4965 } | |
4966 } | |
4967 // Report error | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
4968 throwIllegalSignature("Method", name, signature, CHECK_0); |
0 | 4969 return 0; |
4970 } | |
4971 | |
4972 | |
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
|
4973 // 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
|
4974 // 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
|
4975 // 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
|
4976 // 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
|
4977 // 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
|
4978 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
|
4979 char* name, unsigned int length, int type) { |
0 | 4980 jchar ch; |
4981 | |
4982 for (char* p = name; p != name + length; ) { | |
4983 ch = *p; | |
4984 if (ch < 128) { | |
4985 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
|
4986 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
|
4987 return false; // do not permit '.', ';', or '[' |
0 | 4988 } |
4989 if (type != LegalClass && ch == '/') { | |
4990 return false; // do not permit '/' unless it's class name | |
4991 } | |
4992 if (type == LegalMethod && (ch == '<' || ch == '>')) { | |
4993 return false; // do not permit '<' or '>' in method names | |
4994 } | |
4995 } else { | |
4996 char* tmp_p = UTF8::next(p, &ch); | |
4997 p = tmp_p; | |
4998 } | |
4999 } | |
5000 return true; | |
5001 } | |
5002 | |
5003 | |
5004 // Take pointer to a string. Skip over the longest part of the string that could | |
5005 // be taken as a fieldname. Allow '/' if slash_ok is true. | |
5006 // Return a pointer to just past the fieldname. | |
5007 // Return NULL if no fieldname at all was found, or in the case of slash_ok | |
5008 // being true, we saw consecutive slashes (meaning we were looking for a | |
5009 // qualified path but found something that was badly-formed). | |
5010 char* ClassFileParser::skip_over_field_name(char* name, bool slash_ok, unsigned int length) { | |
5011 char* p; | |
5012 jchar ch; | |
5013 jboolean last_is_slash = false; | |
5014 jboolean not_first_ch = false; | |
5015 | |
5016 for (p = name; p != name + length; not_first_ch = true) { | |
5017 char* old_p = p; | |
5018 ch = *p; | |
5019 if (ch < 128) { | |
5020 p++; | |
5021 // quick check for ascii | |
5022 if ((ch >= 'a' && ch <= 'z') || | |
5023 (ch >= 'A' && ch <= 'Z') || | |
5024 (ch == '_' || ch == '$') || | |
5025 (not_first_ch && ch >= '0' && ch <= '9')) { | |
5026 last_is_slash = false; | |
5027 continue; | |
5028 } | |
5029 if (slash_ok && ch == '/') { | |
5030 if (last_is_slash) { | |
5031 return NULL; // Don't permit consecutive slashes | |
5032 } | |
5033 last_is_slash = true; | |
5034 continue; | |
5035 } | |
5036 } else { | |
5037 jint unicode_ch; | |
5038 char* tmp_p = UTF8::next_character(p, &unicode_ch); | |
5039 p = tmp_p; | |
5040 last_is_slash = false; | |
5041 // Check if ch is Java identifier start or is Java identifier part | |
5042 // 4672820: call java.lang.Character methods directly without generating separate tables. | |
5043 EXCEPTION_MARK; | |
1142 | 5044 instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass()); |
0 | 5045 |
5046 // return value | |
5047 JavaValue result(T_BOOLEAN); | |
5048 // Set up the arguments to isJavaIdentifierStart and isJavaIdentifierPart | |
5049 JavaCallArguments args; | |
5050 args.push_int(unicode_ch); | |
5051 | |
5052 // public static boolean isJavaIdentifierStart(char ch); | |
5053 JavaCalls::call_static(&result, | |
5054 klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5055 vmSymbols::isJavaIdentifierStart_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5056 vmSymbols::int_bool_signature(), |
0 | 5057 &args, |
5058 THREAD); | |
5059 | |
5060 if (HAS_PENDING_EXCEPTION) { | |
5061 CLEAR_PENDING_EXCEPTION; | |
5062 return 0; | |
5063 } | |
5064 if (result.get_jboolean()) { | |
5065 continue; | |
5066 } | |
5067 | |
5068 if (not_first_ch) { | |
5069 // public static boolean isJavaIdentifierPart(char ch); | |
5070 JavaCalls::call_static(&result, | |
5071 klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5072 vmSymbols::isJavaIdentifierPart_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5073 vmSymbols::int_bool_signature(), |
0 | 5074 &args, |
5075 THREAD); | |
5076 | |
5077 if (HAS_PENDING_EXCEPTION) { | |
5078 CLEAR_PENDING_EXCEPTION; | |
5079 return 0; | |
5080 } | |
5081 | |
5082 if (result.get_jboolean()) { | |
5083 continue; | |
5084 } | |
5085 } | |
5086 } | |
5087 return (not_first_ch) ? old_p : NULL; | |
5088 } | |
5089 return (not_first_ch) ? p : NULL; | |
5090 } | |
5091 | |
5092 | |
5093 // Take pointer to a string. Skip over the longest part of the string that could | |
5094 // be taken as a field signature. Allow "void" if void_ok. | |
5095 // Return a pointer to just past the signature. | |
5096 // Return NULL if no legal signature is found. | |
5097 char* ClassFileParser::skip_over_field_signature(char* signature, | |
5098 bool void_ok, | |
5099 unsigned int length, | |
5100 TRAPS) { | |
5101 unsigned int array_dim = 0; | |
5102 while (length > 0) { | |
5103 switch (signature[0]) { | |
5104 case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; } | |
5105 case JVM_SIGNATURE_BOOLEAN: | |
5106 case JVM_SIGNATURE_BYTE: | |
5107 case JVM_SIGNATURE_CHAR: | |
5108 case JVM_SIGNATURE_SHORT: | |
5109 case JVM_SIGNATURE_INT: | |
5110 case JVM_SIGNATURE_FLOAT: | |
5111 case JVM_SIGNATURE_LONG: | |
5112 case JVM_SIGNATURE_DOUBLE: | |
5113 return signature + 1; | |
5114 case JVM_SIGNATURE_CLASS: { | |
5115 if (_major_version < JAVA_1_5_VERSION) { | |
5116 // Skip over the class name if one is there | |
5117 char* p = skip_over_field_name(signature + 1, true, --length); | |
5118 | |
5119 // The next character better be a semicolon | |
5120 if (p && (p - signature) > 1 && p[0] == ';') { | |
5121 return p + 1; | |
5122 } | |
5123 } else { | |
5124 // 4900761: For class version > 48, any unicode is allowed in class name. | |
5125 length--; | |
5126 signature++; | |
5127 while (length > 0 && signature[0] != ';') { | |
5128 if (signature[0] == '.') { | |
5129 classfile_parse_error("Class name contains illegal character '.' in descriptor in class file %s", CHECK_0); | |
5130 } | |
5131 length--; | |
5132 signature++; | |
5133 } | |
5134 if (signature[0] == ';') { return signature + 1; } | |
5135 } | |
5136 | |
5137 return NULL; | |
5138 } | |
5139 case JVM_SIGNATURE_ARRAY: | |
5140 array_dim++; | |
5141 if (array_dim > 255) { | |
5142 // 4277370: array descriptor is valid only if it represents 255 or fewer dimensions. | |
5143 classfile_parse_error("Array type descriptor has more than 255 dimensions in class file %s", CHECK_0); | |
5144 } | |
5145 // The rest of what's there better be a legal signature | |
5146 signature++; | |
5147 length--; | |
5148 void_ok = false; | |
5149 break; | |
5150 | |
5151 default: | |
5152 return NULL; | |
5153 } | |
5154 } | |
5155 return NULL; | |
5156 } |