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