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