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