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