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