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