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