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