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