Mercurial > hg > graal-jvmci-8
annotate src/share/vm/classfile/classFileParser.cpp @ 23959:65029655928a jdk8u111-b04
8159503: Amend Annotation Actions
Reviewed-by: rprotacio
author | poonam |
---|---|
date | Fri, 08 Jul 2016 10:44:27 -0700 |
parents | d109bda16490 |
children | f13e777eb255 e828a0e2a4bc |
rev | line source |
---|---|
0 | 1 /* |
23614 | 2 * Copyright (c) 1997, 2016, 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" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
28 #include "classfile/classLoaderData.hpp" |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
29 #include "classfile/classLoaderData.inline.hpp" |
6934 | 30 #include "classfile/defaultMethods.hpp" |
1972 | 31 #include "classfile/javaClasses.hpp" |
32 #include "classfile/symbolTable.hpp" | |
33 #include "classfile/systemDictionary.hpp" | |
20375
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
34 #if INCLUDE_CDS |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
35 #include "classfile/systemDictionaryShared.hpp" |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
36 #endif |
1972 | 37 #include "classfile/verificationType.hpp" |
38 #include "classfile/verifier.hpp" | |
39 #include "classfile/vmSymbols.hpp" | |
40 #include "memory/allocation.hpp" | |
41 #include "memory/gcLocker.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
42 #include "memory/metadataFactory.hpp" |
1972 | 43 #include "memory/oopFactory.hpp" |
10405 | 44 #include "memory/referenceType.hpp" |
1972 | 45 #include "memory/universe.inline.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
46 #include "oops/constantPool.hpp" |
3938 | 47 #include "oops/fieldStreams.hpp" |
1972 | 48 #include "oops/instanceKlass.hpp" |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
49 #include "oops/instanceMirrorKlass.hpp" |
1972 | 50 #include "oops/klass.inline.hpp" |
51 #include "oops/klassVtable.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
52 #include "oops/method.hpp" |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
53 #include "oops/symbol.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
54 #include "prims/jvm.h" |
1972 | 55 #include "prims/jvmtiExport.hpp" |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
56 #include "prims/jvmtiThreadState.hpp" |
1972 | 57 #include "runtime/javaCalls.hpp" |
58 #include "runtime/perfData.hpp" | |
59 #include "runtime/reflection.hpp" | |
60 #include "runtime/signature.hpp" | |
61 #include "runtime/timer.hpp" | |
62 #include "services/classLoadingService.hpp" | |
63 #include "services/threadService.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
64 #include "utilities/array.hpp" |
7588
f9eb431c3efe
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
7579
diff
changeset
|
65 #include "utilities/globalDefinitions.hpp" |
20375
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
66 #include "utilities/ostream.hpp" |
0 | 67 |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
68 // 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
|
69 // 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
|
70 // 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
|
71 // pool and when parsing line number tables. |
0 | 72 |
73 // We add assert in debug mode when class format is not checked. | |
74 | |
75 #define JAVA_CLASSFILE_MAGIC 0xCAFEBABE | |
76 #define JAVA_MIN_SUPPORTED_VERSION 45 | |
6868 | 77 #define JAVA_MAX_SUPPORTED_VERSION 52 |
0 | 78 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0 |
79 | |
80 // Used for two backward compatibility reasons: | |
81 // - to check for new additions to the class file format in JDK1.5 | |
82 // - to check for bug fixes in the format checker in JDK1.5 | |
83 #define JAVA_1_5_VERSION 49 | |
84 | |
85 // Used for backward compatibility reasons: | |
86 // - 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
|
87 // - also used as the max version when running in jdk6 |
0 | 88 #define JAVA_6_VERSION 50 |
89 | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
90 // 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
|
91 // - 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
|
92 #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
|
93 |
6934 | 94 // Extension method support. |
95 #define JAVA_8_VERSION 52 | |
96 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
97 void ClassFileParser::parse_constant_pool_entries(int length, TRAPS) { |
0 | 98 // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize |
99 // this function (_current can be allocated in a register, with scalar | |
100 // replacement of aggregates). The _current pointer is copied back to | |
101 // stream() when this function returns. DON'T call another method within | |
102 // this method that uses stream(). | |
103 ClassFileStream* cfs0 = stream(); | |
104 ClassFileStream cfs1 = *cfs0; | |
105 ClassFileStream* cfs = &cfs1; | |
106 #ifdef ASSERT | |
1685 | 107 assert(cfs->allocated_on_stack(),"should be local"); |
0 | 108 u1* old_current = cfs0->current(); |
109 #endif | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
110 Handle class_loader(THREAD, _loader_data->class_loader()); |
0 | 111 |
112 // Used for batching symbol allocations. | |
113 const char* names[SymbolTable::symbol_alloc_batch_size]; | |
114 int lengths[SymbolTable::symbol_alloc_batch_size]; | |
115 int indices[SymbolTable::symbol_alloc_batch_size]; | |
116 unsigned int hashValues[SymbolTable::symbol_alloc_batch_size]; | |
117 int names_count = 0; | |
118 | |
119 // parsing Index 0 is unused | |
120 for (int index = 1; index < length; index++) { | |
121 // Each of the following case guarantees one more byte in the stream | |
122 // for the following tag or the access_flags following constant pool, | |
123 // so we don't need bounds-check for reading tag. | |
124 u1 tag = cfs->get_u1_fast(); | |
125 switch (tag) { | |
126 case JVM_CONSTANT_Class : | |
127 { | |
128 cfs->guarantee_more(3, CHECK); // name_index, tag/access_flags | |
129 u2 name_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
130 _cp->klass_index_at_put(index, name_index); |
0 | 131 } |
132 break; | |
133 case JVM_CONSTANT_Fieldref : | |
134 { | |
135 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags | |
136 u2 class_index = cfs->get_u2_fast(); | |
137 u2 name_and_type_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
138 _cp->field_at_put(index, class_index, name_and_type_index); |
0 | 139 } |
140 break; | |
141 case JVM_CONSTANT_Methodref : | |
142 { | |
143 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags | |
144 u2 class_index = cfs->get_u2_fast(); | |
145 u2 name_and_type_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
146 _cp->method_at_put(index, class_index, name_and_type_index); |
0 | 147 } |
148 break; | |
149 case JVM_CONSTANT_InterfaceMethodref : | |
150 { | |
151 cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags | |
152 u2 class_index = cfs->get_u2_fast(); | |
153 u2 name_and_type_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
154 _cp->interface_method_at_put(index, class_index, name_and_type_index); |
0 | 155 } |
156 break; | |
157 case JVM_CONSTANT_String : | |
158 { | |
159 cfs->guarantee_more(3, CHECK); // string_index, tag/access_flags | |
160 u2 string_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
161 _cp->string_index_at_put(index, string_index); |
0 | 162 } |
163 break; | |
1602 | 164 case JVM_CONSTANT_MethodHandle : |
165 case JVM_CONSTANT_MethodType : | |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
166 if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
1602 | 167 classfile_parse_error( |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
168 "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
|
169 tag, CHECK); |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
170 } |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
171 if (!EnableInvokeDynamic) { |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
172 classfile_parse_error( |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
173 "This JVM does not support constant tag %u in class file %s", |
1602 | 174 tag, CHECK); |
175 } | |
176 if (tag == JVM_CONSTANT_MethodHandle) { | |
177 cfs->guarantee_more(4, CHECK); // ref_kind, method_index, tag/access_flags | |
178 u1 ref_kind = cfs->get_u1_fast(); | |
179 u2 method_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
180 _cp->method_handle_index_at_put(index, ref_kind, method_index); |
1602 | 181 } else if (tag == JVM_CONSTANT_MethodType) { |
182 cfs->guarantee_more(3, CHECK); // signature_index, tag/access_flags | |
183 u2 signature_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
184 _cp->method_type_index_at_put(index, signature_index); |
1602 | 185 } else { |
186 ShouldNotReachHere(); | |
187 } | |
188 break; | |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
189 case JVM_CONSTANT_InvokeDynamic : |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
190 { |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
191 if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
192 classfile_parse_error( |
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
193 "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
|
194 tag, CHECK); |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
195 } |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
196 if (!EnableInvokeDynamic) { |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
197 classfile_parse_error( |
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2334
diff
changeset
|
198 "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
|
199 tag, CHECK); |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
200 } |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
201 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
|
202 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
|
203 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
|
204 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
|
205 _max_bootstrap_specifier_index = (int) bootstrap_specifier_index; // collect for later |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
206 _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
|
207 } |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
208 break; |
0 | 209 case JVM_CONSTANT_Integer : |
210 { | |
211 cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags | |
212 u4 bytes = cfs->get_u4_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
213 _cp->int_at_put(index, (jint) bytes); |
0 | 214 } |
215 break; | |
216 case JVM_CONSTANT_Float : | |
217 { | |
218 cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags | |
219 u4 bytes = cfs->get_u4_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
220 _cp->float_at_put(index, *(jfloat*)&bytes); |
0 | 221 } |
222 break; | |
223 case JVM_CONSTANT_Long : | |
224 // A mangled type might cause you to overrun allocated memory | |
225 guarantee_property(index+1 < length, | |
226 "Invalid constant pool entry %u in class file %s", | |
227 index, CHECK); | |
228 { | |
229 cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags | |
230 u8 bytes = cfs->get_u8_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
231 _cp->long_at_put(index, bytes); |
0 | 232 } |
233 index++; // Skip entry following eigth-byte constant, see JVM book p. 98 | |
234 break; | |
235 case JVM_CONSTANT_Double : | |
236 // A mangled type might cause you to overrun allocated memory | |
237 guarantee_property(index+1 < length, | |
238 "Invalid constant pool entry %u in class file %s", | |
239 index, CHECK); | |
240 { | |
241 cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags | |
242 u8 bytes = cfs->get_u8_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
243 _cp->double_at_put(index, *(jdouble*)&bytes); |
0 | 244 } |
245 index++; // Skip entry following eigth-byte constant, see JVM book p. 98 | |
246 break; | |
247 case JVM_CONSTANT_NameAndType : | |
248 { | |
249 cfs->guarantee_more(5, CHECK); // name_index, signature_index, tag/access_flags | |
250 u2 name_index = cfs->get_u2_fast(); | |
251 u2 signature_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
252 _cp->name_and_type_at_put(index, name_index, signature_index); |
0 | 253 } |
254 break; | |
255 case JVM_CONSTANT_Utf8 : | |
256 { | |
257 cfs->guarantee_more(2, CHECK); // utf8_length | |
258 u2 utf8_length = cfs->get_u2_fast(); | |
259 u1* utf8_buffer = cfs->get_u1_buffer(); | |
260 assert(utf8_buffer != NULL, "null utf8 buffer"); | |
261 // Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward. | |
262 cfs->guarantee_more(utf8_length+1, CHECK); // utf8 string, tag/access_flags | |
263 cfs->skip_u1_fast(utf8_length); | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
264 |
0 | 265 // Before storing the symbol, make sure it's legal |
266 if (_need_verify) { | |
267 verify_legal_utf8((unsigned char*)utf8_buffer, utf8_length, CHECK); | |
268 } | |
269 | |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
270 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
|
271 Handle patch = clear_cp_patch_at(index); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
272 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
|
273 "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
|
274 index, CHECK); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
275 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
|
276 // (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
|
277 utf8_buffer = (u1*) str; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
278 utf8_length = (int) strlen(str); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
279 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
280 |
0 | 281 unsigned int hash; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
282 Symbol* result = SymbolTable::lookup_only((char*)utf8_buffer, utf8_length, hash); |
0 | 283 if (result == NULL) { |
284 names[names_count] = (char*)utf8_buffer; | |
285 lengths[names_count] = utf8_length; | |
286 indices[names_count] = index; | |
287 hashValues[names_count++] = hash; | |
288 if (names_count == SymbolTable::symbol_alloc_batch_size) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
289 SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK); |
0 | 290 names_count = 0; |
291 } | |
292 } else { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
293 _cp->symbol_at_put(index, result); |
0 | 294 } |
295 } | |
296 break; | |
297 default: | |
298 classfile_parse_error( | |
299 "Unknown constant tag %u in class file %s", tag, CHECK); | |
300 break; | |
301 } | |
302 } | |
303 | |
304 // Allocate the remaining symbols | |
305 if (names_count > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
306 SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK); |
0 | 307 } |
308 | |
309 // Copy _current pointer of local copy back to stream(). | |
310 #ifdef ASSERT | |
311 assert(cfs0->current() == old_current, "non-exclusive use of stream()"); | |
312 #endif | |
313 cfs0->set_current(cfs1.current()); | |
314 } | |
315 | |
316 bool inline valid_cp_range(int index, int length) { return (index > 0 && index < length); } | |
317 | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
318 inline Symbol* check_symbol_at(constantPoolHandle cp, int index) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
319 if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8()) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
320 return cp->symbol_at(index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
321 else |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
322 return NULL; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
323 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
324 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
325 constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { |
0 | 326 ClassFileStream* cfs = stream(); |
327 constantPoolHandle nullHandle; | |
328 | |
329 cfs->guarantee_more(3, CHECK_(nullHandle)); // length, first cp tag | |
330 u2 length = cfs->get_u2_fast(); | |
331 guarantee_property( | |
332 length >= 1, "Illegal constant pool size %u in class file %s", | |
333 length, CHECK_(nullHandle)); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
334 ConstantPool* constant_pool = ConstantPool::allocate(_loader_data, length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
335 CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
336 _cp = constant_pool; // save in case of errors |
0 | 337 constantPoolHandle cp (THREAD, constant_pool); |
338 | |
339 // parsing constant pool entries | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
340 parse_constant_pool_entries(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); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
359 check_property(valid_klass_reference_at(klass_ref_index), |
0 | 360 "Invalid constant pool index %u in class file %s", |
361 klass_ref_index, | |
362 CHECK_(nullHandle)); | |
363 check_property(valid_cp_range(name_and_type_ref_index, length) && | |
364 cp->tag_at(name_and_type_ref_index).is_name_and_type(), | |
365 "Invalid constant pool index %u in class file %s", | |
366 name_and_type_ref_index, | |
367 CHECK_(nullHandle)); | |
368 break; | |
369 } | |
370 case JVM_CONSTANT_String : | |
371 ShouldNotReachHere(); // Only JVM_CONSTANT_StringIndex should be present | |
372 break; | |
373 case JVM_CONSTANT_Integer : | |
374 break; | |
375 case JVM_CONSTANT_Float : | |
376 break; | |
377 case JVM_CONSTANT_Long : | |
378 case JVM_CONSTANT_Double : | |
379 index++; | |
380 check_property( | |
381 (index < length && cp->tag_at(index).is_invalid()), | |
382 "Improper constant pool long/double index %u in class file %s", | |
383 index, CHECK_(nullHandle)); | |
384 break; | |
385 case JVM_CONSTANT_NameAndType : { | |
386 if (!_need_verify) break; | |
387 int name_ref_index = cp->name_ref_index_at(index); | |
388 int signature_ref_index = cp->signature_ref_index_at(index); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
389 check_property(valid_symbol_at(name_ref_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
390 "Invalid constant pool index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
391 name_ref_index, CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
392 check_property(valid_symbol_at(signature_ref_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
393 "Invalid constant pool index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
394 signature_ref_index, CHECK_(nullHandle)); |
0 | 395 break; |
396 } | |
397 case JVM_CONSTANT_Utf8 : | |
398 break; | |
399 case JVM_CONSTANT_UnresolvedClass : // fall-through | |
400 case JVM_CONSTANT_UnresolvedClassInError: | |
401 ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present | |
402 break; | |
403 case JVM_CONSTANT_ClassIndex : | |
404 { | |
405 int class_index = cp->klass_index_at(index); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
406 check_property(valid_symbol_at(class_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
407 "Invalid constant pool index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
408 class_index, CHECK_(nullHandle)); |
0 | 409 cp->unresolved_klass_at_put(index, cp->symbol_at(class_index)); |
410 } | |
411 break; | |
412 case JVM_CONSTANT_StringIndex : | |
413 { | |
414 int string_index = cp->string_index_at(index); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
415 check_property(valid_symbol_at(string_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
416 "Invalid constant pool index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
417 string_index, CHECK_(nullHandle)); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
418 Symbol* sym = cp->symbol_at(string_index); |
0 | 419 cp->unresolved_string_at_put(index, sym); |
420 } | |
421 break; | |
1602 | 422 case JVM_CONSTANT_MethodHandle : |
423 { | |
424 int ref_index = cp->method_handle_index_at(index); | |
425 check_property( | |
426 valid_cp_range(ref_index, length) && | |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
427 EnableInvokeDynamic, |
1602 | 428 "Invalid constant pool index %u in class file %s", |
429 ref_index, CHECK_(nullHandle)); | |
430 constantTag tag = cp->tag_at(ref_index); | |
431 int ref_kind = cp->method_handle_ref_kind_at(index); | |
432 switch (ref_kind) { | |
433 case JVM_REF_getField: | |
434 case JVM_REF_getStatic: | |
435 case JVM_REF_putField: | |
436 case JVM_REF_putStatic: | |
437 check_property( | |
438 tag.is_field(), | |
439 "Invalid constant pool index %u in class file %s (not a field)", | |
440 ref_index, CHECK_(nullHandle)); | |
441 break; | |
442 case JVM_REF_invokeVirtual: | |
443 case JVM_REF_newInvokeSpecial: | |
444 check_property( | |
445 tag.is_method(), | |
446 "Invalid constant pool index %u in class file %s (not a method)", | |
447 ref_index, CHECK_(nullHandle)); | |
448 break; | |
10128
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
449 case JVM_REF_invokeStatic: |
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
450 case JVM_REF_invokeSpecial: |
10340
ccdecfece956
8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents:
10314
diff
changeset
|
451 check_property(tag.is_method() || |
ccdecfece956
8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents:
10314
diff
changeset
|
452 ((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()), |
10128
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
453 "Invalid constant pool index %u in class file %s (not a method)", |
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
454 ref_index, CHECK_(nullHandle)); |
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
455 break; |
1602 | 456 case JVM_REF_invokeInterface: |
457 check_property( | |
458 tag.is_interface_method(), | |
459 "Invalid constant pool index %u in class file %s (not an interface method)", | |
460 ref_index, CHECK_(nullHandle)); | |
461 break; | |
462 default: | |
463 classfile_parse_error( | |
464 "Bad method handle kind at constant pool index %u in class file %s", | |
465 index, CHECK_(nullHandle)); | |
466 } | |
467 // Keep the ref_index unchanged. It will be indirected at link-time. | |
468 } | |
469 break; | |
470 case JVM_CONSTANT_MethodType : | |
471 { | |
472 int ref_index = cp->method_type_index_at(index); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
473 check_property(valid_symbol_at(ref_index) && EnableInvokeDynamic, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
474 "Invalid constant pool index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
475 ref_index, CHECK_(nullHandle)); |
1602 | 476 } |
477 break; | |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
478 case JVM_CONSTANT_InvokeDynamic : |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
479 { |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
480 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
|
481 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
|
482 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
|
483 "Invalid constant pool index %u in class file %s", |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
484 name_and_type_ref_index, |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
485 CHECK_(nullHandle)); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
486 // 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
|
487 break; |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1608
diff
changeset
|
488 } |
0 | 489 default: |
1490
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1366
diff
changeset
|
490 fatal(err_msg("bad constant pool tag value %u", |
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1366
diff
changeset
|
491 cp->tag_at(index).value())); |
0 | 492 ShouldNotReachHere(); |
493 break; | |
494 } // end of switch | |
495 } // end of for | |
496 | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
497 if (_cp_patches != NULL) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
498 // need to treat this_class specially... |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2376
diff
changeset
|
499 assert(EnableInvokeDynamic, ""); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
500 int this_class_index; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
501 { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
502 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
|
503 u1* mark = cfs->current(); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
504 u2 flags = cfs->get_u2_fast(); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
505 this_class_index = cfs->get_u2_fast(); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
506 cfs->set_current(mark); // revert to mark |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
507 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
508 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
509 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
|
510 if (has_cp_patch_at(index)) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
511 guarantee_property(index != this_class_index, |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
512 "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
|
513 index, CHECK_(nullHandle)); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
514 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
|
515 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
516 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
517 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
518 |
0 | 519 if (!_need_verify) { |
520 return cp; | |
521 } | |
522 | |
523 // 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
|
524 // but not yet to the other entries |
0 | 525 for (index = 1; index < length; index++) { |
526 jbyte tag = cp->tag_at(index).value(); | |
527 switch (tag) { | |
528 case JVM_CONSTANT_UnresolvedClass: { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
529 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
|
530 // check the name, even if _cp_patches will overwrite it |
0 | 531 verify_legal_class_name(class_name, CHECK_(nullHandle)); |
532 break; | |
533 } | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
534 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
|
535 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
|
536 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
|
537 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
|
538 Symbol* name = cp->symbol_at(name_index); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
539 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
|
540 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
|
541 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
|
542 } else { |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
543 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
|
544 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
545 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
546 break; |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
547 } |
2461
758ba0bf7bcc
7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents:
2460
diff
changeset
|
548 case JVM_CONSTANT_InvokeDynamic: |
0 | 549 case JVM_CONSTANT_Fieldref: |
550 case JVM_CONSTANT_Methodref: | |
551 case JVM_CONSTANT_InterfaceMethodref: { | |
552 int name_and_type_ref_index = cp->name_and_type_ref_index_at(index); | |
553 // already verified to be utf8 | |
554 int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index); | |
555 // already verified to be utf8 | |
556 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
|
557 Symbol* name = cp->symbol_at(name_ref_index); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
558 Symbol* signature = cp->symbol_at(signature_ref_index); |
0 | 559 if (tag == JVM_CONSTANT_Fieldref) { |
560 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
|
561 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
|
562 // 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
|
563 // 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
|
564 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
|
565 throwIllegalSignature( |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
566 "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
|
567 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
568 } else { |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
569 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
|
570 } |
0 | 571 } else { |
572 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
|
573 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
|
574 // 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
|
575 // 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
|
576 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
|
577 throwIllegalSignature( |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
578 "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
|
579 } |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
580 } else { |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
581 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
|
582 } |
0 | 583 if (tag == JVM_CONSTANT_Methodref) { |
584 // 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
|
585 assert(name != NULL, "method name in constant pool is null"); |
0 | 586 unsigned int name_len = name->utf8_length(); |
587 assert(name_len > 0, "bad method name"); // already verified as legal name | |
588 if (name->byte_at(0) == '<') { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
589 if (name != vmSymbols::object_initializer_name()) { |
0 | 590 classfile_parse_error( |
591 "Bad method name at constant pool index %u in class file %s", | |
592 name_ref_index, CHECK_(nullHandle)); | |
593 } | |
594 } | |
595 } | |
596 } | |
597 break; | |
598 } | |
1602 | 599 case JVM_CONSTANT_MethodHandle: { |
600 int ref_index = cp->method_handle_index_at(index); | |
601 int ref_kind = cp->method_handle_ref_kind_at(index); | |
602 switch (ref_kind) { | |
603 case JVM_REF_invokeVirtual: | |
604 case JVM_REF_invokeStatic: | |
605 case JVM_REF_invokeSpecial: | |
606 case JVM_REF_newInvokeSpecial: | |
607 { | |
608 int name_and_type_ref_index = cp->name_and_type_ref_index_at(ref_index); | |
609 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
|
610 Symbol* name = cp->symbol_at(name_ref_index); |
1602 | 611 if (ref_kind == JVM_REF_newInvokeSpecial) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
612 if (name != vmSymbols::object_initializer_name()) { |
1602 | 613 classfile_parse_error( |
614 "Bad constructor name at constant pool index %u in class file %s", | |
615 name_ref_index, CHECK_(nullHandle)); | |
616 } | |
617 } else { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
618 if (name == vmSymbols::object_initializer_name()) { |
1602 | 619 classfile_parse_error( |
620 "Bad method name at constant pool index %u in class file %s", | |
621 name_ref_index, CHECK_(nullHandle)); | |
622 } | |
623 } | |
624 } | |
625 break; | |
626 // Other ref_kinds are already fully checked in previous pass. | |
627 } | |
628 break; | |
629 } | |
630 case JVM_CONSTANT_MethodType: { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
631 Symbol* no_name = vmSymbols::type_name(); // place holder |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
632 Symbol* signature = cp->method_type_signature_at(index); |
1602 | 633 verify_legal_method_signature(no_name, signature, CHECK_(nullHandle)); |
634 break; | |
635 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
636 case JVM_CONSTANT_Utf8: { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
637 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
|
638 } |
0 | 639 } // end of switch |
640 } // end of for | |
641 | |
642 return cp; | |
643 } | |
644 | |
645 | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
646 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
|
647 assert(EnableInvokeDynamic, ""); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
648 BasicType patch_type = T_VOID; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
649 |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
650 switch (cp->tag_at(index).value()) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
651 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
652 case JVM_CONSTANT_UnresolvedClass : |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
653 // Patching a class means pre-resolving it. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
654 // The name in the constant pool is ignored. |
1602 | 655 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
|
656 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
|
657 "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
|
658 index, CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
659 cp->klass_at_put(index, java_lang_Class::as_Klass(patch())); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
660 } else { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
661 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
|
662 "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
|
663 index, CHECK); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
664 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
|
665 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
|
666 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
667 break; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
668 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
669 case JVM_CONSTANT_String : |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
670 // skip this patch and don't clear it. Needs the oop array for resolved |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
671 // references to be created first. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
672 return; |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
673 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
674 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
|
675 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
|
676 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
|
677 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
|
678 patch_prim: |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
679 { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
680 jvalue value; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
681 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
|
682 guarantee_property(value_type == patch_type, |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
683 "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
|
684 index, CHECK); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
685 switch (value_type) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
686 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
|
687 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
|
688 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
|
689 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
|
690 default: assert(false, ""); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
691 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
692 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
693 break; |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
694 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
695 default: |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
696 // %%% 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
|
697 guarantee_property(!has_cp_patch_at(index), |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
698 "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
|
699 index, CHECK); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
700 return; |
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 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
703 // 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
|
704 clear_cp_patch_at(index); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
705 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
706 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
707 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
708 |
0 | 709 class NameSigHash: public ResourceObj { |
710 public: | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
711 Symbol* _name; // name |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
712 Symbol* _sig; // signature |
0 | 713 NameSigHash* _next; // Next entry in hash table |
714 }; | |
715 | |
716 | |
717 #define HASH_ROW_SIZE 256 | |
718 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
719 unsigned int hash(Symbol* name, Symbol* sig) { |
0 | 720 unsigned int raw_hash = 0; |
721 raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2); | |
722 raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize; | |
723 | |
724 return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE; | |
725 } | |
726 | |
727 | |
728 void initialize_hashtable(NameSigHash** table) { | |
729 memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE); | |
730 } | |
731 | |
732 // Return false if the name/sig combination is found in table. | |
733 // Return true if no duplicate is found. And name/sig is added as a new entry in table. | |
734 // The old format checker uses heap sort to find duplicates. | |
735 // 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
|
736 // 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
|
737 bool put_after_lookup(Symbol* name, Symbol* sig, NameSigHash** table) { |
0 | 738 assert(name != NULL, "name in constant pool is NULL"); |
739 | |
740 // First lookup for duplicates | |
741 int index = hash(name, sig); | |
742 NameSigHash* entry = table[index]; | |
743 while (entry != NULL) { | |
744 if (entry->_name == name && entry->_sig == sig) { | |
745 return false; | |
746 } | |
747 entry = entry->_next; | |
748 } | |
749 | |
750 // No duplicate is found, allocate a new entry and fill it. | |
751 entry = new NameSigHash(); | |
752 entry->_name = name; | |
753 entry->_sig = sig; | |
754 | |
755 // Insert into hash table | |
756 entry->_next = table[index]; | |
757 table[index] = entry; | |
758 | |
759 return true; | |
760 } | |
761 | |
762 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
763 Array<Klass*>* ClassFileParser::parse_interfaces(int length, |
0 | 764 Handle protection_domain, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
765 Symbol* class_name, |
6934 | 766 bool* has_default_methods, |
0 | 767 TRAPS) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
768 if (length == 0) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
769 _local_interfaces = Universe::the_empty_klass_array(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
770 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
771 ClassFileStream* cfs = stream(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
772 assert(length > 0, "only called for length>0"); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
773 _local_interfaces = MetadataFactory::new_array<Klass*>(_loader_data, length, NULL, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
774 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
775 int index; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
776 for (index = 0; index < length; index++) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
777 u2 interface_index = cfs->get_u2(CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
778 KlassHandle interf; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
779 check_property( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
780 valid_klass_reference_at(interface_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
781 "Interface name has bad constant pool index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
782 interface_index, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
783 if (_cp->tag_at(interface_index).is_klass()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
784 interf = KlassHandle(THREAD, _cp->resolved_klass_at(interface_index)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
785 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
786 Symbol* unresolved_klass = _cp->klass_name_at(interface_index); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
787 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
788 // Don't need to check legal name because it's checked when parsing constant pool. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
789 // But need to make sure it's not an array type. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
790 guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
791 "Bad interface name in class file %s", CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
792 Handle class_loader(THREAD, _loader_data->class_loader()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
793 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
794 // Call resolve_super so classcircularity is checked |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
795 Klass* k = SystemDictionary::resolve_super_or_fail(class_name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
796 unresolved_klass, class_loader, protection_domain, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
797 false, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
798 interf = KlassHandle(THREAD, k); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
799 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
800 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
801 if (!interf()->is_interface()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
802 THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
803 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
804 if (InstanceKlass::cast(interf())->has_default_methods()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
805 *has_default_methods = true; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
806 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
807 _local_interfaces->at_put(index, interf()); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
808 } |
0 | 809 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
810 if (!_need_verify || length <= 1) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
811 return _local_interfaces; |
6934 | 812 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
813 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
814 // Check if there's any duplicates in interfaces |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
815 ResourceMark rm(THREAD); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
816 NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
817 THREAD, NameSigHash*, HASH_ROW_SIZE); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
818 initialize_hashtable(interface_names); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
819 bool dup = false; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
820 { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
821 debug_only(No_Safepoint_Verifier nsv;) |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
822 for (index = 0; index < length; index++) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
823 Klass* k = _local_interfaces->at(index); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
824 Symbol* name = InstanceKlass::cast(k)->name(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
825 // If no duplicates, add (name, NULL) in hashtable interface_names. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
826 if (!put_after_lookup(name, NULL, interface_names)) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
827 dup = true; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
828 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
829 } |
0 | 830 } |
831 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
832 if (dup) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
833 classfile_parse_error("Duplicate interface name in class file %s", CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
834 } |
0 | 835 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
836 return _local_interfaces; |
0 | 837 } |
838 | |
839 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
840 void ClassFileParser::verify_constantvalue(int constantvalue_index, int signature_index, TRAPS) { |
0 | 841 // Make sure the constant pool entry is of a type appropriate to this field |
842 guarantee_property( | |
843 (constantvalue_index > 0 && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
844 constantvalue_index < _cp->length()), |
0 | 845 "Bad initial value index %u in ConstantValue attribute in class file %s", |
846 constantvalue_index, CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
847 constantTag value_type = _cp->tag_at(constantvalue_index); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
848 switch ( _cp->basic_type_for_signature_at(signature_index) ) { |
0 | 849 case T_LONG: |
850 guarantee_property(value_type.is_long(), "Inconsistent constant value type in class file %s", CHECK); | |
851 break; | |
852 case T_FLOAT: | |
853 guarantee_property(value_type.is_float(), "Inconsistent constant value type in class file %s", CHECK); | |
854 break; | |
855 case T_DOUBLE: | |
856 guarantee_property(value_type.is_double(), "Inconsistent constant value type in class file %s", CHECK); | |
857 break; | |
858 case T_BYTE: case T_CHAR: case T_SHORT: case T_BOOLEAN: case T_INT: | |
859 guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK); | |
860 break; | |
861 case T_OBJECT: | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
862 guarantee_property((_cp->symbol_at(signature_index)->equals("Ljava/lang/String;") |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
863 && value_type.is_string()), |
0 | 864 "Bad string initial value in class file %s", CHECK); |
865 break; | |
866 default: | |
867 classfile_parse_error( | |
868 "Unable to set initial value %u in class file %s", | |
869 constantvalue_index, CHECK); | |
870 } | |
871 } | |
872 | |
873 | |
874 // Parse attributes for a field. | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
875 void ClassFileParser::parse_field_attributes(u2 attributes_count, |
0 | 876 bool is_static, u2 signature_index, |
877 u2* constantvalue_index_addr, | |
878 bool* is_synthetic_addr, | |
879 u2* generic_signature_index_addr, | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
880 ClassFileParser::FieldAnnotationCollector* parsed_annotations, |
0 | 881 TRAPS) { |
882 ClassFileStream* cfs = stream(); | |
883 assert(attributes_count > 0, "length should be greater than 0"); | |
884 u2 constantvalue_index = 0; | |
885 u2 generic_signature_index = 0; | |
886 bool is_synthetic = false; | |
887 u1* runtime_visible_annotations = NULL; | |
888 int runtime_visible_annotations_length = 0; | |
889 u1* runtime_invisible_annotations = NULL; | |
890 int runtime_invisible_annotations_length = 0; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
891 u1* runtime_visible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
892 int runtime_visible_type_annotations_length = 0; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
893 u1* runtime_invisible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
894 int runtime_invisible_type_annotations_length = 0; |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
895 bool runtime_invisible_type_annotations_exists = false; |
0 | 896 while (attributes_count--) { |
897 cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length | |
898 u2 attribute_name_index = cfs->get_u2_fast(); | |
899 u4 attribute_length = cfs->get_u4_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
900 check_property(valid_symbol_at(attribute_name_index), |
0 | 901 "Invalid field attribute index %u in class file %s", |
902 attribute_name_index, | |
903 CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
904 Symbol* attribute_name = _cp->symbol_at(attribute_name_index); |
0 | 905 if (is_static && attribute_name == vmSymbols::tag_constant_value()) { |
906 // ignore if non-static | |
907 if (constantvalue_index != 0) { | |
908 classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK); | |
909 } | |
910 check_property( | |
911 attribute_length == 2, | |
912 "Invalid ConstantValue field attribute length %u in class file %s", | |
913 attribute_length, CHECK); | |
914 constantvalue_index = cfs->get_u2(CHECK); | |
915 if (_need_verify) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
916 verify_constantvalue(constantvalue_index, signature_index, CHECK); |
0 | 917 } |
918 } else if (attribute_name == vmSymbols::tag_synthetic()) { | |
919 if (attribute_length != 0) { | |
920 classfile_parse_error( | |
921 "Invalid Synthetic field attribute length %u in class file %s", | |
922 attribute_length, CHECK); | |
923 } | |
924 is_synthetic = true; | |
925 } else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120 | |
926 if (attribute_length != 0) { | |
927 classfile_parse_error( | |
928 "Invalid Deprecated field attribute length %u in class file %s", | |
929 attribute_length, CHECK); | |
930 } | |
931 } else if (_major_version >= JAVA_1_5_VERSION) { | |
932 if (attribute_name == vmSymbols::tag_signature()) { | |
933 if (attribute_length != 2) { | |
934 classfile_parse_error( | |
935 "Wrong size %u for field's Signature attribute in class file %s", | |
936 attribute_length, CHECK); | |
937 } | |
17577 | 938 generic_signature_index = parse_generic_signature_attribute(CHECK); |
0 | 939 } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) { |
940 runtime_visible_annotations_length = attribute_length; | |
941 runtime_visible_annotations = cfs->get_u1_buffer(); | |
942 assert(runtime_visible_annotations != NULL, "null visible annotations"); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
943 parse_annotations(runtime_visible_annotations, |
7587 | 944 runtime_visible_annotations_length, |
945 parsed_annotations, | |
946 CHECK); | |
0 | 947 cfs->skip_u1(runtime_visible_annotations_length, CHECK); |
948 } else if (PreserveAllAnnotations && attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { | |
949 runtime_invisible_annotations_length = attribute_length; | |
950 runtime_invisible_annotations = cfs->get_u1_buffer(); | |
951 assert(runtime_invisible_annotations != NULL, "null invisible annotations"); | |
952 cfs->skip_u1(runtime_invisible_annotations_length, CHECK); | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
953 } else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) { |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
954 if (runtime_visible_type_annotations != NULL) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
955 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
956 "Multiple RuntimeVisibleTypeAnnotations attributes for field in class file %s", CHECK); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
957 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
958 runtime_visible_type_annotations_length = attribute_length; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
959 runtime_visible_type_annotations = cfs->get_u1_buffer(); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
960 assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
961 cfs->skip_u1(runtime_visible_type_annotations_length, CHECK); |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
962 } else if (attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
963 if (runtime_invisible_type_annotations_exists) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
964 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
965 "Multiple RuntimeInvisibleTypeAnnotations attributes for field in class file %s", CHECK); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
966 } else { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
967 runtime_invisible_type_annotations_exists = true; |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
968 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
969 if (PreserveAllAnnotations) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
970 runtime_invisible_type_annotations_length = attribute_length; |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
971 runtime_invisible_type_annotations = cfs->get_u1_buffer(); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
972 assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations"); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
973 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
974 cfs->skip_u1(attribute_length, CHECK); |
0 | 975 } else { |
976 cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes | |
977 } | |
978 } else { | |
979 cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes | |
980 } | |
981 } | |
982 | |
983 *constantvalue_index_addr = constantvalue_index; | |
984 *is_synthetic_addr = is_synthetic; | |
985 *generic_signature_index_addr = generic_signature_index; | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
986 AnnotationArray* a = assemble_annotations(runtime_visible_annotations, |
0 | 987 runtime_visible_annotations_length, |
988 runtime_invisible_annotations, | |
989 runtime_invisible_annotations_length, | |
990 CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
991 parsed_annotations->set_field_annotations(a); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
992 a = assemble_annotations(runtime_visible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
993 runtime_visible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
994 runtime_invisible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
995 runtime_invisible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
996 CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
997 parsed_annotations->set_field_type_annotations(a); |
0 | 998 return; |
999 } | |
1000 | |
1001 | |
1002 // Field allocation types. Used for computing field offsets. | |
1003 | |
1004 enum FieldAllocationType { | |
1005 STATIC_OOP, // Oops | |
1006 STATIC_BYTE, // Boolean, Byte, char | |
1007 STATIC_SHORT, // shorts | |
1008 STATIC_WORD, // ints | |
3938 | 1009 STATIC_DOUBLE, // aligned long or double |
0 | 1010 NONSTATIC_OOP, |
1011 NONSTATIC_BYTE, | |
1012 NONSTATIC_SHORT, | |
1013 NONSTATIC_WORD, | |
1014 NONSTATIC_DOUBLE, | |
3938 | 1015 MAX_FIELD_ALLOCATION_TYPE, |
1016 BAD_ALLOCATION_TYPE = -1 | |
0 | 1017 }; |
1018 | |
3938 | 1019 static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = { |
1020 BAD_ALLOCATION_TYPE, // 0 | |
1021 BAD_ALLOCATION_TYPE, // 1 | |
1022 BAD_ALLOCATION_TYPE, // 2 | |
1023 BAD_ALLOCATION_TYPE, // 3 | |
6848
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1024 NONSTATIC_BYTE , // T_BOOLEAN = 4, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1025 NONSTATIC_SHORT, // T_CHAR = 5, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1026 NONSTATIC_WORD, // T_FLOAT = 6, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1027 NONSTATIC_DOUBLE, // T_DOUBLE = 7, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1028 NONSTATIC_BYTE, // T_BYTE = 8, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1029 NONSTATIC_SHORT, // T_SHORT = 9, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1030 NONSTATIC_WORD, // T_INT = 10, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1031 NONSTATIC_DOUBLE, // T_LONG = 11, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1032 NONSTATIC_OOP, // T_OBJECT = 12, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1033 NONSTATIC_OOP, // T_ARRAY = 13, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1034 BAD_ALLOCATION_TYPE, // T_VOID = 14, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1035 BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1036 BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1037 BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1038 BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1039 BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
3938 | 1040 BAD_ALLOCATION_TYPE, // 0 |
1041 BAD_ALLOCATION_TYPE, // 1 | |
1042 BAD_ALLOCATION_TYPE, // 2 | |
1043 BAD_ALLOCATION_TYPE, // 3 | |
6848
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1044 STATIC_BYTE , // T_BOOLEAN = 4, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1045 STATIC_SHORT, // T_CHAR = 5, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1046 STATIC_WORD, // T_FLOAT = 6, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1047 STATIC_DOUBLE, // T_DOUBLE = 7, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1048 STATIC_BYTE, // T_BYTE = 8, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1049 STATIC_SHORT, // T_SHORT = 9, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1050 STATIC_WORD, // T_INT = 10, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1051 STATIC_DOUBLE, // T_LONG = 11, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1052 STATIC_OOP, // T_OBJECT = 12, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1053 STATIC_OOP, // T_ARRAY = 13, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1054 BAD_ALLOCATION_TYPE, // T_VOID = 14, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1055 BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1056 BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1057 BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1058 BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
8e47bac5643a
7054512: Compress class pointers after perm gen removal
roland
parents:
6735
diff
changeset
|
1059 BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
0 | 1060 }; |
1061 | |
3938 | 1062 static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) { |
1063 assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values"); | |
1064 FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)]; | |
1065 assert(result != BAD_ALLOCATION_TYPE, "bad type"); | |
1066 return result; | |
1067 } | |
1068 | |
1069 class FieldAllocationCount: public ResourceObj { | |
1070 public: | |
4744
cd5d8cafcc84
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
3938
diff
changeset
|
1071 u2 count[MAX_FIELD_ALLOCATION_TYPE]; |
3938 | 1072 |
1073 FieldAllocationCount() { | |
1074 for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) { | |
1075 count[i] = 0; | |
1076 } | |
1077 } | |
1078 | |
1079 FieldAllocationType update(bool is_static, BasicType type) { | |
1080 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
|
1081 // 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
|
1082 assert(count[atype] < 0xFFFF, "More than 65535 fields"); |
3938 | 1083 count[atype]++; |
1084 return atype; | |
1085 } | |
1086 }; | |
1087 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1088 Array<u2>* ClassFileParser::parse_fields(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1089 bool is_interface, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1090 FieldAllocationCount *fac, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1091 u2* java_fields_count_ptr, TRAPS) { |
0 | 1092 ClassFileStream* cfs = stream(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1093 cfs->guarantee_more(2, CHECK_NULL); // length |
0 | 1094 u2 length = cfs->get_u2_fast(); |
3938 | 1095 *java_fields_count_ptr = length; |
1096 | |
1097 int num_injected = 0; | |
1098 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
|
1099 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
|
1100 |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1101 // 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
|
1102 // [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
|
1103 // 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
|
1104 // 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
|
1105 // 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
|
1106 // 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
|
1107 // other fields data. |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1108 // |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1109 // 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
|
1110 // 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
|
1111 // ... |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1112 // 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
|
1113 // [generic signature index] |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1114 // [generic signature index] |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1115 // ... |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1116 // |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1117 // 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
|
1118 // 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
|
1119 // 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
|
1120 // 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
|
1121 ResourceMark rm(THREAD); |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1122 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
|
1123 THREAD, u2, total_fields * (FieldInfo::field_slots + 1)); |
0 | 1124 |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1125 // 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
|
1126 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
|
1127 int num_generic_signature = 0; |
0 | 1128 for (int n = 0; n < length; n++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1129 cfs->guarantee_more(8, CHECK_NULL); // access_flags, name_index, descriptor_index, attributes_count |
0 | 1130 |
1131 AccessFlags access_flags; | |
1132 jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1133 verify_legal_field_modifiers(flags, is_interface, CHECK_NULL); |
0 | 1134 access_flags.set_flags(flags); |
1135 | |
1136 u2 name_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1137 int cp_size = _cp->length(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1138 check_property(valid_symbol_at(name_index), |
0 | 1139 "Invalid constant pool index %u for field name in class file %s", |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1140 name_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1141 CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1142 Symbol* name = _cp->symbol_at(name_index); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1143 verify_legal_field_name(name, CHECK_NULL); |
0 | 1144 |
1145 u2 signature_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1146 check_property(valid_symbol_at(signature_index), |
0 | 1147 "Invalid constant pool index %u for field signature in class file %s", |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1148 signature_index, CHECK_NULL); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1149 Symbol* sig = _cp->symbol_at(signature_index); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1150 verify_legal_field_signature(name, sig, CHECK_NULL); |
0 | 1151 |
1152 u2 constantvalue_index = 0; | |
1153 bool is_synthetic = false; | |
1154 u2 generic_signature_index = 0; | |
1155 bool is_static = access_flags.is_static(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1156 FieldAnnotationCollector parsed_annotations(_loader_data); |
0 | 1157 |
1158 u2 attributes_count = cfs->get_u2_fast(); | |
1159 if (attributes_count > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1160 parse_field_attributes(attributes_count, is_static, signature_index, |
0 | 1161 &constantvalue_index, &is_synthetic, |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1162 &generic_signature_index, &parsed_annotations, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1163 CHECK_NULL); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1164 if (parsed_annotations.field_annotations() != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1165 if (_fields_annotations == NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1166 _fields_annotations = MetadataFactory::new_array<AnnotationArray*>( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1167 _loader_data, length, NULL, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1168 CHECK_NULL); |
0 | 1169 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1170 _fields_annotations->at_put(n, parsed_annotations.field_annotations()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1171 parsed_annotations.set_field_annotations(NULL); |
0 | 1172 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1173 if (parsed_annotations.field_type_annotations() != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1174 if (_fields_type_annotations == NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1175 _fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1176 _loader_data, length, NULL, |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
1177 CHECK_NULL); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
1178 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1179 _fields_type_annotations->at_put(n, parsed_annotations.field_type_annotations()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1180 parsed_annotations.set_field_type_annotations(NULL); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
1181 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1182 |
0 | 1183 if (is_synthetic) { |
1184 access_flags.set_is_synthetic(); | |
1185 } | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1186 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
|
1187 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
|
1188 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
|
1189 generic_signature_slot ++; |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1190 num_generic_signature ++; |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1191 } |
0 | 1192 } |
1193 | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1194 FieldInfo* field = FieldInfo::from_field_array(fa, n); |
3938 | 1195 field->initialize(access_flags.as_short(), |
1196 name_index, | |
1197 signature_index, | |
7587 | 1198 constantvalue_index); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1199 BasicType type = _cp->basic_type_for_signature_at(signature_index); |
0 | 1200 |
1201 // Remember how many oops we encountered and compute allocation type | |
3938 | 1202 FieldAllocationType atype = fac->update(is_static, type); |
7587 | 1203 field->set_allocation_type(atype); |
1204 | |
1205 // After field is initialized with type, we can augment it with aux info | |
1206 if (parsed_annotations.has_any_annotations()) | |
1207 parsed_annotations.apply_to(field); | |
3938 | 1208 } |
1209 | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1210 int index = length; |
3938 | 1211 if (num_injected != 0) { |
1212 for (int n = 0; n < num_injected; n++) { | |
1213 // Check for duplicates | |
1214 if (injected[n].may_be_java) { | |
1215 Symbol* name = injected[n].name(); | |
1216 Symbol* signature = injected[n].signature(); | |
1217 bool duplicate = false; | |
1218 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
|
1219 FieldInfo* f = FieldInfo::from_field_array(fa, i); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1220 if (name == _cp->symbol_at(f->name_index()) && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1221 signature == _cp->symbol_at(f->signature_index())) { |
3938 | 1222 // Symbol is desclared in Java so skip this one |
1223 duplicate = true; | |
1224 break; | |
1225 } | |
1226 } | |
1227 if (duplicate) { | |
1228 // These will be removed from the field array at the end | |
1229 continue; | |
1230 } | |
1231 } | |
1232 | |
1233 // Injected field | |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1234 FieldInfo* field = FieldInfo::from_field_array(fa, index); |
3938 | 1235 field->initialize(JVM_ACC_FIELD_INTERNAL, |
1236 injected[n].name_index, | |
1237 injected[n].signature_index, | |
1238 0); | |
1239 | |
1240 BasicType type = FieldType::basic_type(injected[n].signature()); | |
1241 | |
1242 // Remember how many oops we encountered and compute allocation type | |
1243 FieldAllocationType atype = fac->update(false, type); | |
7587 | 1244 field->set_allocation_type(atype); |
3938 | 1245 index++; |
1246 } | |
6100
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 |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1249 // 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
|
1250 // 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
|
1251 // 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
|
1252 // 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
|
1253 // for generic signature indexes are discarded. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1254 Array<u2>* fields = MetadataFactory::new_array<u2>( |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1255 _loader_data, index * FieldInfo::field_slots + num_generic_signature, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1256 CHECK_NULL); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1257 _fields = fields; // save in case of error |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1258 { |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1259 int i = 0; |
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1260 for (; i < index * FieldInfo::field_slots; i++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1261 fields->at_put(i, fa[i]); |
3938 | 1262 } |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1263 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
|
1264 j < generic_signature_slot; j++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1265 fields->at_put(i++, fa[j]); |
6100
71afdabfd05b
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
6038
diff
changeset
|
1266 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1267 assert(i == fields->length(), ""); |
0 | 1268 } |
1269 | |
1270 if (_need_verify && length > 1) { | |
1271 // Check duplicated fields | |
1272 ResourceMark rm(THREAD); | |
1273 NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( | |
1274 THREAD, NameSigHash*, HASH_ROW_SIZE); | |
1275 initialize_hashtable(names_and_sigs); | |
1276 bool dup = false; | |
1277 { | |
1278 debug_only(No_Safepoint_Verifier nsv;) | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1279 for (AllFieldStream fs(fields, _cp); !fs.done(); fs.next()) { |
3938 | 1280 Symbol* name = fs.name(); |
1281 Symbol* sig = fs.signature(); | |
0 | 1282 // If no duplicates, add name/signature in hashtable names_and_sigs. |
1283 if (!put_after_lookup(name, sig, names_and_sigs)) { | |
1284 dup = true; | |
1285 break; | |
1286 } | |
1287 } | |
1288 } | |
1289 if (dup) { | |
1290 classfile_parse_error("Duplicate field name&signature in class file %s", | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1291 CHECK_NULL); |
0 | 1292 } |
1293 } | |
1294 | |
1295 return fields; | |
1296 } | |
1297 | |
1298 | |
1299 static void copy_u2_with_conversion(u2* dest, u2* src, int length) { | |
1300 while (length-- > 0) { | |
1301 *dest++ = Bytes::get_Java_u2((u1*) (src++)); | |
1302 } | |
1303 } | |
1304 | |
1305 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1306 u2* ClassFileParser::parse_exception_table(u4 code_length, |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1307 u4 exception_table_length, |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1308 TRAPS) { |
0 | 1309 ClassFileStream* cfs = stream(); |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1310 |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1311 u2* exception_table_start = cfs->get_u2_buffer(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1312 assert(exception_table_start != NULL, "null exception table"); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1313 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
|
1314 // 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
|
1315 if (_need_verify) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1316 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
|
1317 u2 start_pc = cfs->get_u2_fast(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1318 u2 end_pc = cfs->get_u2_fast(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1319 u2 handler_pc = cfs->get_u2_fast(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1320 u2 catch_type_index = cfs->get_u2_fast(); |
0 | 1321 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
|
1322 "Illegal exception table range in class file %s", |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1323 CHECK_NULL); |
0 | 1324 guarantee_property(handler_pc < code_length, |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1325 "Illegal exception table handler in class file %s", |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1326 CHECK_NULL); |
0 | 1327 if (catch_type_index != 0) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1328 guarantee_property(valid_klass_reference_at(catch_type_index), |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1329 "Catch type in exception table has bad constant type in class file %s", CHECK_NULL); |
0 | 1330 } |
1331 } | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1332 } else { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1333 cfs->skip_u2_fast(exception_table_length * 4); |
0 | 1334 } |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
1335 return exception_table_start; |
0 | 1336 } |
1337 | |
1338 void ClassFileParser::parse_linenumber_table( | |
1339 u4 code_attribute_length, u4 code_length, | |
1340 CompressedLineNumberWriteStream** write_stream, TRAPS) { | |
1341 ClassFileStream* cfs = stream(); | |
1342 unsigned int num_entries = cfs->get_u2(CHECK); | |
1343 | |
1344 // Each entry is a u2 start_pc, and a u2 line_number | |
1345 unsigned int length_in_bytes = num_entries * (sizeof(u2) + sizeof(u2)); | |
1346 | |
1347 // Verify line number attribute and table length | |
1348 check_property( | |
1349 code_attribute_length == sizeof(u2) + length_in_bytes, | |
1350 "LineNumberTable attribute has wrong length in class file %s", CHECK); | |
1351 | |
1352 cfs->guarantee_more(length_in_bytes, CHECK); | |
1353 | |
1354 if ((*write_stream) == NULL) { | |
1355 if (length_in_bytes > fixed_buffer_size) { | |
1356 (*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes); | |
1357 } else { | |
1358 (*write_stream) = new CompressedLineNumberWriteStream( | |
1359 linenumbertable_buffer, fixed_buffer_size); | |
1360 } | |
1361 } | |
1362 | |
1363 while (num_entries-- > 0) { | |
1364 u2 bci = cfs->get_u2_fast(); // start_pc | |
1365 u2 line = cfs->get_u2_fast(); // line_number | |
1366 guarantee_property(bci < code_length, | |
1367 "Invalid pc in LineNumberTable in class file %s", CHECK); | |
1368 (*write_stream)->write_pair(bci, line); | |
1369 } | |
1370 } | |
1371 | |
1372 | |
1373 // Class file LocalVariableTable elements. | |
1374 class Classfile_LVT_Element VALUE_OBJ_CLASS_SPEC { | |
1375 public: | |
1376 u2 start_bci; | |
1377 u2 length; | |
1378 u2 name_cp_index; | |
1379 u2 descriptor_cp_index; | |
1380 u2 slot; | |
1381 }; | |
1382 | |
1383 | |
6197 | 1384 class LVT_Hash: public CHeapObj<mtClass> { |
0 | 1385 public: |
1386 LocalVariableTableElement *_elem; // element | |
1387 LVT_Hash* _next; // Next entry in hash table | |
1388 }; | |
1389 | |
1390 unsigned int hash(LocalVariableTableElement *elem) { | |
1391 unsigned int raw_hash = elem->start_bci; | |
1392 | |
1393 raw_hash = elem->length + raw_hash * 37; | |
1394 raw_hash = elem->name_cp_index + raw_hash * 37; | |
1395 raw_hash = elem->slot + raw_hash * 37; | |
1396 | |
1397 return raw_hash % HASH_ROW_SIZE; | |
1398 } | |
1399 | |
1400 void initialize_hashtable(LVT_Hash** table) { | |
1401 for (int i = 0; i < HASH_ROW_SIZE; i++) { | |
1402 table[i] = NULL; | |
1403 } | |
1404 } | |
1405 | |
1406 void clear_hashtable(LVT_Hash** table) { | |
1407 for (int i = 0; i < HASH_ROW_SIZE; i++) { | |
1408 LVT_Hash* current = table[i]; | |
1409 LVT_Hash* next; | |
1410 while (current != NULL) { | |
1411 next = current->_next; | |
1412 current->_next = NULL; | |
1413 delete(current); | |
1414 current = next; | |
1415 } | |
1416 table[i] = NULL; | |
1417 } | |
1418 } | |
1419 | |
1420 LVT_Hash* LVT_lookup(LocalVariableTableElement *elem, int index, LVT_Hash** table) { | |
1421 LVT_Hash* entry = table[index]; | |
1422 | |
1423 /* | |
1424 * 3-tuple start_bci/length/slot has to be unique key, | |
1425 * so the following comparison seems to be redundant: | |
1426 * && elem->name_cp_index == entry->_elem->name_cp_index | |
1427 */ | |
1428 while (entry != NULL) { | |
1429 if (elem->start_bci == entry->_elem->start_bci | |
1430 && elem->length == entry->_elem->length | |
1431 && elem->name_cp_index == entry->_elem->name_cp_index | |
1432 && elem->slot == entry->_elem->slot | |
1433 ) { | |
1434 return entry; | |
1435 } | |
1436 entry = entry->_next; | |
1437 } | |
1438 return NULL; | |
1439 } | |
1440 | |
1441 // Return false if the local variable is found in table. | |
1442 // Return true if no duplicate is found. | |
1443 // And local variable is added as a new entry in table. | |
1444 bool LVT_put_after_lookup(LocalVariableTableElement *elem, LVT_Hash** table) { | |
1445 // First lookup for duplicates | |
1446 int index = hash(elem); | |
1447 LVT_Hash* entry = LVT_lookup(elem, index, table); | |
1448 | |
1449 if (entry != NULL) { | |
1450 return false; | |
1451 } | |
1452 // No duplicate is found, allocate a new entry and fill it. | |
1453 if ((entry = new LVT_Hash()) == NULL) { | |
1454 return false; | |
1455 } | |
1456 entry->_elem = elem; | |
1457 | |
1458 // Insert into hash table | |
1459 entry->_next = table[index]; | |
1460 table[index] = entry; | |
1461 | |
1462 return true; | |
1463 } | |
1464 | |
1465 void copy_lvt_element(Classfile_LVT_Element *src, LocalVariableTableElement *lvt) { | |
1466 lvt->start_bci = Bytes::get_Java_u2((u1*) &src->start_bci); | |
1467 lvt->length = Bytes::get_Java_u2((u1*) &src->length); | |
1468 lvt->name_cp_index = Bytes::get_Java_u2((u1*) &src->name_cp_index); | |
1469 lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index); | |
1470 lvt->signature_cp_index = 0; | |
1471 lvt->slot = Bytes::get_Java_u2((u1*) &src->slot); | |
1472 } | |
1473 | |
1474 // Function is used to parse both attributes: | |
1475 // LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT) | |
1476 u2* ClassFileParser::parse_localvariable_table(u4 code_length, | |
1477 u2 max_locals, | |
1478 u4 code_attribute_length, | |
1479 u2* localvariable_table_length, | |
1480 bool isLVTT, | |
1481 TRAPS) { | |
1482 ClassFileStream* cfs = stream(); | |
1483 const char * tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable"; | |
1484 *localvariable_table_length = cfs->get_u2(CHECK_NULL); | |
1485 unsigned int size = (*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2); | |
1486 // Verify local variable table attribute has right length | |
1487 if (_need_verify) { | |
1488 guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)), | |
1489 "%s has wrong length in class file %s", tbl_name, CHECK_NULL); | |
1490 } | |
1491 u2* localvariable_table_start = cfs->get_u2_buffer(); | |
1492 assert(localvariable_table_start != NULL, "null local variable table"); | |
1493 if (!_need_verify) { | |
1494 cfs->skip_u2_fast(size); | |
1495 } else { | |
1496 cfs->guarantee_more(size * 2, CHECK_NULL); | |
1497 for(int i = 0; i < (*localvariable_table_length); i++) { | |
1498 u2 start_pc = cfs->get_u2_fast(); | |
1499 u2 length = cfs->get_u2_fast(); | |
1500 u2 name_index = cfs->get_u2_fast(); | |
1501 u2 descriptor_index = cfs->get_u2_fast(); | |
1502 u2 index = cfs->get_u2_fast(); | |
1503 // Assign to a u4 to avoid overflow | |
1504 u4 end_pc = (u4)start_pc + (u4)length; | |
1505 | |
1506 if (start_pc >= code_length) { | |
1507 classfile_parse_error( | |
1508 "Invalid start_pc %u in %s in class file %s", | |
1509 start_pc, tbl_name, CHECK_NULL); | |
1510 } | |
1511 if (end_pc > code_length) { | |
1512 classfile_parse_error( | |
1513 "Invalid length %u in %s in class file %s", | |
1514 length, tbl_name, CHECK_NULL); | |
1515 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1516 int cp_size = _cp->length(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1517 guarantee_property(valid_symbol_at(name_index), |
0 | 1518 "Name index %u in %s has bad constant type in class file %s", |
1519 name_index, tbl_name, CHECK_NULL); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1520 guarantee_property(valid_symbol_at(descriptor_index), |
0 | 1521 "Signature index %u in %s has bad constant type in class file %s", |
1522 descriptor_index, tbl_name, CHECK_NULL); | |
1523 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1524 Symbol* name = _cp->symbol_at(name_index); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1525 Symbol* sig = _cp->symbol_at(descriptor_index); |
0 | 1526 verify_legal_field_name(name, CHECK_NULL); |
1527 u2 extra_slot = 0; | |
1528 if (!isLVTT) { | |
1529 verify_legal_field_signature(name, sig, CHECK_NULL); | |
1530 | |
1531 // 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
|
1532 if (sig == vmSymbols::type_signature(T_DOUBLE) || |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
1533 sig == vmSymbols::type_signature(T_LONG)) { |
0 | 1534 extra_slot = 1; |
1535 } | |
1536 } | |
1537 guarantee_property((index + extra_slot) < max_locals, | |
1538 "Invalid index %u in %s in class file %s", | |
1539 index, tbl_name, CHECK_NULL); | |
1540 } | |
1541 } | |
1542 return localvariable_table_start; | |
1543 } | |
1544 | |
1545 | |
1546 void ClassFileParser::parse_type_array(u2 array_length, u4 code_length, u4* u1_index, u4* u2_index, | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1547 u1* u1_array, u2* u2_array, TRAPS) { |
0 | 1548 ClassFileStream* cfs = stream(); |
1549 u2 index = 0; // index in the array with long/double occupying two slots | |
1550 u4 i1 = *u1_index; | |
1551 u4 i2 = *u2_index + 1; | |
1552 for(int i = 0; i < array_length; i++) { | |
1553 u1 tag = u1_array[i1++] = cfs->get_u1(CHECK); | |
1554 index++; | |
1555 if (tag == ITEM_Long || tag == ITEM_Double) { | |
1556 index++; | |
1557 } else if (tag == ITEM_Object) { | |
1558 u2 class_index = u2_array[i2++] = cfs->get_u2(CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1559 guarantee_property(valid_klass_reference_at(class_index), |
0 | 1560 "Bad class index %u in StackMap in class file %s", |
1561 class_index, CHECK); | |
1562 } else if (tag == ITEM_Uninitialized) { | |
1563 u2 offset = u2_array[i2++] = cfs->get_u2(CHECK); | |
1564 guarantee_property( | |
1565 offset < code_length, | |
1566 "Bad uninitialized type offset %u in StackMap in class file %s", | |
1567 offset, CHECK); | |
1568 } else { | |
1569 guarantee_property( | |
1570 tag <= (u1)ITEM_Uninitialized, | |
1571 "Unknown variable type %u in StackMap in class file %s", | |
1572 tag, CHECK); | |
1573 } | |
1574 } | |
1575 u2_array[*u2_index] = index; | |
1576 *u1_index = i1; | |
1577 *u2_index = i2; | |
1578 } | |
1579 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1580 u1* ClassFileParser::parse_stackmap_table( |
0 | 1581 u4 code_attribute_length, TRAPS) { |
1582 if (code_attribute_length == 0) | |
1583 return NULL; | |
1584 | |
1585 ClassFileStream* cfs = stream(); | |
1586 u1* stackmap_table_start = cfs->get_u1_buffer(); | |
1587 assert(stackmap_table_start != NULL, "null stackmap table"); | |
1588 | |
1589 // check code_attribute_length first | |
1590 stream()->skip_u1(code_attribute_length, CHECK_NULL); | |
1591 | |
1592 if (!_need_verify && !DumpSharedSpaces) { | |
1593 return NULL; | |
1594 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1595 return stackmap_table_start; |
0 | 1596 } |
1597 | |
1598 u2* ClassFileParser::parse_checked_exceptions(u2* checked_exceptions_length, | |
1599 u4 method_attribute_length, | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1600 TRAPS) { |
0 | 1601 ClassFileStream* cfs = stream(); |
1602 cfs->guarantee_more(2, CHECK_NULL); // checked_exceptions_length | |
1603 *checked_exceptions_length = cfs->get_u2_fast(); | |
1604 unsigned int size = (*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2); | |
1605 u2* checked_exceptions_start = cfs->get_u2_buffer(); | |
1606 assert(checked_exceptions_start != NULL, "null checked exceptions"); | |
1607 if (!_need_verify) { | |
1608 cfs->skip_u2_fast(size); | |
1609 } else { | |
1610 // Verify each value in the checked exception table | |
1611 u2 checked_exception; | |
1612 u2 len = *checked_exceptions_length; | |
1613 cfs->guarantee_more(2 * len, CHECK_NULL); | |
1614 for (int i = 0; i < len; i++) { | |
1615 checked_exception = cfs->get_u2_fast(); | |
1616 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1617 valid_klass_reference_at(checked_exception), |
0 | 1618 "Exception name has bad type at constant pool %u in class file %s", |
1619 checked_exception, CHECK_NULL); | |
1620 } | |
1621 } | |
1622 // check exceptions attribute length | |
1623 if (_need_verify) { | |
1624 guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) + | |
1625 sizeof(u2) * size), | |
1626 "Exceptions attribute has wrong length in class file %s", CHECK_NULL); | |
1627 } | |
1628 return checked_exceptions_start; | |
1629 } | |
1630 | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
1631 void ClassFileParser::throwIllegalSignature( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
1632 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
|
1633 ResourceMark rm(THREAD); |
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
1634 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
|
1635 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
|
1636 "%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
|
1637 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
|
1638 } |
0 | 1639 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1640 // Skip an annotation. Return >=limit if there is any problem. |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1641 int ClassFileParser::skip_annotation(u1* buffer, int limit, int index) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1642 // annotation := atype:u2 do(nmem:u2) {member:u2 value} |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1643 // value := switch (tag:u1) { ... } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1644 index += 2; // skip atype |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1645 if ((index += 2) >= limit) return limit; // read nmem |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1646 int nmem = Bytes::get_Java_u2(buffer+index-2); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1647 while (--nmem >= 0 && index < limit) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1648 index += 2; // skip member |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1649 index = skip_annotation_value(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1650 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1651 return index; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1652 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1653 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1654 // Skip an annotation value. Return >=limit if there is any problem. |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1655 int ClassFileParser::skip_annotation_value(u1* buffer, int limit, int index) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1656 // value := switch (tag:u1) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1657 // case B, C, I, S, Z, D, F, J, c: con:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1658 // case e: e_class:u2 e_name:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1659 // case s: s_con:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1660 // case [: do(nval:u2) {value}; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1661 // case @: annotation; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1662 // case s: s_con:u2; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1663 // } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1664 if ((index += 1) >= limit) return limit; // read tag |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1665 u1 tag = buffer[index-1]; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1666 switch (tag) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1667 case 'B': case 'C': case 'I': case 'S': case 'Z': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1668 case 'D': case 'F': case 'J': case 'c': case 's': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1669 index += 2; // skip con or s_con |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1670 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1671 case 'e': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1672 index += 4; // skip e_class, e_name |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1673 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1674 case '[': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1675 { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1676 if ((index += 2) >= limit) return limit; // read nval |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1677 int nval = Bytes::get_Java_u2(buffer+index-2); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1678 while (--nval >= 0 && index < limit) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1679 index = skip_annotation_value(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1680 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1681 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1682 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1683 case '@': |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1684 index = skip_annotation(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1685 break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1686 default: |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1687 assert(false, "annotation tag"); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1688 return limit; // bad tag byte |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1689 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1690 return index; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1691 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1692 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1693 // Sift through annotations, looking for those significant to the VM: |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1694 void ClassFileParser::parse_annotations(u1* buffer, int limit, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1695 ClassFileParser::AnnotationCollector* coll, |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1696 TRAPS) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1697 // annotations := do(nann:u2) {annotation} |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1698 int index = 0; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1699 if ((index += 2) >= limit) return; // read nann |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1700 int nann = Bytes::get_Java_u2(buffer+index-2); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1701 enum { // initial annotation layout |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1702 atype_off = 0, // utf8 such as 'Ljava/lang/annotation/Retention;' |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1703 count_off = 2, // u2 such as 1 (one value) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1704 member_off = 4, // utf8 such as 'value' |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1705 tag_off = 6, // u1 such as 'c' (type) or 'e' (enum) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1706 e_tag_val = 'e', |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1707 e_type_off = 7, // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;' |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1708 e_con_off = 9, // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME' |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1709 e_size = 11, // end of 'e' annotation |
7587 | 1710 c_tag_val = 'c', // payload is type |
1711 c_con_off = 7, // utf8 payload, such as 'I' | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1712 c_size = 9, // end of 'c' annotation |
7587 | 1713 s_tag_val = 's', // payload is String |
1714 s_con_off = 7, // utf8 payload, such as 'Ljava/lang/String;' | |
1715 s_size = 9, | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1716 min_size = 6 // smallest possible size (zero members) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1717 }; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1718 while ((--nann) >= 0 && (index-2 + min_size <= limit)) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1719 int index0 = index; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1720 index = skip_annotation(buffer, limit, index); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1721 u1* abase = buffer + index0; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1722 int atype = Bytes::get_Java_u2(abase + atype_off); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1723 int count = Bytes::get_Java_u2(abase + count_off); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1724 Symbol* aname = check_symbol_at(_cp, atype); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1725 if (aname == NULL) break; // invalid annotation name |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1726 Symbol* member = NULL; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1727 if (count >= 1) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1728 int member_index = Bytes::get_Java_u2(abase + member_off); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1729 member = check_symbol_at(_cp, member_index); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1730 if (member == NULL) break; // invalid member name |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1731 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1732 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1733 // Here is where parsing particular annotations will take place. |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1734 AnnotationCollector::ID id = coll->annotation_index(_loader_data, aname); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1735 if (id == AnnotationCollector::_unknown) continue; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1736 coll->set_annotation(id); |
7587 | 1737 |
1738 if (id == AnnotationCollector::_sun_misc_Contended) { | |
10305
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1739 // @Contended can optionally specify the contention group. |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1740 // |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1741 // Contended group defines the equivalence class over the fields: |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1742 // the fields within the same contended group are not treated distinct. |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1743 // The only exception is default group, which does not incur the |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1744 // equivalence. Naturally, contention group for classes is meaningless. |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1745 // |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1746 // While the contention group is specified as String, annotation |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1747 // values are already interned, and we might as well use the constant |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1748 // pool index as the group tag. |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1749 // |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1750 u2 group_index = 0; // default contended group |
7587 | 1751 if (count == 1 |
1752 && s_size == (index - index0) // match size | |
1753 && s_tag_val == *(abase + tag_off) | |
1754 && member == vmSymbols::value_name()) { | |
10305
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1755 group_index = Bytes::get_Java_u2(abase + s_con_off); |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1756 if (_cp->symbol_at(group_index)->utf8_length() == 0) { |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1757 group_index = 0; // default contended group |
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1758 } |
7587 | 1759 } |
10305
50e9396d5257
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
10303
diff
changeset
|
1760 coll->set_contended_group(group_index); |
7587 | 1761 } |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1762 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1763 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1764 |
7587 | 1765 ClassFileParser::AnnotationCollector::ID |
1766 ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_data, | |
1767 Symbol* name) { | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1768 vmSymbols::SID sid = vmSymbols::find_sid(name); |
7639
22ead76da3f4
8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents:
7615
diff
changeset
|
1769 // Privileged code can use all annotations. Other code silently drops some. |
8866
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1770 const bool privileged = loader_data->is_the_null_class_loader_data() || |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1771 loader_data->is_ext_class_loader_data() || |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1772 loader_data->is_anonymous(); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1773 switch (sid) { |
8866
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1774 case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_reflect_CallerSensitive_signature): |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1775 if (_location != _in_method) break; // only allow for methods |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1776 if (!privileged) break; // only allow in privileged code |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1777 return _method_CallerSensitive; |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1778 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature): |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1779 if (_location != _in_method) break; // only allow for methods |
7587 | 1780 if (!privileged) break; // only allow in privileged code |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1781 return _method_ForceInline; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1782 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature): |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1783 if (_location != _in_method) break; // only allow for methods |
7587 | 1784 if (!privileged) break; // only allow in privileged code |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1785 return _method_DontInline; |
23086
bf41eee321e5
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
20703
diff
changeset
|
1786 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_InjectedProfile_signature): |
bf41eee321e5
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
20703
diff
changeset
|
1787 if (_location != _in_method) break; // only allow for methods |
bf41eee321e5
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
20703
diff
changeset
|
1788 if (!privileged) break; // only allow in privileged code |
bf41eee321e5
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
20703
diff
changeset
|
1789 return _method_InjectedProfile; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1790 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1791 if (_location != _in_method) break; // only allow for methods |
7587 | 1792 if (!privileged) break; // only allow in privileged code |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1793 return _method_LambdaForm_Compiled; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1794 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1795 if (_location != _in_method) break; // only allow for methods |
7587 | 1796 if (!privileged) break; // only allow in privileged code |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1797 return _method_LambdaForm_Hidden; |
12333
cacc4c6bfc80
8025233: Move sun.invoke.Stable into java.lang.invoke package
vlivanov
parents:
12269
diff
changeset
|
1798 case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_Stable_signature): |
12190
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1799 if (_location != _in_field) break; // only allow for fields |
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1800 if (!privileged) break; // only allow in privileged code |
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1801 return _field_Stable; |
7587 | 1802 case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature): |
1803 if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes | |
1804 if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges | |
1805 return _sun_misc_Contended; | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1806 default: break; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1807 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1808 return AnnotationCollector::_unknown; |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1809 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1810 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1811 void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) { |
7587 | 1812 if (is_contended()) |
1813 f->set_contended_group(contended_group()); | |
12190
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1814 if (is_stable()) |
edb5ab0f3fe5
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
12131
diff
changeset
|
1815 f->set_stable(true); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1816 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1817 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1818 ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1819 // If there's an error deallocate metadata for field annotations |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1820 MetadataFactory::free_array<u1>(_loader_data, _field_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1821 MetadataFactory::free_array<u1>(_loader_data, _field_type_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1822 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1823 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1824 void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) { |
8866
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1825 if (has_annotation(_method_CallerSensitive)) |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8719
diff
changeset
|
1826 m->set_caller_sensitive(true); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1827 if (has_annotation(_method_ForceInline)) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1828 m->set_force_inline(true); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1829 if (has_annotation(_method_DontInline)) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1830 m->set_dont_inline(true); |
23086
bf41eee321e5
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
20703
diff
changeset
|
1831 if (has_annotation(_method_InjectedProfile)) |
bf41eee321e5
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
20703
diff
changeset
|
1832 m->set_has_injected_profile(true); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1833 if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1834 m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1835 if (has_annotation(_method_LambdaForm_Hidden)) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6227
diff
changeset
|
1836 m->set_hidden(true); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1837 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1838 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1839 void ClassFileParser::ClassAnnotationCollector::apply_to(instanceKlassHandle k) { |
7587 | 1840 k->set_is_contended(is_contended()); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1841 } |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1842 |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1843 |
0 | 1844 #define MAX_ARGS_SIZE 255 |
1845 #define MAX_CODE_SIZE 65535 | |
1846 #define INITIAL_MAX_LVT_NUMBER 256 | |
1847 | |
8031 | 1848 /* Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
1849 * | |
1850 * Rules for LVT's and LVTT's are: | |
1851 * - There can be any number of LVT's and LVTT's. | |
1852 * - If there are n LVT's, it is the same as if there was just | |
1853 * one LVT containing all the entries from the n LVT's. | |
1854 * - There may be no more than one LVT entry per local variable. | |
1855 * Two LVT entries are 'equal' if these fields are the same: | |
1856 * start_pc, length, name, slot | |
1857 * - There may be no more than one LVTT entry per each LVT entry. | |
1858 * Each LVTT entry has to match some LVT entry. | |
1859 * - HotSpot internal LVT keeps natural ordering of class file LVT entries. | |
1860 */ | |
1861 void ClassFileParser::copy_localvariable_table(ConstMethod* cm, | |
1862 int lvt_cnt, | |
1863 u2* localvariable_table_length, | |
1864 u2** localvariable_table_start, | |
1865 int lvtt_cnt, | |
1866 u2* localvariable_type_table_length, | |
1867 u2** localvariable_type_table_start, | |
1868 TRAPS) { | |
1869 | |
1870 LVT_Hash** lvt_Hash = NEW_RESOURCE_ARRAY(LVT_Hash*, HASH_ROW_SIZE); | |
1871 initialize_hashtable(lvt_Hash); | |
1872 | |
1873 // To fill LocalVariableTable in | |
1874 Classfile_LVT_Element* cf_lvt; | |
1875 LocalVariableTableElement* lvt = cm->localvariable_table_start(); | |
1876 | |
1877 for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) { | |
1878 cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no]; | |
1879 for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) { | |
1880 copy_lvt_element(&cf_lvt[idx], lvt); | |
1881 // If no duplicates, add LVT elem in hashtable lvt_Hash. | |
1882 if (LVT_put_after_lookup(lvt, lvt_Hash) == false | |
1883 && _need_verify | |
1884 && _major_version >= JAVA_1_5_VERSION) { | |
1885 clear_hashtable(lvt_Hash); | |
1886 classfile_parse_error("Duplicated LocalVariableTable attribute " | |
1887 "entry for '%s' in class file %s", | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1888 _cp->symbol_at(lvt->name_cp_index)->as_utf8(), |
8031 | 1889 CHECK); |
1890 } | |
1891 } | |
1892 } | |
1893 | |
1894 // To merge LocalVariableTable and LocalVariableTypeTable | |
1895 Classfile_LVT_Element* cf_lvtt; | |
1896 LocalVariableTableElement lvtt_elem; | |
1897 | |
1898 for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) { | |
1899 cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no]; | |
1900 for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) { | |
1901 copy_lvt_element(&cf_lvtt[idx], &lvtt_elem); | |
1902 int index = hash(&lvtt_elem); | |
1903 LVT_Hash* entry = LVT_lookup(&lvtt_elem, index, lvt_Hash); | |
1904 if (entry == NULL) { | |
1905 if (_need_verify) { | |
1906 clear_hashtable(lvt_Hash); | |
1907 classfile_parse_error("LVTT entry for '%s' in class file %s " | |
1908 "does not match any LVT entry", | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1909 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
8031 | 1910 CHECK); |
1911 } | |
1912 } else if (entry->_elem->signature_cp_index != 0 && _need_verify) { | |
1913 clear_hashtable(lvt_Hash); | |
1914 classfile_parse_error("Duplicated LocalVariableTypeTable attribute " | |
1915 "entry for '%s' in class file %s", | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1916 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
8031 | 1917 CHECK); |
1918 } else { | |
1919 // to add generic signatures into LocalVariableTable | |
1920 entry->_elem->signature_cp_index = lvtt_elem.descriptor_cp_index; | |
1921 } | |
1922 } | |
1923 } | |
1924 clear_hashtable(lvt_Hash); | |
1925 } | |
1926 | |
1927 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1928 void ClassFileParser::copy_method_annotations(ConstMethod* cm, |
8031 | 1929 u1* runtime_visible_annotations, |
1930 int runtime_visible_annotations_length, | |
1931 u1* runtime_invisible_annotations, | |
1932 int runtime_invisible_annotations_length, | |
1933 u1* runtime_visible_parameter_annotations, | |
1934 int runtime_visible_parameter_annotations_length, | |
1935 u1* runtime_invisible_parameter_annotations, | |
1936 int runtime_invisible_parameter_annotations_length, | |
1937 u1* runtime_visible_type_annotations, | |
1938 int runtime_visible_type_annotations_length, | |
1939 u1* runtime_invisible_type_annotations, | |
1940 int runtime_invisible_type_annotations_length, | |
1941 u1* annotation_default, | |
1942 int annotation_default_length, | |
1943 TRAPS) { | |
1944 | |
1945 AnnotationArray* a; | |
1946 | |
1947 if (runtime_visible_annotations_length + | |
1948 runtime_invisible_annotations_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1949 a = assemble_annotations(runtime_visible_annotations, |
8031 | 1950 runtime_visible_annotations_length, |
1951 runtime_invisible_annotations, | |
1952 runtime_invisible_annotations_length, | |
1953 CHECK); | |
1954 cm->set_method_annotations(a); | |
1955 } | |
1956 | |
1957 if (runtime_visible_parameter_annotations_length + | |
1958 runtime_invisible_parameter_annotations_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1959 a = assemble_annotations(runtime_visible_parameter_annotations, |
8031 | 1960 runtime_visible_parameter_annotations_length, |
1961 runtime_invisible_parameter_annotations, | |
1962 runtime_invisible_parameter_annotations_length, | |
1963 CHECK); | |
1964 cm->set_parameter_annotations(a); | |
1965 } | |
1966 | |
1967 if (annotation_default_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1968 a = assemble_annotations(annotation_default, |
8031 | 1969 annotation_default_length, |
1970 NULL, | |
1971 0, | |
1972 CHECK); | |
1973 cm->set_default_annotations(a); | |
1974 } | |
1975 | |
1976 if (runtime_visible_type_annotations_length + | |
1977 runtime_invisible_type_annotations_length > 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1978 a = assemble_annotations(runtime_visible_type_annotations, |
8031 | 1979 runtime_visible_type_annotations_length, |
1980 runtime_invisible_type_annotations, | |
1981 runtime_invisible_type_annotations_length, | |
1982 CHECK); | |
1983 cm->set_type_annotations(a); | |
1984 } | |
1985 } | |
1986 | |
1987 | |
0 | 1988 // Note: the parse_method below is big and clunky because all parsing of the code and exceptions |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
1989 // attribute is inlined. This is cumbersome to avoid since we inline most of the parts in the |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1990 // Method* to save footprint, so we only know the size of the resulting Method* when the |
0 | 1991 // entire method attribute is parsed. |
1992 // | |
1993 // The promoted_flags parameter is used to pass relevant access_flags | |
1994 // from the method back up to the containing klass. These flag values | |
1995 // are added to klass's access_flags. | |
1996 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
1997 methodHandle ClassFileParser::parse_method(bool is_interface, |
0 | 1998 AccessFlags *promoted_flags, |
1999 TRAPS) { | |
2000 ClassFileStream* cfs = stream(); | |
2001 methodHandle nullHandle; | |
2002 ResourceMark rm(THREAD); | |
2003 // Parse fixed parts | |
2004 cfs->guarantee_more(8, CHECK_(nullHandle)); // access_flags, name_index, descriptor_index, attributes_count | |
2005 | |
2006 int flags = cfs->get_u2_fast(); | |
2007 u2 name_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2008 int cp_size = _cp->length(); |
0 | 2009 check_property( |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2010 valid_symbol_at(name_index), |
0 | 2011 "Illegal constant pool index %u for method name in class file %s", |
2012 name_index, CHECK_(nullHandle)); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2013 Symbol* name = _cp->symbol_at(name_index); |
0 | 2014 verify_legal_method_name(name, CHECK_(nullHandle)); |
2015 | |
2016 u2 signature_index = cfs->get_u2_fast(); | |
2017 guarantee_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2018 valid_symbol_at(signature_index), |
0 | 2019 "Illegal constant pool index %u for method signature in class file %s", |
2020 signature_index, CHECK_(nullHandle)); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2021 Symbol* signature = _cp->symbol_at(signature_index); |
0 | 2022 |
2023 AccessFlags access_flags; | |
2024 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
|
2025 // 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
|
2026 // (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
|
2027 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
|
2028 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
|
2029 } 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
|
2030 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
|
2031 } |
0 | 2032 } else { |
2033 verify_legal_method_modifiers(flags, is_interface, name, CHECK_(nullHandle)); | |
2034 } | |
2035 | |
2036 int args_size = -1; // only used when _need_verify is true | |
2037 if (_need_verify) { | |
2038 args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) + | |
2039 verify_legal_method_signature(name, signature, CHECK_(nullHandle)); | |
2040 if (args_size > MAX_ARGS_SIZE) { | |
2041 classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_(nullHandle)); | |
2042 } | |
2043 } | |
2044 | |
2045 access_flags.set_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS); | |
2046 | |
2047 // Default values for code and exceptions attribute elements | |
2048 u2 max_stack = 0; | |
2049 u2 max_locals = 0; | |
2050 u4 code_length = 0; | |
2051 u1* code_start = 0; | |
2052 u2 exception_table_length = 0; | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2053 u2* exception_table_start = NULL; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2054 Array<int>* exception_handlers = Universe::the_empty_int_array(); |
0 | 2055 u2 checked_exceptions_length = 0; |
2056 u2* checked_exceptions_start = NULL; | |
2057 CompressedLineNumberWriteStream* linenumber_table = NULL; | |
2058 int linenumber_table_length = 0; | |
2059 int total_lvt_length = 0; | |
2060 u2 lvt_cnt = 0; | |
2061 u2 lvtt_cnt = 0; | |
2062 bool lvt_allocated = false; | |
2063 u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER; | |
2064 u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER; | |
2065 u2* localvariable_table_length; | |
2066 u2** localvariable_table_start; | |
2067 u2* localvariable_type_table_length; | |
2068 u2** localvariable_type_table_start; | |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2069 u2 method_parameters_length = 0; |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2070 u1* method_parameters_data = NULL; |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2071 bool method_parameters_seen = false; |
0 | 2072 bool parsed_code_attribute = false; |
2073 bool parsed_checked_exceptions_attribute = false; | |
2074 bool parsed_stackmap_attribute = false; | |
2075 // stackmap attribute - JDK1.5 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2076 u1* stackmap_data = NULL; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2077 int stackmap_data_length = 0; |
0 | 2078 u2 generic_signature_index = 0; |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2079 MethodAnnotationCollector parsed_annotations; |
0 | 2080 u1* runtime_visible_annotations = NULL; |
2081 int runtime_visible_annotations_length = 0; | |
2082 u1* runtime_invisible_annotations = NULL; | |
2083 int runtime_invisible_annotations_length = 0; | |
2084 u1* runtime_visible_parameter_annotations = NULL; | |
2085 int runtime_visible_parameter_annotations_length = 0; | |
2086 u1* runtime_invisible_parameter_annotations = NULL; | |
2087 int runtime_invisible_parameter_annotations_length = 0; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2088 u1* runtime_visible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2089 int runtime_visible_type_annotations_length = 0; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2090 u1* runtime_invisible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2091 int runtime_invisible_type_annotations_length = 0; |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2092 bool runtime_invisible_type_annotations_exists = false; |
0 | 2093 u1* annotation_default = NULL; |
2094 int annotation_default_length = 0; | |
2095 | |
2096 // Parse code and exceptions attribute | |
2097 u2 method_attributes_count = cfs->get_u2_fast(); | |
2098 while (method_attributes_count--) { | |
2099 cfs->guarantee_more(6, CHECK_(nullHandle)); // method_attribute_name_index, method_attribute_length | |
2100 u2 method_attribute_name_index = cfs->get_u2_fast(); | |
2101 u4 method_attribute_length = cfs->get_u4_fast(); | |
2102 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2103 valid_symbol_at(method_attribute_name_index), |
0 | 2104 "Invalid method attribute name index %u in class file %s", |
2105 method_attribute_name_index, CHECK_(nullHandle)); | |
2106 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2107 Symbol* method_attribute_name = _cp->symbol_at(method_attribute_name_index); |
0 | 2108 if (method_attribute_name == vmSymbols::tag_code()) { |
2109 // Parse Code attribute | |
2110 if (_need_verify) { | |
6934 | 2111 guarantee_property( |
2112 !access_flags.is_native() && !access_flags.is_abstract(), | |
0 | 2113 "Code attribute in native or abstract methods in class file %s", |
2114 CHECK_(nullHandle)); | |
2115 } | |
2116 if (parsed_code_attribute) { | |
2117 classfile_parse_error("Multiple Code attributes in class file %s", CHECK_(nullHandle)); | |
2118 } | |
2119 parsed_code_attribute = true; | |
2120 | |
2121 // Stack size, locals size, and code size | |
2122 if (_major_version == 45 && _minor_version <= 2) { | |
2123 cfs->guarantee_more(4, CHECK_(nullHandle)); | |
2124 max_stack = cfs->get_u1_fast(); | |
2125 max_locals = cfs->get_u1_fast(); | |
2126 code_length = cfs->get_u2_fast(); | |
2127 } else { | |
2128 cfs->guarantee_more(8, CHECK_(nullHandle)); | |
2129 max_stack = cfs->get_u2_fast(); | |
2130 max_locals = cfs->get_u2_fast(); | |
2131 code_length = cfs->get_u4_fast(); | |
2132 } | |
2133 if (_need_verify) { | |
2134 guarantee_property(args_size <= max_locals, | |
2135 "Arguments can't fit into locals in class file %s", CHECK_(nullHandle)); | |
2136 guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE, | |
2137 "Invalid method Code length %u in class file %s", | |
2138 code_length, CHECK_(nullHandle)); | |
2139 } | |
2140 // Code pointer | |
2141 code_start = cfs->get_u1_buffer(); | |
2142 assert(code_start != NULL, "null code start"); | |
2143 cfs->guarantee_more(code_length, CHECK_(nullHandle)); | |
2144 cfs->skip_u1_fast(code_length); | |
2145 | |
2146 // Exception handler table | |
2147 cfs->guarantee_more(2, CHECK_(nullHandle)); // exception_table_length | |
2148 exception_table_length = cfs->get_u2_fast(); | |
2149 if (exception_table_length > 0) { | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2150 exception_table_start = |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2151 parse_exception_table(code_length, exception_table_length, CHECK_(nullHandle)); |
0 | 2152 } |
2153 | |
2154 // Parse additional attributes in code attribute | |
2155 cfs->guarantee_more(2, CHECK_(nullHandle)); // code_attributes_count | |
2156 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
|
2157 |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2158 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
|
2159 |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2160 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
|
2161 calculated_attribute_length = |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2162 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
|
2163 } else { |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2164 // 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
|
2165 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
|
2166 } |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2167 calculated_attribute_length += |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2168 code_length + |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2169 sizeof(exception_table_length) + |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2170 sizeof(code_attributes_count) + |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2171 exception_table_length * |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2172 ( sizeof(u2) + // start_pc |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2173 sizeof(u2) + // end_pc |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2174 sizeof(u2) + // handler_pc |
ebec5b9731e2
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
0
diff
changeset
|
2175 sizeof(u2) ); // catch_type_index |
0 | 2176 |
2177 while (code_attributes_count--) { | |
2178 cfs->guarantee_more(6, CHECK_(nullHandle)); // code_attribute_name_index, code_attribute_length | |
2179 u2 code_attribute_name_index = cfs->get_u2_fast(); | |
2180 u4 code_attribute_length = cfs->get_u4_fast(); | |
2181 calculated_attribute_length += code_attribute_length + | |
2182 sizeof(code_attribute_name_index) + | |
2183 sizeof(code_attribute_length); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2184 check_property(valid_symbol_at(code_attribute_name_index), |
0 | 2185 "Invalid code attribute name index %u in class file %s", |
2186 code_attribute_name_index, | |
2187 CHECK_(nullHandle)); | |
2188 if (LoadLineNumberTables && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2189 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) { |
0 | 2190 // Parse and compress line number table |
2191 parse_linenumber_table(code_attribute_length, code_length, | |
2192 &linenumber_table, CHECK_(nullHandle)); | |
2193 | |
2194 } else if (LoadLocalVariableTables && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2195 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) { |
0 | 2196 // Parse local variable table |
2197 if (!lvt_allocated) { | |
2198 localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2199 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2200 localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2201 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2202 localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2203 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2204 localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2205 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2206 lvt_allocated = true; | |
2207 } | |
2208 if (lvt_cnt == max_lvt_cnt) { | |
2209 max_lvt_cnt <<= 1; | |
12922 | 2210 localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt); |
2211 localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt); | |
0 | 2212 } |
2213 localvariable_table_start[lvt_cnt] = | |
2214 parse_localvariable_table(code_length, | |
2215 max_locals, | |
2216 code_attribute_length, | |
2217 &localvariable_table_length[lvt_cnt], | |
2218 false, // is not LVTT | |
2219 CHECK_(nullHandle)); | |
2220 total_lvt_length += localvariable_table_length[lvt_cnt]; | |
2221 lvt_cnt++; | |
2222 } else if (LoadLocalVariableTypeTables && | |
2223 _major_version >= JAVA_1_5_VERSION && | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2224 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) { |
0 | 2225 if (!lvt_allocated) { |
2226 localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2227 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2228 localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2229 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2230 localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2231 THREAD, u2, INITIAL_MAX_LVT_NUMBER); | |
2232 localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2233 THREAD, u2*, INITIAL_MAX_LVT_NUMBER); | |
2234 lvt_allocated = true; | |
2235 } | |
2236 // Parse local variable type table | |
2237 if (lvtt_cnt == max_lvtt_cnt) { | |
2238 max_lvtt_cnt <<= 1; | |
12922 | 2239 localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt); |
2240 localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt); | |
0 | 2241 } |
2242 localvariable_type_table_start[lvtt_cnt] = | |
2243 parse_localvariable_table(code_length, | |
2244 max_locals, | |
2245 code_attribute_length, | |
2246 &localvariable_type_table_length[lvtt_cnt], | |
2247 true, // is LVTT | |
2248 CHECK_(nullHandle)); | |
2249 lvtt_cnt++; | |
8819
36376b540a98
8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents:
8719
diff
changeset
|
2250 } else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION && |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2251 _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) { |
0 | 2252 // Stack map is only needed by the new verifier in JDK1.5. |
2253 if (parsed_stackmap_attribute) { | |
2254 classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_(nullHandle)); | |
2255 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2256 stackmap_data = parse_stackmap_table(code_attribute_length, CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2257 stackmap_data_length = code_attribute_length; |
0 | 2258 parsed_stackmap_attribute = true; |
2259 } else { | |
2260 // Skip unknown attributes | |
2261 cfs->skip_u1(code_attribute_length, CHECK_(nullHandle)); | |
2262 } | |
2263 } | |
2264 // check method attribute length | |
2265 if (_need_verify) { | |
2266 guarantee_property(method_attribute_length == calculated_attribute_length, | |
2267 "Code segment has wrong length in class file %s", CHECK_(nullHandle)); | |
2268 } | |
2269 } else if (method_attribute_name == vmSymbols::tag_exceptions()) { | |
2270 // Parse Exceptions attribute | |
2271 if (parsed_checked_exceptions_attribute) { | |
2272 classfile_parse_error("Multiple Exceptions attributes in class file %s", CHECK_(nullHandle)); | |
2273 } | |
2274 parsed_checked_exceptions_attribute = true; | |
2275 checked_exceptions_start = | |
2276 parse_checked_exceptions(&checked_exceptions_length, | |
2277 method_attribute_length, | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2278 CHECK_(nullHandle)); |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2279 } else if (method_attribute_name == vmSymbols::tag_method_parameters()) { |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2280 // reject multiple method parameters |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2281 if (method_parameters_seen) { |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2282 classfile_parse_error("Multiple MethodParameters attributes in class file %s", CHECK_(nullHandle)); |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2283 } |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2284 method_parameters_seen = true; |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2285 method_parameters_length = cfs->get_u1_fast(); |
10154
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2286 if (method_attribute_length != (method_parameters_length * 4u) + 1u) { |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2287 classfile_parse_error( |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2288 "Invalid MethodParameters method attribute length %u in class file", |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2289 method_attribute_length, CHECK_(nullHandle)); |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2290 } |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2291 method_parameters_data = cfs->get_u1_buffer(); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2292 cfs->skip_u2_fast(method_parameters_length); |
10154
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2293 cfs->skip_u2_fast(method_parameters_length); |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2294 // ignore this attribute if it cannot be reflected |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2295 if (!SystemDictionary::Parameter_klass_loaded()) |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2296 method_parameters_length = 0; |
0 | 2297 } else if (method_attribute_name == vmSymbols::tag_synthetic()) { |
2298 if (method_attribute_length != 0) { | |
2299 classfile_parse_error( | |
2300 "Invalid Synthetic method attribute length %u in class file %s", | |
2301 method_attribute_length, CHECK_(nullHandle)); | |
2302 } | |
2303 // Should we check that there hasn't already been a synthetic attribute? | |
2304 access_flags.set_is_synthetic(); | |
2305 } else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120 | |
2306 if (method_attribute_length != 0) { | |
2307 classfile_parse_error( | |
2308 "Invalid Deprecated method attribute length %u in class file %s", | |
2309 method_attribute_length, CHECK_(nullHandle)); | |
2310 } | |
2311 } else if (_major_version >= JAVA_1_5_VERSION) { | |
2312 if (method_attribute_name == vmSymbols::tag_signature()) { | |
2313 if (method_attribute_length != 2) { | |
2314 classfile_parse_error( | |
2315 "Invalid Signature attribute length %u in class file %s", | |
2316 method_attribute_length, CHECK_(nullHandle)); | |
2317 } | |
17577 | 2318 generic_signature_index = parse_generic_signature_attribute(CHECK_(nullHandle)); |
0 | 2319 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) { |
2320 runtime_visible_annotations_length = method_attribute_length; | |
2321 runtime_visible_annotations = cfs->get_u1_buffer(); | |
2322 assert(runtime_visible_annotations != NULL, "null visible annotations"); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2323 parse_annotations(runtime_visible_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2324 runtime_visible_annotations_length, &parsed_annotations, |
6934 | 2325 CHECK_(nullHandle)); |
0 | 2326 cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle)); |
2327 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { | |
2328 runtime_invisible_annotations_length = method_attribute_length; | |
2329 runtime_invisible_annotations = cfs->get_u1_buffer(); | |
2330 assert(runtime_invisible_annotations != NULL, "null invisible annotations"); | |
2331 cfs->skip_u1(runtime_invisible_annotations_length, CHECK_(nullHandle)); | |
2332 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_parameter_annotations()) { | |
2333 runtime_visible_parameter_annotations_length = method_attribute_length; | |
2334 runtime_visible_parameter_annotations = cfs->get_u1_buffer(); | |
2335 assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations"); | |
2336 cfs->skip_u1(runtime_visible_parameter_annotations_length, CHECK_(nullHandle)); | |
2337 } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_parameter_annotations()) { | |
2338 runtime_invisible_parameter_annotations_length = method_attribute_length; | |
2339 runtime_invisible_parameter_annotations = cfs->get_u1_buffer(); | |
2340 assert(runtime_invisible_parameter_annotations != NULL, "null invisible parameter annotations"); | |
2341 cfs->skip_u1(runtime_invisible_parameter_annotations_length, CHECK_(nullHandle)); | |
2342 } else if (method_attribute_name == vmSymbols::tag_annotation_default()) { | |
2343 annotation_default_length = method_attribute_length; | |
2344 annotation_default = cfs->get_u1_buffer(); | |
2345 assert(annotation_default != NULL, "null annotation default"); | |
2346 cfs->skip_u1(annotation_default_length, CHECK_(nullHandle)); | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2347 } else if (method_attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) { |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2348 if (runtime_visible_type_annotations != NULL) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2349 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2350 "Multiple RuntimeVisibleTypeAnnotations attributes for method in class file %s", |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2351 CHECK_(nullHandle)); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2352 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2353 runtime_visible_type_annotations_length = method_attribute_length; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2354 runtime_visible_type_annotations = cfs->get_u1_buffer(); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2355 assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2356 // No need for the VM to parse Type annotations |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2357 cfs->skip_u1(runtime_visible_type_annotations_length, CHECK_(nullHandle)); |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2358 } else if (method_attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2359 if (runtime_invisible_type_annotations_exists) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2360 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2361 "Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s", |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2362 CHECK_(nullHandle)); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2363 } else { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2364 runtime_invisible_type_annotations_exists = true; |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2365 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2366 if (PreserveAllAnnotations) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2367 runtime_invisible_type_annotations_length = method_attribute_length; |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2368 runtime_invisible_type_annotations = cfs->get_u1_buffer(); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2369 assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations"); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2370 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2371 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
0 | 2372 } else { |
2373 // Skip unknown attributes | |
2374 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); | |
2375 } | |
2376 } else { | |
2377 // Skip unknown attributes | |
2378 cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); | |
2379 } | |
2380 } | |
2381 | |
2382 if (linenumber_table != NULL) { | |
2383 linenumber_table->write_terminator(); | |
2384 linenumber_table_length = linenumber_table->position(); | |
2385 } | |
2386 | |
2387 // Make sure there's at least one Code attribute in non-native/non-abstract method | |
2388 if (_need_verify) { | |
2389 guarantee_property(access_flags.is_native() || access_flags.is_abstract() || parsed_code_attribute, | |
2390 "Absent Code attribute in method that is not native or abstract in class file %s", CHECK_(nullHandle)); | |
2391 } | |
2392 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2393 // All sizing information for a Method* is finally available, now create it |
8031 | 2394 InlineTableSizes sizes( |
2395 total_lvt_length, | |
2396 linenumber_table_length, | |
2397 exception_table_length, | |
2398 checked_exceptions_length, | |
2399 method_parameters_length, | |
2400 generic_signature_index, | |
2401 runtime_visible_annotations_length + | |
2402 runtime_invisible_annotations_length, | |
2403 runtime_visible_parameter_annotations_length + | |
2404 runtime_invisible_parameter_annotations_length, | |
2405 runtime_visible_type_annotations_length + | |
2406 runtime_invisible_type_annotations_length, | |
2407 annotation_default_length, | |
2408 0); | |
2409 | |
6934 | 2410 Method* m = Method::allocate( |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2411 _loader_data, code_length, access_flags, &sizes, |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2412 ConstMethod::NORMAL, CHECK_(nullHandle)); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2413 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2414 ClassLoadingService::add_class_method_size(m->size()*HeapWordSize); |
0 | 2415 |
2416 // Fill in information from fixed part (access_flags already set) | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2417 m->set_constants(_cp); |
0 | 2418 m->set_name_index(name_index); |
2419 m->set_signature_index(signature_index); | |
23614 | 2420 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2421 ResultTypeFinder rtf(_cp->symbol_at(signature_index)); |
23614 | 2422 m->constMethod()->set_result_type(rtf.type()); |
0 | 2423 |
2424 if (args_size >= 0) { | |
2425 m->set_size_of_parameters(args_size); | |
2426 } else { | |
2427 m->compute_size_of_parameters(THREAD); | |
2428 } | |
2429 #ifdef ASSERT | |
2430 if (args_size >= 0) { | |
2431 m->compute_size_of_parameters(THREAD); | |
2432 assert(args_size == m->size_of_parameters(), ""); | |
2433 } | |
2434 #endif | |
2435 | |
2436 // Fill in code attribute information | |
2437 m->set_max_stack(max_stack); | |
2438 m->set_max_locals(max_locals); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2439 if (stackmap_data != NULL) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2440 m->constMethod()->copy_stackmap_data(_loader_data, stackmap_data, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2441 stackmap_data_length, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2442 } |
0 | 2443 |
2444 // Copy byte codes | |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1108
diff
changeset
|
2445 m->set_code(code_start); |
0 | 2446 |
2447 // Copy line number table | |
2448 if (linenumber_table != NULL) { | |
2449 memcpy(m->compressed_linenumber_table(), | |
2450 linenumber_table->buffer(), linenumber_table_length); | |
2451 } | |
2452 | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2453 // Copy exception table |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2454 if (exception_table_length > 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2455 int size = |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2456 exception_table_length * sizeof(ExceptionTableElement) / sizeof(u2); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2457 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
|
2458 exception_table_start, size); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2459 } |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6100
diff
changeset
|
2460 |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2461 // Copy method parameters |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2462 if (method_parameters_length > 0) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2463 MethodParametersElement* elem = m->constMethod()->method_parameters_start(); |
7983
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2464 for (int i = 0; i < method_parameters_length; i++) { |
24a91505f9d5
8006949: Update hotspot for MethodParameters format change
emc
parents:
7639
diff
changeset
|
2465 elem[i].name_cp_index = Bytes::get_Java_u2(method_parameters_data); |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2466 method_parameters_data += 2; |
10154
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2467 elem[i].flags = Bytes::get_Java_u2(method_parameters_data); |
d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
10128
diff
changeset
|
2468 method_parameters_data += 2; |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2469 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2470 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
2471 |
0 | 2472 // Copy checked exceptions |
2473 if (checked_exceptions_length > 0) { | |
2474 int size = checked_exceptions_length * sizeof(CheckedExceptionElement) / sizeof(u2); | |
2475 copy_u2_with_conversion((u2*) m->checked_exceptions_start(), checked_exceptions_start, size); | |
2476 } | |
2477 | |
8031 | 2478 // Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
0 | 2479 if (total_lvt_length > 0) { |
2480 promoted_flags->set_has_localvariable_table(); | |
8031 | 2481 copy_localvariable_table(m->constMethod(), lvt_cnt, |
2482 localvariable_table_length, | |
2483 localvariable_table_start, | |
2484 lvtt_cnt, | |
2485 localvariable_type_table_length, | |
2486 localvariable_type_table_start, CHECK_NULL); | |
0 | 2487 } |
2488 | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2489 if (parsed_annotations.has_any_annotations()) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2490 parsed_annotations.apply_to(m); |
8031 | 2491 |
2492 // Copy annotations | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2493 copy_method_annotations(m->constMethod(), |
8031 | 2494 runtime_visible_annotations, |
2495 runtime_visible_annotations_length, | |
2496 runtime_invisible_annotations, | |
2497 runtime_invisible_annotations_length, | |
2498 runtime_visible_parameter_annotations, | |
2499 runtime_visible_parameter_annotations_length, | |
2500 runtime_invisible_parameter_annotations, | |
2501 runtime_invisible_parameter_annotations_length, | |
2502 runtime_visible_type_annotations, | |
2503 runtime_visible_type_annotations_length, | |
2504 runtime_invisible_type_annotations, | |
2505 runtime_invisible_type_annotations_length, | |
2506 annotation_default, | |
2507 annotation_default_length, | |
2508 CHECK_NULL); | |
0 | 2509 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2510 if (name == vmSymbols::finalize_method_name() && |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2511 signature == vmSymbols::void_method_signature()) { |
0 | 2512 if (m->is_empty_method()) { |
2513 _has_empty_finalizer = true; | |
2514 } else { | |
2515 _has_finalizer = true; | |
2516 } | |
2517 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2518 if (name == vmSymbols::object_initializer_name() && |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
2519 signature == vmSymbols::void_method_signature() && |
0 | 2520 m->is_vanilla_constructor()) { |
2521 _has_vanilla_constructor = true; | |
2522 } | |
2523 | |
8031 | 2524 NOT_PRODUCT(m->verify()); |
0 | 2525 return m; |
2526 } | |
2527 | |
2528 | |
2529 // The promoted_flags parameter is used to pass relevant access_flags | |
2530 // from the methods back up to the containing klass. These flag values | |
2531 // are added to klass's access_flags. | |
2532 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2533 Array<Method*>* ClassFileParser::parse_methods(bool is_interface, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2534 AccessFlags* promoted_flags, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2535 bool* has_final_method, |
20576
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
2536 bool* declares_default_methods, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2537 TRAPS) { |
0 | 2538 ClassFileStream* cfs = stream(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2539 cfs->guarantee_more(2, CHECK_NULL); // length |
0 | 2540 u2 length = cfs->get_u2_fast(); |
2541 if (length == 0) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2542 _methods = Universe::the_empty_method_array(); |
0 | 2543 } else { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2544 _methods = MetadataFactory::new_array<Method*>(_loader_data, length, NULL, CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2545 |
0 | 2546 HandleMark hm(THREAD); |
2547 for (int index = 0; index < length; index++) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2548 methodHandle method = parse_method(is_interface, |
0 | 2549 promoted_flags, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2550 CHECK_NULL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2551 |
0 | 2552 if (method->is_final()) { |
2553 *has_final_method = true; | |
2554 } | |
20576
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
2555 // declares_default_methods: declares concrete instance methods, any access flags |
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
2556 // used for interface initialization, and default method inheritance analysis |
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
2557 if (is_interface && !(*declares_default_methods) |
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
2558 && !method->is_abstract() && !method->is_static()) { |
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
2559 *declares_default_methods = true; |
6934 | 2560 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2561 _methods->at_put(index, method()); |
0 | 2562 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2563 |
0 | 2564 if (_need_verify && length > 1) { |
2565 // Check duplicated methods | |
2566 ResourceMark rm(THREAD); | |
2567 NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( | |
2568 THREAD, NameSigHash*, HASH_ROW_SIZE); | |
2569 initialize_hashtable(names_and_sigs); | |
2570 bool dup = false; | |
2571 { | |
2572 debug_only(No_Safepoint_Verifier nsv;) | |
2573 for (int i = 0; i < length; i++) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2574 Method* m = _methods->at(i); |
0 | 2575 // If no duplicates, add name/signature in hashtable names_and_sigs. |
2576 if (!put_after_lookup(m->name(), m->signature(), names_and_sigs)) { | |
2577 dup = true; | |
2578 break; | |
2579 } | |
2580 } | |
2581 } | |
2582 if (dup) { | |
2583 classfile_parse_error("Duplicate method name&signature in class file %s", | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2584 CHECK_NULL); |
0 | 2585 } |
2586 } | |
2587 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2588 return _methods; |
0 | 2589 } |
2590 | |
2591 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2592 intArray* ClassFileParser::sort_methods(Array<Method*>* methods) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2593 int length = methods->length(); |
3245
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2594 // If JVMTI original method ordering or sharing is enabled we have to |
0 | 2595 // remember the original class file ordering. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2596 // We temporarily use the vtable_index field in the Method* to store the |
0 | 2597 // 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
|
2598 // Put the method ordering in the shared archive. |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2599 if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { |
0 | 2600 for (int index = 0; index < length; index++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2601 Method* m = methods->at(index); |
0 | 2602 assert(!m->valid_vtable_index(), "vtable index should not be set"); |
2603 m->set_vtable_index(index); | |
2604 } | |
2605 } | |
2606 // 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
|
2607 // Note that the ordering is not alphabetical, see Symbol::fast_compare |
8031 | 2608 Method::sort_methods(methods); |
0 | 2609 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2610 intArray* method_ordering = NULL; |
3245
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2611 // 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
|
2612 // array remembering the original ordering |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2461
diff
changeset
|
2613 if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2614 method_ordering = new intArray(length); |
0 | 2615 for (int index = 0; index < length; index++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2616 Method* m = methods->at(index); |
0 | 2617 int old_index = m->vtable_index(); |
2618 assert(old_index >= 0 && old_index < length, "invalid method index"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2619 method_ordering->at_put(index, old_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2620 m->set_vtable_index(Method::invalid_vtable_index); |
0 | 2621 } |
2622 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2623 return method_ordering; |
0 | 2624 } |
2625 | |
17577 | 2626 // Parse generic_signature attribute for methods and fields |
2627 u2 ClassFileParser::parse_generic_signature_attribute(TRAPS) { | |
2628 ClassFileStream* cfs = stream(); | |
2629 cfs->guarantee_more(2, CHECK_0); // generic_signature_index | |
2630 u2 generic_signature_index = cfs->get_u2_fast(); | |
2631 check_property( | |
2632 valid_symbol_at(generic_signature_index), | |
2633 "Invalid Signature attribute at constant pool index %u in class file %s", | |
2634 generic_signature_index, CHECK_0); | |
2635 return generic_signature_index; | |
2636 } | |
0 | 2637 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2638 void ClassFileParser::parse_classfile_sourcefile_attribute(TRAPS) { |
0 | 2639 ClassFileStream* cfs = stream(); |
2640 cfs->guarantee_more(2, CHECK); // sourcefile_index | |
2641 u2 sourcefile_index = cfs->get_u2_fast(); | |
2642 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2643 valid_symbol_at(sourcefile_index), |
0 | 2644 "Invalid SourceFile attribute at constant pool index %u in class file %s", |
2645 sourcefile_index, CHECK); | |
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
2646 set_class_sourcefile_index(sourcefile_index); |
0 | 2647 } |
2648 | |
2649 | |
2650 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2651 void ClassFileParser::parse_classfile_source_debug_extension_attribute(int length, TRAPS) { |
0 | 2652 ClassFileStream* cfs = stream(); |
2653 u1* sde_buffer = cfs->get_u1_buffer(); | |
2654 assert(sde_buffer != NULL, "null sde buffer"); | |
2655 | |
2656 // Don't bother storing it if there is no way to retrieve it | |
2657 if (JvmtiExport::can_get_source_debug_extension()) { | |
6226 | 2658 assert((length+1) > length, "Overflow checking"); |
2659 u1* sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1); | |
2660 for (int i = 0; i < length; i++) { | |
2661 sde[i] = sde_buffer[i]; | |
2662 } | |
2663 sde[length] = '\0'; | |
2664 set_class_sde_buffer((char*)sde, length); | |
0 | 2665 } |
2666 // Got utf8 string, set stream position forward | |
2667 cfs->skip_u1(length, CHECK); | |
2668 } | |
2669 | |
2670 | |
2671 // Inner classes can be static, private or protected (classic VM does this) | |
2672 #define RECOGNIZED_INNER_CLASS_MODIFIERS (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED | JVM_ACC_STATIC) | |
2673 | |
2674 // Return number of classes in the inner classes attribute table | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2675 u2 ClassFileParser::parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start, |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2676 bool parsed_enclosingmethod_attribute, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2677 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
|
2678 u2 enclosing_method_method_index, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2679 TRAPS) { |
0 | 2680 ClassFileStream* cfs = stream(); |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2681 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
|
2682 u2 length = 0; |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2683 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
|
2684 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
|
2685 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
|
2686 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
|
2687 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2688 |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2689 // 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
|
2690 // method data: |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2691 // [inner_class_info_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2692 // outer_class_info_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2693 // inner_name_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2694 // inner_class_access_flags, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2695 // ... |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2696 // enclosing_method_class_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2697 // enclosing_method_method_index] |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2698 int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2699 Array<u2>* inner_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2700 _inner_classes = inner_classes; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2701 |
0 | 2702 int index = 0; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2703 int cp_size = _cp->length(); |
0 | 2704 cfs->guarantee_more(8 * length, CHECK_0); // 4-tuples of u2 |
2705 for (int n = 0; n < length; n++) { | |
2706 // Inner class index | |
2707 u2 inner_class_info_index = cfs->get_u2_fast(); | |
2708 check_property( | |
2709 inner_class_info_index == 0 || | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2710 valid_klass_reference_at(inner_class_info_index), |
0 | 2711 "inner_class_info_index %u has bad constant type in class file %s", |
2712 inner_class_info_index, CHECK_0); | |
2713 // Outer class index | |
2714 u2 outer_class_info_index = cfs->get_u2_fast(); | |
2715 check_property( | |
2716 outer_class_info_index == 0 || | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2717 valid_klass_reference_at(outer_class_info_index), |
0 | 2718 "outer_class_info_index %u has bad constant type in class file %s", |
2719 outer_class_info_index, CHECK_0); | |
2720 // Inner class name | |
2721 u2 inner_name_index = cfs->get_u2_fast(); | |
2722 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2723 inner_name_index == 0 || valid_symbol_at(inner_name_index), |
0 | 2724 "inner_name_index %u has bad constant type in class file %s", |
2725 inner_name_index, CHECK_0); | |
2726 if (_need_verify) { | |
2727 guarantee_property(inner_class_info_index != outer_class_info_index, | |
2728 "Class is both outer and inner class in class file %s", CHECK_0); | |
2729 } | |
2730 // Access flags | |
2731 AccessFlags inner_access_flags; | |
2732 jint flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS; | |
2733 if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { | |
2734 // Set abstract bit for old class files for backward compatibility | |
2735 flags |= JVM_ACC_ABSTRACT; | |
2736 } | |
2737 verify_legal_class_modifiers(flags, CHECK_0); | |
2738 inner_access_flags.set_flags(flags); | |
2739 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2740 inner_classes->at_put(index++, inner_class_info_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2741 inner_classes->at_put(index++, outer_class_info_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2742 inner_classes->at_put(index++, inner_name_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2743 inner_classes->at_put(index++, inner_access_flags.as_short()); |
0 | 2744 } |
2745 | |
2746 // 4347400: make sure there's no duplicate entry in the classes array | |
2747 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
|
2748 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
|
2749 for(int j = i + 4; j < length * 4; j += 4) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2750 guarantee_property((inner_classes->at(i) != inner_classes->at(j) || |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2751 inner_classes->at(i+1) != inner_classes->at(j+1) || |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2752 inner_classes->at(i+2) != inner_classes->at(j+2) || |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2753 inner_classes->at(i+3) != inner_classes->at(j+3)), |
0 | 2754 "Duplicate entry in InnerClasses in class file %s", |
2755 CHECK_0); | |
2756 } | |
2757 } | |
2758 } | |
2759 | |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2760 // 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
|
2761 if (parsed_enclosingmethod_attribute) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2762 inner_classes->at_put(index++, enclosing_method_class_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2763 inner_classes->at_put(index++, enclosing_method_method_index); |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2764 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2765 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
|
2766 |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2767 // 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
|
2768 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
|
2769 |
0 | 2770 return length; |
2771 } | |
2772 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2773 void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) { |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2774 set_class_synthetic_flag(true); |
0 | 2775 } |
2776 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2777 void ClassFileParser::parse_classfile_signature_attribute(TRAPS) { |
0 | 2778 ClassFileStream* cfs = stream(); |
2779 u2 signature_index = cfs->get_u2(CHECK); | |
2780 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2781 valid_symbol_at(signature_index), |
0 | 2782 "Invalid constant pool index %u in Signature attribute in class file %s", |
2783 signature_index, CHECK); | |
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
2784 set_class_generic_signature_index(signature_index); |
0 | 2785 } |
2786 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2787 void ClassFileParser::parse_classfile_bootstrap_methods_attribute(u4 attribute_byte_length, TRAPS) { |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2788 ClassFileStream* cfs = stream(); |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2789 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
|
2790 |
20353
72fa1e83e5f9
8051002: Incorrectly merged share/vm/classfile/classFileParser.cpp was pushed to 8u20.
lfoltan
parents:
18027
diff
changeset
|
2791 guarantee_property(attribute_byte_length >= sizeof(u2), |
17574 | 2792 "Invalid BootstrapMethods attribute length %u in class file %s", |
2793 attribute_byte_length, | |
2794 CHECK); | |
2795 | |
2796 cfs->guarantee_more(attribute_byte_length, CHECK); | |
2797 | |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2798 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
|
2799 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2800 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
|
2801 "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
|
2802 CHECK); |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2803 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2804 // 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
|
2805 // represending bootstrap specifiers: |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2806 // 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
|
2807 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
|
2808 // 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
|
2809 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2810 // 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
|
2811 // 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
|
2812 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
|
2813 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2814 Array<u2>* operands = MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2815 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2816 // Eagerly assign operands so they will be deallocated with the constant |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2817 // pool if there is an error. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2818 _cp->set_operands(operands); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2819 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2820 int operand_fill_index = index_size; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2821 int cp_size = _cp->length(); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2822 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2823 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
|
2824 // Store a 32-bit offset into the header of the operand array. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2825 ConstantPool::operand_offset_at_put(operands, n, operand_fill_index); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2826 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2827 // 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
|
2828 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
|
2829 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
|
2830 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
|
2831 check_property( |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2832 valid_cp_range(bootstrap_method_index, cp_size) && |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2833 _cp->tag_at(bootstrap_method_index).is_method_handle(), |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2834 "bootstrap_method_index %u has bad constant type in class file %s", |
2085 | 2835 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
|
2836 CHECK); |
18056 | 2837 |
2838 guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(), | |
2839 "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s", | |
2840 CHECK); | |
2841 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2842 operands->at_put(operand_fill_index++, bootstrap_method_index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2843 operands->at_put(operand_fill_index++, argument_count); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2844 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2845 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
|
2846 for (int j = 0; j < argument_count; j++) { |
2085 | 2847 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
|
2848 check_property( |
2085 | 2849 valid_cp_range(argument_index, cp_size) && |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2850 _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
|
2851 "argument_index %u has bad constant type in class file %s", |
2085 | 2852 argument_index, |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2853 CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2854 operands->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
|
2855 } |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2856 } |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2857 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2858 assert(operand_fill_index == operands->length(), "exact fill"); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2859 |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2860 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
|
2861 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
|
2862 "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
|
2863 CHECK); |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2864 } |
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2865 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2866 void ClassFileParser::parse_classfile_attributes(ClassFileParser::ClassAnnotationCollector* parsed_annotations, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2867 TRAPS) { |
0 | 2868 ClassFileStream* cfs = stream(); |
2869 // Set inner classes attribute to default sentinel | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2870 _inner_classes = Universe::the_empty_short_array(); |
0 | 2871 cfs->guarantee_more(2, CHECK); // attributes_count |
2872 u2 attributes_count = cfs->get_u2_fast(); | |
2873 bool parsed_sourcefile_attribute = false; | |
2874 bool parsed_innerclasses_attribute = false; | |
2875 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
|
2876 bool parsed_bootstrap_methods_attribute = false; |
0 | 2877 u1* runtime_visible_annotations = NULL; |
2878 int runtime_visible_annotations_length = 0; | |
2879 u1* runtime_invisible_annotations = NULL; | |
2880 int runtime_invisible_annotations_length = 0; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2881 u1* runtime_visible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2882 int runtime_visible_type_annotations_length = 0; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2883 u1* runtime_invisible_type_annotations = NULL; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2884 int runtime_invisible_type_annotations_length = 0; |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2885 bool runtime_invisible_type_annotations_exists = false; |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2886 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
|
2887 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
|
2888 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
|
2889 u2 enclosing_method_method_index = 0; |
0 | 2890 // Iterate over attributes |
2891 while (attributes_count--) { | |
2892 cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length | |
2893 u2 attribute_name_index = cfs->get_u2_fast(); | |
2894 u4 attribute_length = cfs->get_u4_fast(); | |
2895 check_property( | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2896 valid_symbol_at(attribute_name_index), |
0 | 2897 "Attribute name has bad constant pool index %u in class file %s", |
2898 attribute_name_index, CHECK); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2899 Symbol* tag = _cp->symbol_at(attribute_name_index); |
0 | 2900 if (tag == vmSymbols::tag_source_file()) { |
2901 // Check for SourceFile tag | |
2902 if (_need_verify) { | |
2903 guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK); | |
2904 } | |
2905 if (parsed_sourcefile_attribute) { | |
2906 classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK); | |
2907 } else { | |
2908 parsed_sourcefile_attribute = true; | |
2909 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2910 parse_classfile_sourcefile_attribute(CHECK); |
0 | 2911 } else if (tag == vmSymbols::tag_source_debug_extension()) { |
2912 // Check for SourceDebugExtension tag | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2913 parse_classfile_source_debug_extension_attribute((int)attribute_length, CHECK); |
0 | 2914 } else if (tag == vmSymbols::tag_inner_classes()) { |
2915 // Check for InnerClasses tag | |
2916 if (parsed_innerclasses_attribute) { | |
2917 classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK); | |
2918 } else { | |
2919 parsed_innerclasses_attribute = true; | |
2920 } | |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2921 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
|
2922 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
|
2923 cfs->skip_u1(inner_classes_attribute_length, CHECK); |
0 | 2924 } else if (tag == vmSymbols::tag_synthetic()) { |
2925 // Check for Synthetic tag | |
2926 // Shouldn't we check that the synthetic flags wasn't already set? - not required in spec | |
2927 if (attribute_length != 0) { | |
2928 classfile_parse_error( | |
2929 "Invalid Synthetic classfile attribute length %u in class file %s", | |
2930 attribute_length, CHECK); | |
2931 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2932 parse_classfile_synthetic_attribute(CHECK); |
0 | 2933 } else if (tag == vmSymbols::tag_deprecated()) { |
2934 // Check for Deprecatd tag - 4276120 | |
2935 if (attribute_length != 0) { | |
2936 classfile_parse_error( | |
2937 "Invalid Deprecated classfile attribute length %u in class file %s", | |
2938 attribute_length, CHECK); | |
2939 } | |
2940 } else if (_major_version >= JAVA_1_5_VERSION) { | |
2941 if (tag == vmSymbols::tag_signature()) { | |
2942 if (attribute_length != 2) { | |
2943 classfile_parse_error( | |
2944 "Wrong Signature attribute length %u in class file %s", | |
2945 attribute_length, CHECK); | |
2946 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2947 parse_classfile_signature_attribute(CHECK); |
0 | 2948 } else if (tag == vmSymbols::tag_runtime_visible_annotations()) { |
2949 runtime_visible_annotations_length = attribute_length; | |
2950 runtime_visible_annotations = cfs->get_u1_buffer(); | |
2951 assert(runtime_visible_annotations != NULL, "null visible annotations"); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2952 parse_annotations(runtime_visible_annotations, |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2953 runtime_visible_annotations_length, |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2954 parsed_annotations, |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
2955 CHECK); |
0 | 2956 cfs->skip_u1(runtime_visible_annotations_length, CHECK); |
2957 } else if (PreserveAllAnnotations && tag == vmSymbols::tag_runtime_invisible_annotations()) { | |
2958 runtime_invisible_annotations_length = attribute_length; | |
2959 runtime_invisible_annotations = cfs->get_u1_buffer(); | |
2960 assert(runtime_invisible_annotations != NULL, "null invisible annotations"); | |
2961 cfs->skip_u1(runtime_invisible_annotations_length, CHECK); | |
2962 } else if (tag == vmSymbols::tag_enclosing_method()) { | |
2963 if (parsed_enclosingmethod_attribute) { | |
2964 classfile_parse_error("Multiple EnclosingMethod attributes in class file %s", CHECK); | |
2965 } else { | |
2966 parsed_enclosingmethod_attribute = true; | |
2967 } | |
2968 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
|
2969 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
|
2970 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
|
2971 if (enclosing_method_class_index == 0) { |
0 | 2972 classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK); |
2973 } | |
2974 // Validate the constant pool indices and types | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2975 check_property(valid_klass_reference_at(enclosing_method_class_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2976 "Invalid or out-of-bounds class index in EnclosingMethod attribute in class file %s", CHECK); |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
2977 if (enclosing_method_method_index != 0 && |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2978 (!_cp->is_within_bounds(enclosing_method_method_index) || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2979 !_cp->tag_at(enclosing_method_method_index).is_name_and_type())) { |
0 | 2980 classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK); |
2981 } | |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
2982 } 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
|
2983 _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
|
2984 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
|
2985 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
|
2986 parsed_bootstrap_methods_attribute = true; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
2987 parse_classfile_bootstrap_methods_attribute(attribute_length, CHECK); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2988 } else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) { |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2989 if (runtime_visible_type_annotations != NULL) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2990 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2991 "Multiple RuntimeVisibleTypeAnnotations attributes in class file %s", CHECK); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2992 } |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2993 runtime_visible_type_annotations_length = attribute_length; |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2994 runtime_visible_type_annotations = cfs->get_u1_buffer(); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2995 assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2996 // No need for the VM to parse Type annotations |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7187
diff
changeset
|
2997 cfs->skip_u1(runtime_visible_type_annotations_length, CHECK); |
12201
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2998 } else if (tag == vmSymbols::tag_runtime_invisible_type_annotations()) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
2999 if (runtime_invisible_type_annotations_exists) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3000 classfile_parse_error( |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3001 "Multiple RuntimeInvisibleTypeAnnotations attributes in class file %s", CHECK); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3002 } else { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3003 runtime_invisible_type_annotations_exists = true; |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3004 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3005 if (PreserveAllAnnotations) { |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3006 runtime_invisible_type_annotations_length = attribute_length; |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3007 runtime_invisible_type_annotations = cfs->get_u1_buffer(); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3008 assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations"); |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3009 } |
b6767a18b379
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
12131
diff
changeset
|
3010 cfs->skip_u1(attribute_length, CHECK); |
0 | 3011 } else { |
3012 // Unknown attribute | |
3013 cfs->skip_u1(attribute_length, CHECK); | |
3014 } | |
3015 } else { | |
3016 // Unknown attribute | |
3017 cfs->skip_u1(attribute_length, CHECK); | |
3018 } | |
3019 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3020 _annotations = assemble_annotations(runtime_visible_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3021 runtime_visible_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3022 runtime_invisible_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3023 runtime_invisible_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3024 CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3025 _type_annotations = assemble_annotations(runtime_visible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3026 runtime_visible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3027 runtime_invisible_type_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3028 runtime_invisible_type_annotations_length, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3029 CHECK); |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
3030 |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3031 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
|
3032 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
|
3033 inner_classes_attribute_start, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3034 parsed_innerclasses_attribute, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3035 enclosing_method_class_index, |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3036 enclosing_method_method_index, |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3037 CHECK); |
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3038 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
|
3039 guarantee_property( |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3040 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
|
3041 "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
|
3042 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3043 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4755
diff
changeset
|
3044 |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
3045 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
|
3046 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
|
3047 "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
|
3048 } |
0 | 3049 } |
3050 | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3051 void ClassFileParser::apply_parsed_class_attributes(instanceKlassHandle k) { |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3052 if (_synthetic_flag) |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3053 k->set_is_synthetic(); |
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
3054 if (_sourcefile_index != 0) { |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
3055 k->set_source_file_name_index(_sourcefile_index); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3056 } |
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
3057 if (_generic_signature_index != 0) { |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
3058 k->set_generic_signature_index(_generic_signature_index); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3059 } |
6226 | 3060 if (_sde_buffer != NULL) { |
3061 k->set_source_debug_extension(_sde_buffer, _sde_length); | |
3062 } | |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3063 } |
0 | 3064 |
20703
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3065 // Create the Annotations object that will |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3066 // hold the annotations array for the Klass. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3067 void ClassFileParser::create_combined_annotations(TRAPS) { |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3068 if (_annotations == NULL && |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3069 _type_annotations == NULL && |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3070 _fields_annotations == NULL && |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3071 _fields_type_annotations == NULL) { |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3072 // Don't create the Annotations object unnecessarily. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3073 return; |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3074 } |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3075 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3076 Annotations* annotations = Annotations::allocate(_loader_data, CHECK); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3077 annotations->set_class_annotations(_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3078 annotations->set_class_type_annotations(_type_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3079 annotations->set_fields_annotations(_fields_annotations); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3080 annotations->set_fields_type_annotations(_fields_type_annotations); |
20703
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3081 |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3082 // This is the Annotations object that will be |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3083 // assigned to InstanceKlass being constructed. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3084 _combined_annotations = annotations; |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3085 |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3086 // The annotations arrays below has been transfered the |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3087 // _combined_annotations so these fields can now be cleared. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3088 _annotations = NULL; |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3089 _type_annotations = NULL; |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3090 _fields_annotations = NULL; |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3091 _fields_type_annotations = NULL; |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3092 } |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3093 |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3094 // Transfer ownership of metadata allocated to the InstanceKlass. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3095 void ClassFileParser::apply_parsed_class_metadata( |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3096 instanceKlassHandle this_klass, |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3097 int java_fields_count, TRAPS) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3098 _cp->set_pool_holder(this_klass()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3099 this_klass->set_constants(_cp); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3100 this_klass->set_fields(_fields, java_fields_count); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3101 this_klass->set_methods(_methods); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3102 this_klass->set_inner_classes(_inner_classes); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3103 this_klass->set_local_interfaces(_local_interfaces); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3104 this_klass->set_transitive_interfaces(_transitive_interfaces); |
20703
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3105 this_klass->set_annotations(_combined_annotations); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3106 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3107 // Clear out these fields so they don't get deallocated by the destructor |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3108 clear_class_metadata(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3109 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3110 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3111 AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annotations, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3112 int runtime_visible_annotations_length, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3113 u1* runtime_invisible_annotations, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3114 int runtime_invisible_annotations_length, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3115 AnnotationArray* annotations = NULL; |
0 | 3116 if (runtime_visible_annotations != NULL || |
3117 runtime_invisible_annotations != NULL) { | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3118 annotations = MetadataFactory::new_array<u1>(_loader_data, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3119 runtime_visible_annotations_length + |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3120 runtime_invisible_annotations_length, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3121 CHECK_(annotations)); |
0 | 3122 if (runtime_visible_annotations != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3123 for (int i = 0; i < runtime_visible_annotations_length; i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3124 annotations->at_put(i, runtime_visible_annotations[i]); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3125 } |
0 | 3126 } |
3127 if (runtime_invisible_annotations != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3128 for (int i = 0; i < runtime_invisible_annotations_length; i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3129 int append = runtime_visible_annotations_length+i; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3130 annotations->at_put(append, runtime_invisible_annotations[i]); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3131 } |
0 | 3132 } |
3133 } | |
3134 return annotations; | |
3135 } | |
3136 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3137 instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3138 TRAPS) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3139 instanceKlassHandle super_klass; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3140 if (super_class_index == 0) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3141 check_property(_class_name == vmSymbols::java_lang_Object(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3142 "Invalid superclass index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3143 super_class_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3144 CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3145 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3146 check_property(valid_klass_reference_at(super_class_index), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3147 "Invalid superclass index %u in class file %s", |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3148 super_class_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3149 CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3150 // The class name should be legal because it is checked when parsing constant pool. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3151 // However, make sure it is not an array type. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3152 bool is_array = false; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3153 if (_cp->tag_at(super_class_index).is_klass()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3154 super_klass = instanceKlassHandle(THREAD, _cp->resolved_klass_at(super_class_index)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3155 if (_need_verify) |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3156 is_array = super_klass->oop_is_array(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3157 } else if (_need_verify) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3158 is_array = (_cp->unresolved_klass_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3159 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3160 if (_need_verify) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3161 guarantee_property(!is_array, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3162 "Bad superclass name in class file %s", CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3163 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3164 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3165 return super_klass; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3166 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3167 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3168 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3169 // Values needed for oopmap and InstanceKlass creation |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3170 class FieldLayoutInfo : public StackObj { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3171 public: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3172 int* nonstatic_oop_offsets; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3173 unsigned int* nonstatic_oop_counts; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3174 unsigned int nonstatic_oop_map_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3175 unsigned int total_oop_map_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3176 int instance_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3177 int nonstatic_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3178 int static_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3179 bool has_nonstatic_fields; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3180 }; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3181 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3182 // Layout fields and fill in FieldLayoutInfo. Could use more refactoring! |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3183 void ClassFileParser::layout_fields(Handle class_loader, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3184 FieldAllocationCount* fac, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3185 ClassAnnotationCollector* parsed_annotations, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3186 FieldLayoutInfo* info, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3187 TRAPS) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3188 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3189 // Field size and offset computation |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3190 int nonstatic_field_size = _super_klass() == NULL ? 0 : _super_klass()->nonstatic_field_size(); |
23822
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3191 int next_static_oop_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3192 int next_static_double_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3193 int next_static_word_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3194 int next_static_short_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3195 int next_static_byte_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3196 int next_nonstatic_oop_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3197 int next_nonstatic_double_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3198 int next_nonstatic_word_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3199 int next_nonstatic_short_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3200 int next_nonstatic_byte_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3201 int first_nonstatic_oop_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3202 int next_nonstatic_field_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3203 int next_nonstatic_padded_offset = 0; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3204 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3205 // Count the contended fields by type. |
10314 | 3206 // |
3207 // We ignore static fields, because @Contended is not supported for them. | |
3208 // The layout code below will also ignore the static fields. | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3209 int nonstatic_contended_count = 0; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3210 FieldAllocationCount fac_contended; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3211 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3212 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3213 if (fs.is_contended()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3214 fac_contended.count[atype]++; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3215 if (!fs.access_flags().is_static()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3216 nonstatic_contended_count++; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3217 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3218 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3219 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3220 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3221 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3222 // Calculate the starting byte offsets |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3223 next_static_oop_offset = InstanceMirrorKlass::offset_of_static_fields(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3224 next_static_double_offset = next_static_oop_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3225 ((fac->count[STATIC_OOP]) * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3226 if ( fac->count[STATIC_DOUBLE] && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3227 (Universe::field_type_should_be_aligned(T_DOUBLE) || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3228 Universe::field_type_should_be_aligned(T_LONG)) ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3229 next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3230 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3231 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3232 next_static_word_offset = next_static_double_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3233 ((fac->count[STATIC_DOUBLE]) * BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3234 next_static_short_offset = next_static_word_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3235 ((fac->count[STATIC_WORD]) * BytesPerInt); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3236 next_static_byte_offset = next_static_short_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3237 ((fac->count[STATIC_SHORT]) * BytesPerShort); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3238 |
10314 | 3239 int nonstatic_fields_start = instanceOopDesc::base_offset_in_bytes() + |
3240 nonstatic_field_size * heapOopSize; | |
3241 | |
3242 next_nonstatic_field_offset = nonstatic_fields_start; | |
3243 | |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3244 bool is_contended_class = parsed_annotations->is_contended(); |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3245 |
10314 | 3246 // Class is contended, pad before all the fields |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3247 if (is_contended_class) { |
10314 | 3248 next_nonstatic_field_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3249 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3250 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3251 // Compute the non-contended fields count. |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3252 // The packing code below relies on these counts to determine if some field |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3253 // can be squeezed into the alignment gap. Contended fields are obviously |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3254 // exempt from that. |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3255 unsigned int nonstatic_double_count = fac->count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE]; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3256 unsigned int nonstatic_word_count = fac->count[NONSTATIC_WORD] - fac_contended.count[NONSTATIC_WORD]; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3257 unsigned int nonstatic_short_count = fac->count[NONSTATIC_SHORT] - fac_contended.count[NONSTATIC_SHORT]; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3258 unsigned int nonstatic_byte_count = fac->count[NONSTATIC_BYTE] - fac_contended.count[NONSTATIC_BYTE]; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3259 unsigned int nonstatic_oop_count = fac->count[NONSTATIC_OOP] - fac_contended.count[NONSTATIC_OOP]; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3260 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3261 // Total non-static fields count, including every contended field |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3262 unsigned int nonstatic_fields_count = fac->count[NONSTATIC_DOUBLE] + fac->count[NONSTATIC_WORD] + |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3263 fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] + |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3264 fac->count[NONSTATIC_OOP]; |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3265 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3266 bool super_has_nonstatic_fields = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3267 (_super_klass() != NULL && _super_klass->has_nonstatic_fields()); |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3268 bool has_nonstatic_fields = super_has_nonstatic_fields || (nonstatic_fields_count != 0); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3269 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3270 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3271 // Prepare list of oops for oop map generation. |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3272 // |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3273 // "offset" and "count" lists are describing the set of contiguous oop |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3274 // regions. offset[i] is the start of the i-th region, which then has |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3275 // count[i] oops following. Before we know how many regions are required, |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3276 // we pessimistically allocate the maps to fit all the oops into the |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3277 // distinct regions. |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3278 // |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3279 // TODO: We add +1 to always allocate non-zero resource arrays; we need |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3280 // to figure out if we still need to do this. |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3281 int* nonstatic_oop_offsets; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3282 unsigned int* nonstatic_oop_counts; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3283 unsigned int nonstatic_oop_map_count = 0; |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3284 unsigned int max_nonstatic_oop_maps = fac->count[NONSTATIC_OOP] + 1; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3285 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3286 nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD( |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3287 THREAD, int, max_nonstatic_oop_maps); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3288 nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD( |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3289 THREAD, unsigned int, max_nonstatic_oop_maps); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3290 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3291 first_nonstatic_oop_offset = 0; // will be set for first oop field |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3292 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3293 bool compact_fields = CompactFields; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3294 int allocation_style = FieldsAllocationStyle; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3295 if( allocation_style < 0 || allocation_style > 2 ) { // Out of range? |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3296 assert(false, "0 <= FieldsAllocationStyle <= 2"); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3297 allocation_style = 1; // Optimistic |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3298 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3299 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3300 // The next classes have predefined hard-coded fields offsets |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3301 // (see in JavaClasses::compute_hard_coded_offsets()). |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3302 // Use default fields allocation order for them. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3303 if( (allocation_style != 0 || compact_fields ) && class_loader.is_null() && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3304 (_class_name == vmSymbols::java_lang_AssertionStatusDirectives() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3305 _class_name == vmSymbols::java_lang_Class() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3306 _class_name == vmSymbols::java_lang_ClassLoader() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3307 _class_name == vmSymbols::java_lang_ref_Reference() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3308 _class_name == vmSymbols::java_lang_ref_SoftReference() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3309 _class_name == vmSymbols::java_lang_StackTraceElement() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3310 _class_name == vmSymbols::java_lang_String() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3311 _class_name == vmSymbols::java_lang_Throwable() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3312 _class_name == vmSymbols::java_lang_Boolean() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3313 _class_name == vmSymbols::java_lang_Character() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3314 _class_name == vmSymbols::java_lang_Float() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3315 _class_name == vmSymbols::java_lang_Double() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3316 _class_name == vmSymbols::java_lang_Byte() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3317 _class_name == vmSymbols::java_lang_Short() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3318 _class_name == vmSymbols::java_lang_Integer() || |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3319 _class_name == vmSymbols::java_lang_Long())) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3320 allocation_style = 0; // Allocate oops first |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3321 compact_fields = false; // Don't compact fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3322 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3323 |
10314 | 3324 // Rearrange fields for a given allocation style |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3325 if( allocation_style == 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3326 // Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3327 next_nonstatic_oop_offset = next_nonstatic_field_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3328 next_nonstatic_double_offset = next_nonstatic_oop_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3329 (nonstatic_oop_count * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3330 } else if( allocation_style == 1 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3331 // Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3332 next_nonstatic_double_offset = next_nonstatic_field_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3333 } else if( allocation_style == 2 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3334 // Fields allocation: oops fields in super and sub classes are together. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3335 if( nonstatic_field_size > 0 && _super_klass() != NULL && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3336 _super_klass->nonstatic_oop_map_size() > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3337 unsigned int map_count = _super_klass->nonstatic_oop_map_count(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3338 OopMapBlock* first_map = _super_klass->start_of_nonstatic_oop_maps(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3339 OopMapBlock* last_map = first_map + map_count - 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3340 int next_offset = last_map->offset() + (last_map->count() * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3341 if (next_offset == next_nonstatic_field_offset) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3342 allocation_style = 0; // allocate oops first |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3343 next_nonstatic_oop_offset = next_nonstatic_field_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3344 next_nonstatic_double_offset = next_nonstatic_oop_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3345 (nonstatic_oop_count * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3346 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3347 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3348 if( allocation_style == 2 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3349 allocation_style = 1; // allocate oops last |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3350 next_nonstatic_double_offset = next_nonstatic_field_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3351 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3352 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3353 ShouldNotReachHere(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3354 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3355 |
23822
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3356 int nonstatic_oop_space_count = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3357 int nonstatic_word_space_count = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3358 int nonstatic_short_space_count = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3359 int nonstatic_byte_space_count = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3360 int nonstatic_oop_space_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3361 int nonstatic_word_space_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3362 int nonstatic_short_space_offset = 0; |
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3363 int nonstatic_byte_space_offset = 0; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3364 |
10314 | 3365 // Try to squeeze some of the fields into the gaps due to |
3366 // long/double alignment. | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3367 if( nonstatic_double_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3368 int offset = next_nonstatic_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3369 next_nonstatic_double_offset = align_size_up(offset, BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3370 if( compact_fields && offset != next_nonstatic_double_offset ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3371 // Allocate available fields into the gap before double field. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3372 int length = next_nonstatic_double_offset - offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3373 assert(length == BytesPerInt, ""); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3374 nonstatic_word_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3375 if( nonstatic_word_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3376 nonstatic_word_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3377 nonstatic_word_space_count = 1; // Only one will fit |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3378 length -= BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3379 offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3380 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3381 nonstatic_short_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3382 while( length >= BytesPerShort && nonstatic_short_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3383 nonstatic_short_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3384 nonstatic_short_space_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3385 length -= BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3386 offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3387 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3388 nonstatic_byte_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3389 while( length > 0 && nonstatic_byte_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3390 nonstatic_byte_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3391 nonstatic_byte_space_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3392 length -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3393 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3394 // Allocate oop field in the gap if there are no other fields for that. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3395 nonstatic_oop_space_offset = offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3396 if( length >= heapOopSize && nonstatic_oop_count > 0 && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3397 allocation_style != 0 ) { // when oop fields not first |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3398 nonstatic_oop_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3399 nonstatic_oop_space_count = 1; // Only one will fit |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3400 length -= heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3401 offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3402 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3403 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3404 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3405 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3406 next_nonstatic_word_offset = next_nonstatic_double_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3407 (nonstatic_double_count * BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3408 next_nonstatic_short_offset = next_nonstatic_word_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3409 (nonstatic_word_count * BytesPerInt); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3410 next_nonstatic_byte_offset = next_nonstatic_short_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3411 (nonstatic_short_count * BytesPerShort); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3412 next_nonstatic_padded_offset = next_nonstatic_byte_offset + |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3413 nonstatic_byte_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3414 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3415 // let oops jump before padding with this allocation style |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3416 if( allocation_style == 1 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3417 next_nonstatic_oop_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3418 if( nonstatic_oop_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3419 next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3420 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3421 next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3422 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3423 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3424 // Iterate over fields again and compute correct offsets. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3425 // The field allocation type was temporarily stored in the offset slot. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3426 // oop fields are located before non-oop fields (static and non-static). |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3427 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3428 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3429 // skip already laid out fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3430 if (fs.is_offset_set()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3431 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3432 // contended instance fields are handled below |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3433 if (fs.is_contended() && !fs.access_flags().is_static()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3434 |
23822
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3435 int real_offset = 0; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3436 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3437 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3438 // pack the rest of the fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3439 switch (atype) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3440 case STATIC_OOP: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3441 real_offset = next_static_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3442 next_static_oop_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3443 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3444 case STATIC_BYTE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3445 real_offset = next_static_byte_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3446 next_static_byte_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3447 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3448 case STATIC_SHORT: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3449 real_offset = next_static_short_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3450 next_static_short_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3451 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3452 case STATIC_WORD: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3453 real_offset = next_static_word_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3454 next_static_word_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3455 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3456 case STATIC_DOUBLE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3457 real_offset = next_static_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3458 next_static_double_offset += BytesPerLong; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3459 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3460 case NONSTATIC_OOP: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3461 if( nonstatic_oop_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3462 real_offset = nonstatic_oop_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3463 nonstatic_oop_space_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3464 nonstatic_oop_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3465 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3466 real_offset = next_nonstatic_oop_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3467 next_nonstatic_oop_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3468 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3469 // Update oop maps |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3470 if( nonstatic_oop_map_count > 0 && |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3471 nonstatic_oop_offsets[nonstatic_oop_map_count - 1] == |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3472 real_offset - |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3473 int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) * |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3474 heapOopSize ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3475 // Extend current oop map |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3476 assert(nonstatic_oop_map_count - 1 < max_nonstatic_oop_maps, "range check"); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3477 nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3478 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3479 // Create new oop map |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3480 assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check"); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3481 nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3482 nonstatic_oop_counts [nonstatic_oop_map_count] = 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3483 nonstatic_oop_map_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3484 if( first_nonstatic_oop_offset == 0 ) { // Undefined |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3485 first_nonstatic_oop_offset = real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3486 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3487 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3488 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3489 case NONSTATIC_BYTE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3490 if( nonstatic_byte_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3491 real_offset = nonstatic_byte_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3492 nonstatic_byte_space_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3493 nonstatic_byte_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3494 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3495 real_offset = next_nonstatic_byte_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3496 next_nonstatic_byte_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3497 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3498 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3499 case NONSTATIC_SHORT: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3500 if( nonstatic_short_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3501 real_offset = nonstatic_short_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3502 nonstatic_short_space_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3503 nonstatic_short_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3504 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3505 real_offset = next_nonstatic_short_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3506 next_nonstatic_short_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3507 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3508 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3509 case NONSTATIC_WORD: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3510 if( nonstatic_word_space_count > 0 ) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3511 real_offset = nonstatic_word_space_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3512 nonstatic_word_space_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3513 nonstatic_word_space_count -= 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3514 } else { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3515 real_offset = next_nonstatic_word_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3516 next_nonstatic_word_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3517 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3518 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3519 case NONSTATIC_DOUBLE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3520 real_offset = next_nonstatic_double_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3521 next_nonstatic_double_offset += BytesPerLong; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3522 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3523 default: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3524 ShouldNotReachHere(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3525 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3526 fs.set_offset(real_offset); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3527 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3528 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3529 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3530 // Handle the contended cases. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3531 // |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3532 // Each contended field should not intersect the cache line with another contended field. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3533 // In the absence of alignment information, we end up with pessimistically separating |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3534 // the fields with full-width padding. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3535 // |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3536 // Additionally, this should not break alignment for the fields, so we round the alignment up |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3537 // for each field. |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3538 if (nonstatic_contended_count > 0) { |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3539 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3540 // if there is at least one contended field, we need to have pre-padding for them |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3541 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3542 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3543 // collect all contended groups |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3544 BitMap bm(_cp->size()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3545 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3546 // skip already laid out fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3547 if (fs.is_offset_set()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3548 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3549 if (fs.is_contended()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3550 bm.set_bit(fs.contended_group()); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3551 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3552 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3553 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3554 int current_group = -1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3555 while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3556 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3557 for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3558 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3559 // skip already laid out fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3560 if (fs.is_offset_set()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3561 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3562 // skip non-contended fields and fields from different group |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3563 if (!fs.is_contended() || (fs.contended_group() != current_group)) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3564 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3565 // handle statics below |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3566 if (fs.access_flags().is_static()) continue; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3567 |
23822
626f594dffa6
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
csahu
parents:
23182
diff
changeset
|
3568 int real_offset = 0; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3569 FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3570 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3571 switch (atype) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3572 case NONSTATIC_BYTE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3573 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3574 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3575 next_nonstatic_padded_offset += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3576 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3577 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3578 case NONSTATIC_SHORT: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3579 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3580 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3581 next_nonstatic_padded_offset += BytesPerShort; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3582 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3583 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3584 case NONSTATIC_WORD: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3585 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3586 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3587 next_nonstatic_padded_offset += BytesPerInt; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3588 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3589 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3590 case NONSTATIC_DOUBLE: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3591 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3592 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3593 next_nonstatic_padded_offset += BytesPerLong; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3594 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3595 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3596 case NONSTATIC_OOP: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3597 next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3598 real_offset = next_nonstatic_padded_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3599 next_nonstatic_padded_offset += heapOopSize; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3600 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3601 // Create new oop map |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3602 assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check"); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3603 nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3604 nonstatic_oop_counts [nonstatic_oop_map_count] = 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3605 nonstatic_oop_map_count += 1; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3606 if( first_nonstatic_oop_offset == 0 ) { // Undefined |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3607 first_nonstatic_oop_offset = real_offset; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3608 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3609 break; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3610 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3611 default: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3612 ShouldNotReachHere(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3613 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3614 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3615 if (fs.contended_group() == 0) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3616 // Contended group defines the equivalence class over the fields: |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3617 // the fields within the same contended group are not inter-padded. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3618 // The only exception is default group, which does not incur the |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3619 // equivalence, and so requires intra-padding. |
10314 | 3620 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3621 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3622 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3623 fs.set_offset(real_offset); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3624 } // for |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3625 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3626 // Start laying out the next group. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3627 // Note that this will effectively pad the last group in the back; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3628 // this is expected to alleviate memory contention effects for |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3629 // subclass fields and/or adjacent object. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3630 // If this was the default group, the padding is already in place. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3631 if (current_group != 0) { |
10314 | 3632 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3633 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3634 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3635 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3636 // handle static fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3637 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3638 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3639 // Entire class is contended, pad in the back. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3640 // This helps to alleviate memory contention effects for subclass fields |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3641 // and/or adjacent object. |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3642 if (is_contended_class) { |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3643 next_nonstatic_padded_offset += ContendedPaddingWidth; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3644 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3645 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3646 int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset; |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3647 |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3648 int nonstatic_fields_end = align_size_up(notaligned_nonstatic_fields_end, heapOopSize); |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3649 int instance_end = align_size_up(notaligned_nonstatic_fields_end, wordSize); |
10314 | 3650 int static_fields_end = align_size_up(next_static_byte_offset, wordSize); |
3651 | |
3652 int static_field_size = (static_fields_end - | |
3653 InstanceMirrorKlass::offset_of_static_fields()) / wordSize; | |
3654 nonstatic_field_size = nonstatic_field_size + | |
3655 (nonstatic_fields_end - nonstatic_fields_start) / heapOopSize; | |
3656 | |
3657 int instance_size = align_object_size(instance_end / wordSize); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3658 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3659 assert(instance_size == align_object_size(align_size_up( |
10303
205dd30230e1
8012939: @Contended doesn't work correctly with inheritance
shade
parents:
10269
diff
changeset
|
3660 (instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize), |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3661 wordSize) / wordSize), "consistent layout helper value"); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3662 |
10348
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3663 // Invariant: nonstatic_field end/start should only change if there are |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3664 // nonstatic fields in the class, or if the class is contended. We compare |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3665 // against the non-aligned value, so that end alignment will not fail the |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3666 // assert without actually having the fields. |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3667 assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) || |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3668 is_contended_class || |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3669 (nonstatic_fields_count > 0), "double-check nonstatic start/end"); |
3970971c91e0
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
10343
diff
changeset
|
3670 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3671 // Number of non-static oop map blocks allocated at end of klass. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3672 const unsigned int total_oop_map_count = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3673 compute_oop_map_count(_super_klass, nonstatic_oop_map_count, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3674 first_nonstatic_oop_offset); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3675 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3676 #ifndef PRODUCT |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3677 if (PrintFieldLayout) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3678 print_field_layout(_class_name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3679 _fields, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3680 _cp, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3681 instance_size, |
10314 | 3682 nonstatic_fields_start, |
3683 nonstatic_fields_end, | |
3684 static_fields_end); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3685 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3686 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3687 #endif |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3688 // Pass back information needed for InstanceKlass creation |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3689 info->nonstatic_oop_offsets = nonstatic_oop_offsets; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3690 info->nonstatic_oop_counts = nonstatic_oop_counts; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3691 info->nonstatic_oop_map_count = nonstatic_oop_map_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3692 info->total_oop_map_count = total_oop_map_count; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3693 info->instance_size = instance_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3694 info->static_field_size = static_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3695 info->nonstatic_field_size = nonstatic_field_size; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3696 info->has_nonstatic_fields = has_nonstatic_fields; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3697 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3698 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3699 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3700 instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
3701 ClassLoaderData* loader_data, |
0 | 3702 Handle protection_domain, |
710 | 3703 KlassHandle host_klass, |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3704 GrowableArray<Handle>* cp_patches, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3705 TempNewSymbol& parsed_name, |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
879
diff
changeset
|
3706 bool verify, |
0 | 3707 TRAPS) { |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7457
diff
changeset
|
3708 |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3709 // When a retransformable agent is attached, JVMTI caches the |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3710 // class bytes that existed before the first retransformation. |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3711 // If RedefineClasses() was used before the retransformable |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3712 // agent attached, then the cached class bytes may not be the |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3713 // original class bytes. |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
3714 JvmtiCachedClassFileData *cached_class_file = NULL; |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
3715 Handle class_loader(THREAD, loader_data->class_loader()); |
6934 | 3716 bool has_default_methods = false; |
20576
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
3717 bool declares_default_methods = false; |
6934 | 3718 ResourceMark rm(THREAD); |
0 | 3719 |
3720 ClassFileStream* cfs = stream(); | |
3721 // Timing | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3722 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
|
3723 JavaThread* jt = (JavaThread*) THREAD; |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3724 |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3725 PerfClassTraceTime ctimer(ClassLoader::perf_class_parse_time(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3726 ClassLoader::perf_class_parse_selftime(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3727 NULL, |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3728 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
|
3729 jt->get_thread_stat()->perf_timers_addr(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3730 PerfClassTraceTime::PARSE_CLASS); |
0 | 3731 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3732 init_parsed_class_attributes(loader_data); |
0 | 3733 |
3734 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
|
3735 // 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
|
3736 // 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
|
3737 // 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
|
3738 // 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
|
3739 // avoid the bug described by 7126851. |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3740 JvmtiThreadState *state = jt->jvmti_thread_state(); |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3741 if (state != NULL) { |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3742 KlassHandle *h_class_being_redefined = |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3743 state->get_class_being_redefined(); |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3744 if (h_class_being_redefined != NULL) { |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3745 instanceKlassHandle ikh_class_being_redefined = |
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3746 instanceKlassHandle(THREAD, (*h_class_being_redefined)()); |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
3747 cached_class_file = ikh_class_being_redefined->get_cached_class_file(); |
4751
5b58979183f9
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
4731
diff
changeset
|
3748 } |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3749 } |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3750 |
0 | 3751 unsigned char* ptr = cfs->buffer(); |
3752 unsigned char* end_ptr = cfs->buffer() + cfs->length(); | |
3753 | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
3754 JvmtiExport::post_class_file_load_hook(name, class_loader(), protection_domain, |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
3755 &ptr, &end_ptr, &cached_class_file); |
0 | 3756 |
3757 if (ptr != cfs->buffer()) { | |
3758 // JVMTI agent has modified class file data. | |
3759 // Set new class file stream using JVMTI agent modified | |
3760 // class file data. | |
3761 cfs = new ClassFileStream(ptr, end_ptr - ptr, cfs->source()); | |
3762 set_stream(cfs); | |
3763 } | |
3764 } | |
3765 | |
710 | 3766 _host_klass = host_klass; |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3767 _cp_patches = cp_patches; |
0 | 3768 |
3769 instanceKlassHandle nullHandle; | |
3770 | |
3771 // Figure out whether we can skip format checking (matching classic VM behavior) | |
20375
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3772 if (DumpSharedSpaces) { |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3773 // verify == true means it's a 'remote' class (i.e., non-boot class) |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3774 // Verification decision is based on BytecodeVerificationRemote flag |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3775 // for those classes. |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3776 _need_verify = (verify) ? BytecodeVerificationRemote : |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3777 BytecodeVerificationLocal; |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3778 } else { |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3779 _need_verify = Verifier::should_verify_for(class_loader(), verify); |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3780 } |
0 | 3781 |
3782 // Set the verify flag in stream | |
3783 cfs->set_verify(_need_verify); | |
3784 | |
3785 // 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
|
3786 _class_name = (name != NULL) ? name : vmSymbols::unknown_class_name(); |
0 | 3787 |
3788 cfs->guarantee_more(8, CHECK_(nullHandle)); // magic, major, minor | |
3789 // Magic value | |
3790 u4 magic = cfs->get_u4_fast(); | |
3791 guarantee_property(magic == JAVA_CLASSFILE_MAGIC, | |
3792 "Incompatible magic value %u in class file %s", | |
3793 magic, CHECK_(nullHandle)); | |
3794 | |
3795 // Version numbers | |
3796 u2 minor_version = cfs->get_u2_fast(); | |
3797 u2 major_version = cfs->get_u2_fast(); | |
3798 | |
20375
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3799 if (DumpSharedSpaces && major_version < JAVA_1_5_VERSION) { |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3800 ResourceMark rm; |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3801 warning("Pre JDK 1.5 class not supported by CDS: %u.%u %s", |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3802 major_version, minor_version, name->as_C_string()); |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3803 Exceptions::fthrow( |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3804 THREAD_AND_LOCATION, |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3805 vmSymbols::java_lang_UnsupportedClassVersionError(), |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3806 "Unsupported major.minor version for dump time %u.%u", |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3807 major_version, |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3808 minor_version); |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3809 } |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3810 |
0 | 3811 // Check version numbers - we check this even with verifier off |
3812 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
|
3813 if (name == NULL) { |
0 | 3814 Exceptions::fthrow( |
3815 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3816 vmSymbols::java_lang_UnsupportedClassVersionError(), |
17879
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3817 "Unsupported class file version %u.%u, " |
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3818 "this version of the Java Runtime only recognizes class file versions up to %u.%u", |
0 | 3819 major_version, |
17879
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3820 minor_version, |
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3821 JAVA_MAX_SUPPORTED_VERSION, |
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3822 JAVA_MAX_SUPPORTED_MINOR_VERSION); |
0 | 3823 } else { |
3824 ResourceMark rm(THREAD); | |
3825 Exceptions::fthrow( | |
3826 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3827 vmSymbols::java_lang_UnsupportedClassVersionError(), |
17879
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3828 "%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), " |
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3829 "this version of the Java Runtime only recognizes class file versions up to %u.%u", |
0 | 3830 name->as_C_string(), |
3831 major_version, | |
17879
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3832 minor_version, |
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3833 JAVA_MAX_SUPPORTED_VERSION, |
d55853ba088b
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
17646
diff
changeset
|
3834 JAVA_MAX_SUPPORTED_MINOR_VERSION); |
0 | 3835 } |
3836 return nullHandle; | |
3837 } | |
3838 | |
3839 _major_version = major_version; | |
3840 _minor_version = minor_version; | |
3841 | |
3842 | |
3843 // Check if verification needs to be relaxed for this class file | |
3844 // Do not restrict it to jdk1.0 or jdk1.1 to maintain backward compatibility (4982376) | |
3845 _relax_verify = Verifier::relax_verify_for(class_loader()); | |
3846 | |
3847 // Constant pool | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3848 constantPoolHandle cp = parse_constant_pool(CHECK_(nullHandle)); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3849 |
0 | 3850 int cp_size = cp->length(); |
3851 | |
3852 cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len | |
3853 | |
3854 // Access flags | |
3855 AccessFlags access_flags; | |
3856 jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS; | |
3857 | |
3858 if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { | |
3859 // Set abstract bit for old class files for backward compatibility | |
3860 flags |= JVM_ACC_ABSTRACT; | |
3861 } | |
3862 verify_legal_class_modifiers(flags, CHECK_(nullHandle)); | |
3863 access_flags.set_flags(flags); | |
3864 | |
3865 // This class and superclass | |
3866 u2 this_class_index = cfs->get_u2_fast(); | |
3867 check_property( | |
3868 valid_cp_range(this_class_index, cp_size) && | |
3869 cp->tag_at(this_class_index).is_unresolved_klass(), | |
3870 "Invalid this class index %u in constant pool in class file %s", | |
3871 this_class_index, CHECK_(nullHandle)); | |
3872 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3873 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
|
3874 assert(class_name != NULL, "class_name can't be null"); |
0 | 3875 |
3876 // It's important to set parsed_name *before* resolving the super class. | |
3877 // (it's used for cleanup by the caller if parsing fails) | |
3878 parsed_name = class_name; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3879 // 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
|
3880 // its reference count. Caller will decrement the refcount. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3881 parsed_name->increment_refcount(); |
0 | 3882 |
3883 // Update _class_name which could be null previously to be class_name | |
3884 _class_name = class_name; | |
3885 | |
3886 // Don't need to check whether this class name is legal or not. | |
3887 // It has been checked when constant pool is parsed. | |
3888 // However, make sure it is not an array type. | |
3889 if (_need_verify) { | |
3890 guarantee_property(class_name->byte_at(0) != JVM_SIGNATURE_ARRAY, | |
3891 "Bad class name in class file %s", | |
3892 CHECK_(nullHandle)); | |
3893 } | |
3894 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3895 Klass* preserve_this_klass; // for storing result across HandleMark |
0 | 3896 |
3897 // release all handles when parsing is done | |
3898 { HandleMark hm(THREAD); | |
3899 | |
3900 // 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
|
3901 if (name != NULL && class_name != name) { |
0 | 3902 ResourceMark rm(THREAD); |
3903 Exceptions::fthrow( | |
3904 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3905 vmSymbols::java_lang_NoClassDefFoundError(), |
0 | 3906 "%s (wrong name: %s)", |
3907 name->as_C_string(), | |
3908 class_name->as_C_string() | |
3909 ); | |
3910 return nullHandle; | |
3911 } | |
3912 | |
3913 if (TraceClassLoadingPreorder) { | |
10128
41ed397cc0cd
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
9083
diff
changeset
|
3914 tty->print("[Loading %s", (name != NULL) ? name->as_klass_external_name() : "NoName"); |
0 | 3915 if (cfs->source() != NULL) tty->print(" from %s", cfs->source()); |
3916 tty->print_cr("]"); | |
3917 } | |
20375
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3918 #if INCLUDE_CDS |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3919 if (DumpLoadedClassList != NULL && cfs->source() != NULL && classlist_file->is_open()) { |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3920 // Only dump the classes that can be stored into CDS archive |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3921 if (SystemDictionaryShared::is_sharing_possible(loader_data)) { |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3922 if (name != NULL) { |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3923 ResourceMark rm(THREAD); |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3924 classlist_file->print_cr("%s", name->as_C_string()); |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3925 classlist_file->flush(); |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3926 } |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3927 } |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3928 } |
6e0cb14ce59b
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
20353
diff
changeset
|
3929 #endif |
0 | 3930 |
3931 u2 super_class_index = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3932 instanceKlassHandle super_klass = parse_super_class(super_class_index, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3933 CHECK_NULL); |
0 | 3934 |
3935 // Interfaces | |
3936 u2 itfs_len = cfs->get_u2_fast(); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3937 Array<Klass*>* local_interfaces = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3938 parse_interfaces(itfs_len, protection_domain, _class_name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3939 &has_default_methods, CHECK_(nullHandle)); |
0 | 3940 |
4744
cd5d8cafcc84
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
3938
diff
changeset
|
3941 u2 java_fields_count = 0; |
0 | 3942 // Fields (offsets are filled in later) |
3938 | 3943 FieldAllocationCount fac; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3944 Array<u2>* fields = parse_fields(class_name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3945 access_flags.is_interface(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3946 &fac, &java_fields_count, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3947 CHECK_(nullHandle)); |
0 | 3948 // Methods |
3949 bool has_final_method = false; | |
3950 AccessFlags promoted_flags; | |
3951 promoted_flags.set_flags(0); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3952 Array<Method*>* methods = parse_methods(access_flags.is_interface(), |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3953 &promoted_flags, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3954 &has_final_method, |
20576
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
3955 &declares_default_methods, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3956 CHECK_(nullHandle)); |
20576
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
3957 if (declares_default_methods) { |
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
3958 has_default_methods = true; |
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
3959 } |
0 | 3960 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3961 // Additional attributes |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3962 ClassAnnotationCollector parsed_annotations; |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
3963 parse_classfile_attributes(&parsed_annotations, CHECK_(nullHandle)); |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3964 |
20703
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3965 // Finalize the Annotations metadata object, |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3966 // now that all annotation arrays have been created. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3967 create_combined_annotations(CHECK_(nullHandle)); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
3968 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3969 // Make sure this is the end of class file stream |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3970 guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle)); |
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
3971 |
23959 | 3972 if (_class_name == vmSymbols::java_lang_Object()) { |
3973 check_property(_local_interfaces == Universe::the_empty_klass_array(), | |
3974 "java.lang.Object cannot implement an interface in class file %s", | |
3975 CHECK_(nullHandle)); | |
3976 } | |
0 | 3977 // 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
|
3978 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
|
3979 Symbol* sk = cp->klass_name_at(super_class_index); |
0 | 3980 if (access_flags.is_interface()) { |
3981 // Before attempting to resolve the superclass, check for class format | |
3982 // errors not checked yet. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
3983 guarantee_property(sk == vmSymbols::java_lang_Object(), |
0 | 3984 "Interfaces must have java.lang.Object as superclass in class file %s", |
3985 CHECK_(nullHandle)); | |
3986 } | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3987 Klass* k = SystemDictionary::resolve_super_or_fail(class_name, sk, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3988 class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3989 protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3990 true, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
3991 CHECK_(nullHandle)); |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
710
diff
changeset
|
3992 |
0 | 3993 KlassHandle kh (THREAD, k); |
3994 super_klass = instanceKlassHandle(THREAD, kh()); | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3995 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
3996 if (super_klass.not_null()) { |
6934 | 3997 |
3998 if (super_klass->has_default_methods()) { | |
3999 has_default_methods = true; | |
4000 } | |
4001 | |
0 | 4002 if (super_klass->is_interface()) { |
4003 ResourceMark rm(THREAD); | |
4004 Exceptions::fthrow( | |
4005 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4006 vmSymbols::java_lang_IncompatibleClassChangeError(), |
0 | 4007 "class %s has interface %s as super class", |
4008 class_name->as_klass_external_name(), | |
4009 super_klass->external_name() | |
4010 ); | |
4011 return nullHandle; | |
4012 } | |
4013 // Make sure super class is not final | |
4014 if (super_klass->is_final()) { | |
4015 THROW_MSG_(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class", nullHandle); | |
4016 } | |
4017 } | |
4018 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4019 // save super klass for error handling. |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4020 _super_klass = super_klass; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4021 |
0 | 4022 // Compute the transitive list of all unique interfaces implemented by this class |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4023 _transitive_interfaces = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4024 compute_transitive_interfaces(super_klass, local_interfaces, CHECK_(nullHandle)); |
0 | 4025 |
4026 // sort methods | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4027 intArray* method_ordering = sort_methods(methods); |
0 | 4028 |
4029 // promote flags from parse_methods() to the klass' flags | |
4030 access_flags.add_promoted_flags(promoted_flags.as_int()); | |
4031 | |
4032 // Size of Java vtable (in words) | |
4033 int vtable_size = 0; | |
4034 int itable_size = 0; | |
4035 int num_miranda_methods = 0; | |
4036 | |
6934 | 4037 GrowableArray<Method*> all_mirandas(20); |
4038 | |
4039 klassVtable::compute_vtable_size_and_num_mirandas( | |
4040 &vtable_size, &num_miranda_methods, &all_mirandas, super_klass(), methods, | |
4041 access_flags, class_loader, class_name, local_interfaces, | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
579
diff
changeset
|
4042 CHECK_(nullHandle)); |
0 | 4043 |
4044 // Size of Java itable (in words) | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4045 itable_size = access_flags.is_interface() ? 0 : klassItable::compute_itable_size(_transitive_interfaces); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4046 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4047 FieldLayoutInfo info; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4048 layout_fields(class_loader, &fac, &parsed_annotations, &info, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4049 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4050 int total_oop_map_size2 = |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4051 InstanceKlass::nonstatic_oop_map_size(info.total_oop_map_count); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4052 |
0 | 4053 // Compute reference type |
4054 ReferenceType rt; | |
4055 if (super_klass() == NULL) { | |
4056 rt = REF_NONE; | |
4057 } else { | |
4058 rt = super_klass->reference_type(); | |
4059 } | |
4060 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4061 // We can now create the basic Klass* for this klass |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4062 _klass = InstanceKlass::allocate_instance_klass(loader_data, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4063 vtable_size, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4064 itable_size, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4065 info.static_field_size, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4066 total_oop_map_size2, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4067 rt, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4068 access_flags, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4069 name, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4070 super_klass(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4071 !host_klass.is_null(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4072 CHECK_(nullHandle)); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4073 instanceKlassHandle this_klass (THREAD, _klass); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4074 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4075 assert(this_klass->static_field_size() == info.static_field_size, "sanity"); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4076 assert(this_klass->nonstatic_oop_map_count() == info.total_oop_map_count, |
938 | 4077 "sanity"); |
0 | 4078 |
4079 // Fill in information already parsed | |
975 | 4080 this_klass->set_should_verify_class(verify); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4081 jint lh = Klass::instance_layout_helper(info.instance_size, false); |
0 | 4082 this_klass->set_layout_helper(lh); |
4083 assert(this_klass->oop_is_instance(), "layout is correct"); | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4084 assert(this_klass->size_helper() == info.instance_size, "correct size_helper"); |
0 | 4085 // Not yet: supers are done below to support the new subtype-checking fields |
4086 //this_klass->set_super(super_klass()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4087 this_klass->set_class_loader_data(loader_data); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4088 this_klass->set_nonstatic_field_size(info.nonstatic_field_size); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4089 this_klass->set_has_nonstatic_fields(info.has_nonstatic_fields); |
3938 | 4090 this_klass->set_static_oop_field_count(fac.count[STATIC_OOP]); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4091 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4092 apply_parsed_class_metadata(this_klass, java_fields_count, CHECK_NULL); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4093 |
0 | 4094 if (has_final_method) { |
4095 this_klass->set_has_final_method(); | |
4096 } | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4097 this_klass->copy_method_ordering(method_ordering, CHECK_NULL); |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12190
diff
changeset
|
4098 // The InstanceKlass::_methods_jmethod_ids cache |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12190
diff
changeset
|
4099 // is managed on the assumption that the initial cache |
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
975
diff
changeset
|
4100 // size is equal to the number of methods in the class. If |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4101 // that changes, then InstanceKlass::idnum_can_increment() |
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
975
diff
changeset
|
4102 // has to be changed accordingly. |
0 | 4103 this_klass->set_initial_method_idnum(methods->length()); |
4104 this_klass->set_name(cp->klass_name_at(this_class_index)); | |
6852 | 4105 if (is_anonymous()) // I am well known to myself |
474
7a018855d2f0
6779339: turn off LinkWellKnownClasses by default pending further testing
jrose
parents:
431
diff
changeset
|
4106 cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4107 |
0 | 4108 this_klass->set_minor_version(minor_version); |
4109 this_klass->set_major_version(major_version); | |
6934 | 4110 this_klass->set_has_default_methods(has_default_methods); |
20576
90257dfad6e3
8043275: 8u40 backport: Fix interface initialization for default methods.
acorn
parents:
20561
diff
changeset
|
4111 this_klass->set_declares_default_methods(declares_default_methods); |
0 | 4112 |
17998
ae92351815b6
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
17934
diff
changeset
|
4113 if (!host_klass.is_null()) { |
ae92351815b6
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
17934
diff
changeset
|
4114 assert (this_klass->is_anonymous(), "should be the same"); |
ae92351815b6
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
17934
diff
changeset
|
4115 this_klass->set_host_klass(host_klass()); |
ae92351815b6
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
17934
diff
changeset
|
4116 } |
ae92351815b6
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
17934
diff
changeset
|
4117 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4118 // Set up Method*::intrinsic_id as soon as we know the names of methods. |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4119 // (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
|
4120 // 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
|
4121 // when everything is fresh in memory.) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4122 if (Method::klass_id_for_intrinsics(this_klass()) != vmSymbols::NO_SID) { |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4123 for (int j = 0; j < methods->length(); j++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4124 methods->at(j)->init_intrinsic_id(); |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4125 } |
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4126 } |
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
710
diff
changeset
|
4127 |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
4128 if (cached_class_file != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4129 // JVMTI: we have an InstanceKlass now, tell it about the cached bytes |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10405
diff
changeset
|
4130 this_klass->set_cached_class_file(cached_class_file); |
0 | 4131 } |
4132 | |
6934 | 4133 // Fill in field values obtained by parse_classfile_attributes |
4134 if (parsed_annotations.has_any_annotations()) | |
4135 parsed_annotations.apply_to(this_klass); | |
4136 apply_parsed_class_attributes(this_klass); | |
4137 | |
0 | 4138 // Miranda methods |
4139 if ((num_miranda_methods > 0) || | |
4140 // if this class introduced new miranda methods or | |
4141 (super_klass.not_null() && (super_klass->has_miranda_methods())) | |
4142 // super class exists and this class inherited miranda methods | |
4143 ) { | |
4144 this_klass->set_has_miranda_methods(); // then set a flag | |
4145 } | |
4146 | |
4147 // Fill in information needed to compute superclasses. | |
4148 this_klass->initialize_supers(super_klass(), CHECK_(nullHandle)); | |
4149 | |
4150 // Initialize itable offset tables | |
4151 klassItable::setup_itable_offset_table(this_klass); | |
4152 | |
6934 | 4153 // Compute transitive closure of interfaces this class implements |
0 | 4154 // Do final class setup |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4155 fill_oop_maps(this_klass, info.nonstatic_oop_map_count, info.nonstatic_oop_offsets, info.nonstatic_oop_counts); |
0 | 4156 |
6222
6d8f36bcef55
6711908: JVM needs direct access to some annotations
jrose
parents:
6100
diff
changeset
|
4157 // Fill in has_finalizer, has_vanilla_constructor, and layout_helper |
0 | 4158 set_precomputed_flags(this_klass); |
4159 | |
4160 // reinitialize modifiers, using the InnerClasses attribute | |
4161 int computed_modifiers = this_klass->compute_modifier_flags(CHECK_(nullHandle)); | |
4162 this_klass->set_modifier_flags(computed_modifiers); | |
4163 | |
4164 // check if this class can access its super class | |
4165 check_super_class_access(this_klass, CHECK_(nullHandle)); | |
4166 | |
4167 // check if this class can access its superinterfaces | |
4168 check_super_interface_access(this_klass, CHECK_(nullHandle)); | |
4169 | |
4170 // check if this class overrides any final method | |
4171 check_final_method_override(this_klass, CHECK_(nullHandle)); | |
4172 | |
4173 // check that if this class is an interface then it doesn't have static methods | |
4174 if (this_klass->is_interface()) { | |
7579
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4175 /* An interface in a JAVA 8 classfile can be static */ |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4176 if (_major_version < JAVA_8_VERSION) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4177 check_illegal_static_method(this_klass, CHECK_(nullHandle)); |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4178 } |
0 | 4179 } |
4180 | |
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10340
diff
changeset
|
4181 // Allocate mirror and initialize static fields |
20415
47e3110c47e8
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
20375
diff
changeset
|
4182 java_lang_Class::create_mirror(this_klass, class_loader, protection_domain, |
47e3110c47e8
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
20375
diff
changeset
|
4183 CHECK_(nullHandle)); |
6934 | 4184 |
4185 // Generate any default methods - default methods are interface methods | |
4186 // that have a default implementation. This is new with Lambda project. | |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12924
diff
changeset
|
4187 if (has_default_methods ) { |
6934 | 4188 DefaultMethods::generate_default_methods( |
4189 this_klass(), &all_mirandas, CHECK_(nullHandle)); | |
4190 } | |
4191 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4192 // Update the loader_data graph. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4193 record_defined_class_dependencies(this_klass, CHECK_NULL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4194 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4195 ClassLoadingService::notify_class_loaded(InstanceKlass::cast(this_klass()), |
0 | 4196 false /* not shared class */); |
4197 | |
4198 if (TraceClassLoading) { | |
6934 | 4199 ResourceMark rm; |
0 | 4200 // print in a single call to reduce interleaving of output |
4201 if (cfs->source() != NULL) { | |
4202 tty->print("[Loaded %s from %s]\n", this_klass->external_name(), | |
4203 cfs->source()); | |
4204 } else if (class_loader.is_null()) { | |
20561
8e15758b2e94
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
20528
diff
changeset
|
4205 Klass* caller = |
8e15758b2e94
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
20528
diff
changeset
|
4206 THREAD->is_Java_thread() |
8e15758b2e94
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
20528
diff
changeset
|
4207 ? ((JavaThread*)THREAD)->security_get_caller_class(1) |
8e15758b2e94
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
20528
diff
changeset
|
4208 : NULL; |
8e15758b2e94
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
20528
diff
changeset
|
4209 // caller can be NULL, for example, during a JVMTI VM_Init hook |
8e15758b2e94
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
20528
diff
changeset
|
4210 if (caller != NULL) { |
0 | 4211 tty->print("[Loaded %s by instance of %s]\n", |
4212 this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4213 InstanceKlass::cast(caller)->external_name()); |
0 | 4214 } else { |
4215 tty->print("[Loaded %s]\n", this_klass->external_name()); | |
4216 } | |
4217 } else { | |
4218 tty->print("[Loaded %s from %s]\n", this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4219 InstanceKlass::cast(class_loader->klass())->external_name()); |
0 | 4220 } |
4221 } | |
4222 | |
4223 if (TraceClassResolution) { | |
6934 | 4224 ResourceMark rm; |
0 | 4225 // print out the superclass. |
6983 | 4226 const char * from = this_klass()->external_name(); |
0 | 4227 if (this_klass->java_super() != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4228 tty->print("RESOLVE %s %s (super)\n", from, InstanceKlass::cast(this_klass->java_super())->external_name()); |
0 | 4229 } |
4230 // print out each of the interface classes referred to by this class. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4231 Array<Klass*>* local_interfaces = this_klass->local_interfaces(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4232 if (local_interfaces != NULL) { |
0 | 4233 int length = local_interfaces->length(); |
4234 for (int i = 0; i < length; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4235 Klass* k = local_interfaces->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4236 InstanceKlass* to_class = InstanceKlass::cast(k); |
0 | 4237 const char * to = to_class->external_name(); |
657
715dceaa89b7
6603316: Improve instrumentation for classes loaded at startup
acorn
parents:
652
diff
changeset
|
4238 tty->print("RESOLVE %s %s (interface)\n", from, to); |
0 | 4239 } |
4240 } | |
4241 } | |
4242 | |
4243 // preserve result across HandleMark | |
4244 preserve_this_klass = this_klass(); | |
4245 } | |
4246 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4247 // Create new handle outside HandleMark (might be needed for |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4248 // Extended Class Redefinition) |
0 | 4249 instanceKlassHandle this_klass (THREAD, preserve_this_klass); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4250 debug_only(this_klass->verify();) |
0 | 4251 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4252 // Clear class if no error has occurred so destructor doesn't deallocate it |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4253 _klass = NULL; |
0 | 4254 return this_klass; |
4255 } | |
4256 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4257 // Destructor to clean up if there's an error |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4258 ClassFileParser::~ClassFileParser() { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4259 MetadataFactory::free_metadata(_loader_data, _cp); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4260 MetadataFactory::free_array<u2>(_loader_data, _fields); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4261 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4262 // Free methods |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4263 InstanceKlass::deallocate_methods(_loader_data, _methods); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4264 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4265 // beware of the Universe::empty_blah_array!! |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4266 if (_inner_classes != Universe::the_empty_short_array()) { |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4267 MetadataFactory::free_array<u2>(_loader_data, _inner_classes); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4268 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4269 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4270 // Free interfaces |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4271 InstanceKlass::deallocate_interfaces(_loader_data, _super_klass(), |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4272 _local_interfaces, _transitive_interfaces); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4273 |
20703
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4274 if (_combined_annotations != NULL) { |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4275 // After all annotations arrays have been created, they are installed into the |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4276 // Annotations object that will be assigned to the InstanceKlass being created. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4277 |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4278 // Deallocate the Annotations object and the installed annotations arrays. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4279 _combined_annotations->deallocate_contents(_loader_data); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4280 |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4281 // If the _combined_annotations pointer is non-NULL, |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4282 // then the other annotations fields should have been cleared. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4283 assert(_annotations == NULL, "Should have been cleared"); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4284 assert(_type_annotations == NULL, "Should have been cleared"); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4285 assert(_fields_annotations == NULL, "Should have been cleared"); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4286 assert(_fields_type_annotations == NULL, "Should have been cleared"); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4287 } else { |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4288 // If the annotations arrays were not installed into the Annotations object, |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4289 // then they have to be deallocated explicitly. |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4290 MetadataFactory::free_array<u1>(_loader_data, _annotations); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4291 MetadataFactory::free_array<u1>(_loader_data, _type_annotations); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4292 Annotations::free_contents(_loader_data, _fields_annotations); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4293 Annotations::free_contents(_loader_data, _fields_type_annotations); |
0fa1f71a905b
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
20576
diff
changeset
|
4294 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4295 |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4296 clear_class_metadata(); |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4297 |
17883
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17646
diff
changeset
|
4298 // deallocate the klass if already created. Don't directly deallocate, but add |
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17646
diff
changeset
|
4299 // to the deallocate list so that the klass is removed from the CLD::_klasses list |
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17646
diff
changeset
|
4300 // at a safepoint. |
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17646
diff
changeset
|
4301 if (_klass != NULL) { |
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17646
diff
changeset
|
4302 _loader_data->add_to_deallocate_list(_klass); |
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17646
diff
changeset
|
4303 } |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4304 _klass = NULL; |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4305 } |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4306 |
7587 | 4307 void ClassFileParser::print_field_layout(Symbol* name, |
4308 Array<u2>* fields, | |
4309 constantPoolHandle cp, | |
4310 int instance_size, | |
4311 int instance_fields_start, | |
4312 int instance_fields_end, | |
4313 int static_fields_end) { | |
4314 tty->print("%s: field layout\n", name->as_klass_external_name()); | |
4315 tty->print(" @%3d %s\n", instance_fields_start, "--- instance fields start ---"); | |
4316 for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { | |
4317 if (!fs.access_flags().is_static()) { | |
4318 tty->print(" @%3d \"%s\" %s\n", | |
4319 fs.offset(), | |
4320 fs.name()->as_klass_external_name(), | |
4321 fs.signature()->as_klass_external_name()); | |
4322 } | |
4323 } | |
4324 tty->print(" @%3d %s\n", instance_fields_end, "--- instance fields end ---"); | |
4325 tty->print(" @%3d %s\n", instance_size * wordSize, "--- instance ends ---"); | |
4326 tty->print(" @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---"); | |
4327 for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { | |
4328 if (fs.access_flags().is_static()) { | |
4329 tty->print(" @%3d \"%s\" %s\n", | |
4330 fs.offset(), | |
4331 fs.name()->as_klass_external_name(), | |
4332 fs.signature()->as_klass_external_name()); | |
4333 } | |
4334 } | |
4335 tty->print(" @%3d %s\n", static_fields_end, "--- static fields end ---"); | |
4336 tty->print("\n"); | |
4337 } | |
4338 | |
939
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4339 unsigned int |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4340 ClassFileParser::compute_oop_map_count(instanceKlassHandle super, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4341 unsigned int nonstatic_oop_map_count, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4342 int first_nonstatic_oop_offset) { |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4343 unsigned int map_count = |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4344 super.is_null() ? 0 : super->nonstatic_oop_map_count(); |
0 | 4345 if (nonstatic_oop_map_count > 0) { |
4346 // We have oops to add to map | |
938 | 4347 if (map_count == 0) { |
4348 map_count = nonstatic_oop_map_count; | |
0 | 4349 } else { |
938 | 4350 // Check whether we should add a new map block or whether the last one can |
4351 // be extended | |
4352 OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps(); | |
4353 OopMapBlock* const last_map = first_map + map_count - 1; | |
4354 | |
4355 int next_offset = last_map->offset() + last_map->count() * heapOopSize; | |
0 | 4356 if (next_offset == first_nonstatic_oop_offset) { |
4357 // There is no gap bettwen superklass's last oop field and first | |
4358 // local oop field, merge maps. | |
4359 nonstatic_oop_map_count -= 1; | |
4360 } else { | |
4361 // Superklass didn't end with a oop field, add extra maps | |
938 | 4362 assert(next_offset < first_nonstatic_oop_offset, "just checking"); |
0 | 4363 } |
938 | 4364 map_count += nonstatic_oop_map_count; |
0 | 4365 } |
4366 } | |
938 | 4367 return map_count; |
0 | 4368 } |
4369 | |
4370 | |
4371 void ClassFileParser::fill_oop_maps(instanceKlassHandle k, | |
939
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4372 unsigned int nonstatic_oop_map_count, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4373 int* nonstatic_oop_offsets, |
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4374 unsigned int* nonstatic_oop_counts) { |
0 | 4375 OopMapBlock* this_oop_map = k->start_of_nonstatic_oop_maps(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4376 const InstanceKlass* const super = k->superklass(); |
939
9eebd3ac74cf
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
938
diff
changeset
|
4377 const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0; |
938 | 4378 if (super_count > 0) { |
4379 // Copy maps from superklass | |
0 | 4380 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
|
4381 for (unsigned int i = 0; i < super_count; ++i) { |
0 | 4382 *this_oop_map++ = *super_oop_map++; |
4383 } | |
4384 } | |
938 | 4385 |
0 | 4386 if (nonstatic_oop_map_count > 0) { |
938 | 4387 if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) { |
4388 // The counts differ because there is no gap between superklass's last oop | |
4389 // field and the first local oop field. Extend the last oop map copied | |
0 | 4390 // from the superklass instead of creating new one. |
4391 nonstatic_oop_map_count--; | |
4392 nonstatic_oop_offsets++; | |
4393 this_oop_map--; | |
938 | 4394 this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++); |
0 | 4395 this_oop_map++; |
4396 } | |
938 | 4397 |
0 | 4398 // Add new map blocks, fill them |
4399 while (nonstatic_oop_map_count-- > 0) { | |
4400 this_oop_map->set_offset(*nonstatic_oop_offsets++); | |
938 | 4401 this_oop_map->set_count(*nonstatic_oop_counts++); |
0 | 4402 this_oop_map++; |
4403 } | |
938 | 4404 assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() == |
4405 this_oop_map, "sanity"); | |
0 | 4406 } |
4407 } | |
4408 | |
4409 | |
4410 void ClassFileParser::set_precomputed_flags(instanceKlassHandle k) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4411 Klass* super = k->super(); |
0 | 4412 |
4413 // Check if this klass has an empty finalize method (i.e. one with return bytecode only), | |
4414 // in which case we don't have to register objects as finalizable | |
4415 if (!_has_empty_finalizer) { | |
4416 if (_has_finalizer || | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4417 (super != NULL && super->has_finalizer())) { |
0 | 4418 k->set_has_finalizer(); |
4419 } | |
4420 } | |
4421 | |
4422 #ifdef ASSERT | |
4423 bool f = false; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4424 Method* m = k->lookup_method(vmSymbols::finalize_method_name(), |
0 | 4425 vmSymbols::void_method_signature()); |
4426 if (m != NULL && !m->is_empty_method()) { | |
23182
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4427 f = true; |
0 | 4428 } |
23182
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4429 |
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4430 // Spec doesn't prevent agent from redefinition of empty finalizer. |
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4431 // Despite the fact that it's generally bad idea and redefined finalizer |
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4432 // will not work as expected we shouldn't abort vm in this case |
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4433 if (!k->has_redefined_this_or_super()) { |
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4434 assert(f == k->has_finalizer(), "inconsistent has_finalizer"); |
c2c7fed86a5e
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
23086
diff
changeset
|
4435 } |
0 | 4436 #endif |
4437 | |
4438 // Check if this klass supports the java.lang.Cloneable interface | |
1142 | 4439 if (SystemDictionary::Cloneable_klass_loaded()) { |
4440 if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) { | |
0 | 4441 k->set_is_cloneable(); |
4442 } | |
4443 } | |
4444 | |
4445 // Check if this klass has a vanilla default constructor | |
4446 if (super == NULL) { | |
4447 // java.lang.Object has empty default constructor | |
4448 k->set_has_vanilla_constructor(); | |
4449 } else { | |
6983 | 4450 if (super->has_vanilla_constructor() && |
0 | 4451 _has_vanilla_constructor) { |
4452 k->set_has_vanilla_constructor(); | |
4453 } | |
4454 #ifdef ASSERT | |
4455 bool v = false; | |
6983 | 4456 if (super->has_vanilla_constructor()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4457 Method* constructor = k->find_method(vmSymbols::object_initializer_name( |
0 | 4458 ), vmSymbols::void_method_signature()); |
4459 if (constructor != NULL && constructor->is_vanilla_constructor()) { | |
4460 v = true; | |
4461 } | |
4462 } | |
4463 assert(v == k->has_vanilla_constructor(), "inconsistent has_vanilla_constructor"); | |
4464 #endif | |
4465 } | |
4466 | |
4467 // If it cannot be fast-path allocated, set a bit in the layout helper. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4468 // See documentation of InstanceKlass::can_be_fastpath_allocated(). |
0 | 4469 assert(k->size_helper() > 0, "layout_helper is initialized"); |
4470 if ((!RegisterFinalizersAtInit && k->has_finalizer()) | |
4471 || k->is_abstract() || k->is_interface() | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
4472 || (k->name() == vmSymbols::java_lang_Class() && k->class_loader() == NULL) |
0 | 4473 || k->size_helper() >= FastAllocateSizeLimit) { |
4474 // Forbid fast-path allocation. | |
4475 jint lh = Klass::instance_layout_helper(k->size_helper(), true); | |
4476 k->set_layout_helper(lh); | |
4477 } | |
4478 } | |
4479 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4480 // Attach super classes and interface classes to class loader data |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4481 void ClassFileParser::record_defined_class_dependencies(instanceKlassHandle defined_klass, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4482 ClassLoaderData * defining_loader_data = defined_klass->class_loader_data(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4483 if (defining_loader_data->is_the_null_class_loader_data()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4484 // Dependencies to null class loader data are implicit. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4485 return; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4486 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4487 // add super class dependency |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4488 Klass* super = defined_klass->super(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4489 if (super != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4490 defining_loader_data->record_dependency(super, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4491 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4492 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4493 // add super interface dependencies |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4494 Array<Klass*>* local_interfaces = defined_klass->local_interfaces(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4495 if (local_interfaces != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4496 int length = local_interfaces->length(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4497 for (int i = 0; i < length; i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4498 defining_loader_data->record_dependency(local_interfaces->at(i), CHECK); |
0 | 4499 } |
4500 } | |
4501 } | |
4502 } | |
4503 | |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4504 // utility methods for appending an array with check for duplicates |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4505 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4506 void append_interfaces(GrowableArray<Klass*>* result, Array<Klass*>* ifs) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4507 // iterate over new interfaces |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4508 for (int i = 0; i < ifs->length(); i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4509 Klass* e = ifs->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4510 assert(e->is_klass() && InstanceKlass::cast(e)->is_interface(), "just checking"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4511 // add new interface |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4512 result->append_if_missing(e); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4513 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4514 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4515 |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4516 Array<Klass*>* ClassFileParser::compute_transitive_interfaces( |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4517 instanceKlassHandle super, |
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4518 Array<Klass*>* local_ifs, TRAPS) { |
0 | 4519 // Compute maximum size for transitive interfaces |
4520 int max_transitive_size = 0; | |
4521 int super_size = 0; | |
4522 // Add superclass transitive interfaces size | |
4523 if (super.not_null()) { | |
4524 super_size = super->transitive_interfaces()->length(); | |
4525 max_transitive_size += super_size; | |
4526 } | |
4527 // Add local interfaces' super interfaces | |
4528 int local_size = local_ifs->length(); | |
4529 for (int i = 0; i < local_size; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4530 Klass* l = local_ifs->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4531 max_transitive_size += InstanceKlass::cast(l)->transitive_interfaces()->length(); |
0 | 4532 } |
4533 // Finally add local interfaces | |
4534 max_transitive_size += local_size; | |
4535 // Construct array | |
4536 if (max_transitive_size == 0) { | |
4537 // no interfaces, use canonicalized array | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4538 return Universe::the_empty_klass_array(); |
0 | 4539 } else if (max_transitive_size == super_size) { |
4540 // no new local interfaces added, share superklass' transitive interface array | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4541 return super->transitive_interfaces(); |
0 | 4542 } else if (max_transitive_size == local_size) { |
4543 // only local interfaces added, share local interface array | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4544 return local_ifs; |
0 | 4545 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4546 ResourceMark rm; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4547 GrowableArray<Klass*>* result = new GrowableArray<Klass*>(max_transitive_size); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4548 |
0 | 4549 // Copy down from superclass |
4550 if (super.not_null()) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4551 append_interfaces(result, super->transitive_interfaces()); |
0 | 4552 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4553 |
0 | 4554 // Copy down from local interfaces' superinterfaces |
4555 for (int i = 0; i < local_ifs->length(); i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4556 Klass* l = local_ifs->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4557 append_interfaces(result, InstanceKlass::cast(l)->transitive_interfaces()); |
0 | 4558 } |
4559 // Finally add local interfaces | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4560 append_interfaces(result, local_ifs); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4561 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4562 // length will be less than the max_transitive_size if duplicates were removed |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4563 int length = result->length(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4564 assert(length <= max_transitive_size, "just checking"); |
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8716
diff
changeset
|
4565 Array<Klass*>* new_result = MetadataFactory::new_array<Klass*>(_loader_data, length, CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4566 for (int i = 0; i < length; i++) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4567 Klass* e = result->at(i); |
0 | 4568 assert(e != NULL, "just checking"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4569 new_result->at_put(i, e); |
0 | 4570 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4571 return new_result; |
0 | 4572 } |
4573 } | |
4574 | |
4575 void ClassFileParser::check_super_class_access(instanceKlassHandle this_klass, TRAPS) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4576 Klass* super = this_klass->super(); |
0 | 4577 if ((super != NULL) && |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4578 (!Reflection::verify_class_access(this_klass(), super, false))) { |
0 | 4579 ResourceMark rm(THREAD); |
4580 Exceptions::fthrow( | |
4581 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4582 vmSymbols::java_lang_IllegalAccessError(), |
0 | 4583 "class %s cannot access its superclass %s", |
4584 this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4585 InstanceKlass::cast(super)->external_name() |
0 | 4586 ); |
4587 return; | |
4588 } | |
4589 } | |
4590 | |
4591 | |
4592 void ClassFileParser::check_super_interface_access(instanceKlassHandle this_klass, TRAPS) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4593 Array<Klass*>* local_interfaces = this_klass->local_interfaces(); |
0 | 4594 int lng = local_interfaces->length(); |
4595 for (int i = lng - 1; i >= 0; i--) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4596 Klass* k = local_interfaces->at(i); |
6983 | 4597 assert (k != NULL && k->is_interface(), "invalid interface"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4598 if (!Reflection::verify_class_access(this_klass(), k, false)) { |
0 | 4599 ResourceMark rm(THREAD); |
4600 Exceptions::fthrow( | |
4601 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4602 vmSymbols::java_lang_IllegalAccessError(), |
0 | 4603 "class %s cannot access its superinterface %s", |
4604 this_klass->external_name(), | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4605 InstanceKlass::cast(k)->external_name() |
0 | 4606 ); |
4607 return; | |
4608 } | |
4609 } | |
4610 } | |
4611 | |
4612 | |
4613 void ClassFileParser::check_final_method_override(instanceKlassHandle this_klass, TRAPS) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4614 Array<Method*>* methods = this_klass->methods(); |
0 | 4615 int num_methods = methods->length(); |
4616 | |
4617 // go thru each method and check if it overrides a final method | |
4618 for (int index = 0; index < num_methods; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4619 Method* m = methods->at(index); |
0 | 4620 |
13398
19146c82b6fc
8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents:
13055
diff
changeset
|
4621 // skip private, static, and <init> methods |
19146c82b6fc
8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents:
13055
diff
changeset
|
4622 if ((!m->is_private() && !m->is_static()) && |
0 | 4623 (m->name() != vmSymbols::object_initializer_name())) { |
4624 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4625 Symbol* name = m->name(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4626 Symbol* signature = m->signature(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4627 Klass* k = this_klass->super(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4628 Method* super_m = NULL; |
0 | 4629 while (k != NULL) { |
4630 // skip supers that don't have final methods. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4631 if (k->has_final_method()) { |
0 | 4632 // lookup a matching method in the super class hierarchy |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4633 super_m = InstanceKlass::cast(k)->lookup_method(name, signature); |
0 | 4634 if (super_m == NULL) { |
4635 break; // didn't find any match; get out | |
4636 } | |
4637 | |
17640
4638c4d7ff10
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
13398
diff
changeset
|
4638 if (super_m->is_final() && !super_m->is_static() && |
4638c4d7ff10
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
13398
diff
changeset
|
4639 // matching method in super is final, and not static |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4640 (Reflection::verify_field_access(this_klass(), |
0 | 4641 super_m->method_holder(), |
4642 super_m->method_holder(), | |
4643 super_m->access_flags(), false)) | |
4644 // this class can access super final method and therefore override | |
4645 ) { | |
4646 ResourceMark rm(THREAD); | |
4647 Exceptions::fthrow( | |
4648 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4649 vmSymbols::java_lang_VerifyError(), |
0 | 4650 "class %s overrides final method %s.%s", |
4651 this_klass->external_name(), | |
4652 name->as_C_string(), | |
4653 signature->as_C_string() | |
4654 ); | |
4655 return; | |
4656 } | |
4657 | |
4658 // continue to look from super_m's holder's super. | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
4659 k = super_m->method_holder()->super(); |
0 | 4660 continue; |
4661 } | |
4662 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4663 k = k->super(); |
0 | 4664 } |
4665 } | |
4666 } | |
4667 } | |
4668 | |
4669 | |
4670 // assumes that this_klass is an interface | |
4671 void ClassFileParser::check_illegal_static_method(instanceKlassHandle this_klass, TRAPS) { | |
4672 assert(this_klass->is_interface(), "not an interface"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4673 Array<Method*>* methods = this_klass->methods(); |
0 | 4674 int num_methods = methods->length(); |
4675 | |
4676 for (int index = 0; index < num_methods; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
4677 Method* m = methods->at(index); |
0 | 4678 // if m is static and not the init method, throw a verify error |
4679 if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) { | |
4680 ResourceMark rm(THREAD); | |
4681 Exceptions::fthrow( | |
4682 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4683 vmSymbols::java_lang_VerifyError(), |
0 | 4684 "Illegal static method %s in interface %s", |
4685 m->name()->as_C_string(), | |
4686 this_klass->external_name() | |
4687 ); | |
4688 return; | |
4689 } | |
4690 } | |
4691 } | |
4692 | |
4693 // utility methods for format checking | |
4694 | |
4695 void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) { | |
4696 if (!_need_verify) { return; } | |
4697 | |
4698 const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0; | |
4699 const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; | |
4700 const bool is_final = (flags & JVM_ACC_FINAL) != 0; | |
4701 const bool is_super = (flags & JVM_ACC_SUPER) != 0; | |
4702 const bool is_enum = (flags & JVM_ACC_ENUM) != 0; | |
4703 const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0; | |
4704 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; | |
4705 | |
4706 if ((is_abstract && is_final) || | |
4707 (is_interface && !is_abstract) || | |
4708 (is_interface && major_gte_15 && (is_super || is_enum)) || | |
4709 (!is_interface && major_gte_15 && is_annotation)) { | |
4710 ResourceMark rm(THREAD); | |
4711 Exceptions::fthrow( | |
4712 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4713 vmSymbols::java_lang_ClassFormatError(), |
0 | 4714 "Illegal class modifiers in class %s: 0x%X", |
4715 _class_name->as_C_string(), flags | |
4716 ); | |
4717 return; | |
4718 } | |
4719 } | |
4720 | |
4721 bool ClassFileParser::has_illegal_visibility(jint flags) { | |
4722 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; | |
4723 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; | |
4724 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; | |
4725 | |
4726 return ((is_public && is_protected) || | |
4727 (is_public && is_private) || | |
4728 (is_protected && is_private)); | |
4729 } | |
4730 | |
4731 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
|
4732 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
|
4733 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
|
4734 (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION); |
0 | 4735 return (major >= JAVA_MIN_SUPPORTED_VERSION) && |
176
6b648fefb395
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
136
diff
changeset
|
4736 (major <= max_version) && |
6b648fefb395
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
136
diff
changeset
|
4737 ((major != max_version) || |
0 | 4738 (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION)); |
4739 } | |
4740 | |
4741 void ClassFileParser::verify_legal_field_modifiers( | |
4742 jint flags, bool is_interface, TRAPS) { | |
4743 if (!_need_verify) { return; } | |
4744 | |
4745 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; | |
4746 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; | |
4747 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; | |
4748 const bool is_static = (flags & JVM_ACC_STATIC) != 0; | |
4749 const bool is_final = (flags & JVM_ACC_FINAL) != 0; | |
4750 const bool is_volatile = (flags & JVM_ACC_VOLATILE) != 0; | |
4751 const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0; | |
4752 const bool is_enum = (flags & JVM_ACC_ENUM) != 0; | |
4753 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; | |
4754 | |
4755 bool is_illegal = false; | |
4756 | |
4757 if (is_interface) { | |
4758 if (!is_public || !is_static || !is_final || is_private || | |
4759 is_protected || is_volatile || is_transient || | |
4760 (major_gte_15 && is_enum)) { | |
4761 is_illegal = true; | |
4762 } | |
4763 } else { // not interface | |
4764 if (has_illegal_visibility(flags) || (is_final && is_volatile)) { | |
4765 is_illegal = true; | |
4766 } | |
4767 } | |
4768 | |
4769 if (is_illegal) { | |
4770 ResourceMark rm(THREAD); | |
4771 Exceptions::fthrow( | |
4772 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4773 vmSymbols::java_lang_ClassFormatError(), |
0 | 4774 "Illegal field modifiers in class %s: 0x%X", |
4775 _class_name->as_C_string(), flags); | |
4776 return; | |
4777 } | |
4778 } | |
4779 | |
4780 void ClassFileParser::verify_legal_method_modifiers( | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4781 jint flags, bool is_interface, Symbol* name, TRAPS) { |
0 | 4782 if (!_need_verify) { return; } |
4783 | |
4784 const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; | |
4785 const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; | |
4786 const bool is_static = (flags & JVM_ACC_STATIC) != 0; | |
4787 const bool is_final = (flags & JVM_ACC_FINAL) != 0; | |
4788 const bool is_native = (flags & JVM_ACC_NATIVE) != 0; | |
4789 const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; | |
4790 const bool is_bridge = (flags & JVM_ACC_BRIDGE) != 0; | |
4791 const bool is_strict = (flags & JVM_ACC_STRICT) != 0; | |
4792 const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0; | |
7579
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4793 const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
0 | 4794 const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
6934 | 4795 const bool major_gte_8 = _major_version >= JAVA_8_VERSION; |
0 | 4796 const bool is_initializer = (name == vmSymbols::object_initializer_name()); |
4797 | |
4798 bool is_illegal = false; | |
4799 | |
4800 if (is_interface) { | |
7579
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4801 if (major_gte_8) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4802 // Class file version is JAVA_8_VERSION or later Methods of |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4803 // interfaces may set any of the flags except ACC_PROTECTED, |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4804 // ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4805 // have exactly one of the ACC_PUBLIC or ACC_PRIVATE flags set. |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4806 if ((is_public == is_private) || /* Only one of private and public should be true - XNOR */ |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4807 (is_native || is_protected || is_final || is_synchronized) || |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4808 // If a specific method of a class or interface has its |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4809 // ACC_ABSTRACT flag set, it must not have any of its |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4810 // ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC, |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4811 // ACC_STRICT, or ACC_SYNCHRONIZED flags set. No need to |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4812 // check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4813 // those flags are illegal irrespective of ACC_ABSTRACT being set or not. |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4814 (is_abstract && (is_private || is_static || is_strict))) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4815 is_illegal = true; |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4816 } |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4817 } else if (major_gte_15) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4818 // Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION) |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4819 if (!is_public || is_static || is_final || is_synchronized || |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4820 is_native || !is_abstract || is_strict) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4821 is_illegal = true; |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4822 } |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4823 } else { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4824 // Class file version is pre-JAVA_1_5_VERSION |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4825 if (!is_public || is_static || is_final || is_native || !is_abstract) { |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4826 is_illegal = true; |
adc176e95bf2
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
7462
diff
changeset
|
4827 } |
0 | 4828 } |
4829 } else { // not interface | |
4830 if (is_initializer) { | |
4831 if (is_static || is_final || is_synchronized || is_native || | |
4832 is_abstract || (major_gte_15 && is_bridge)) { | |
4833 is_illegal = true; | |
4834 } | |
4835 } else { // not initializer | |
4836 if (is_abstract) { | |
4837 if ((is_final || is_native || is_private || is_static || | |
4838 (major_gte_15 && (is_synchronized || is_strict)))) { | |
4839 is_illegal = true; | |
4840 } | |
4841 } | |
4842 if (has_illegal_visibility(flags)) { | |
4843 is_illegal = true; | |
4844 } | |
4845 } | |
4846 } | |
4847 | |
4848 if (is_illegal) { | |
4849 ResourceMark rm(THREAD); | |
4850 Exceptions::fthrow( | |
4851 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4852 vmSymbols::java_lang_ClassFormatError(), |
0 | 4853 "Method %s in class %s has illegal modifiers: 0x%X", |
4854 name->as_C_string(), _class_name->as_C_string(), flags); | |
4855 return; | |
4856 } | |
4857 } | |
4858 | |
4859 void ClassFileParser::verify_legal_utf8(const unsigned char* buffer, int length, TRAPS) { | |
4860 assert(_need_verify, "only called when _need_verify is true"); | |
4861 int i = 0; | |
4862 int count = length >> 2; | |
4863 for (int k=0; k<count; k++) { | |
4864 unsigned char b0 = buffer[i]; | |
4865 unsigned char b1 = buffer[i+1]; | |
4866 unsigned char b2 = buffer[i+2]; | |
4867 unsigned char b3 = buffer[i+3]; | |
4868 // For an unsigned char v, | |
4869 // (v | v - 1) is < 128 (highest bit 0) for 0 < v < 128; | |
4870 // (v | v - 1) is >= 128 (highest bit 1) for v == 0 or v >= 128. | |
4871 unsigned char res = b0 | b0 - 1 | | |
4872 b1 | b1 - 1 | | |
4873 b2 | b2 - 1 | | |
4874 b3 | b3 - 1; | |
4875 if (res >= 128) break; | |
4876 i += 4; | |
4877 } | |
4878 for(; i < length; i++) { | |
4879 unsigned short c; | |
4880 // no embedded zeros | |
4881 guarantee_property((buffer[i] != 0), "Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4882 if(buffer[i] < 128) { | |
4883 continue; | |
4884 } | |
4885 if ((i + 5) < length) { // see if it's legal supplementary character | |
4886 if (UTF8::is_supplementary_character(&buffer[i])) { | |
4887 c = UTF8::get_supplementary_character(&buffer[i]); | |
4888 i += 5; | |
4889 continue; | |
4890 } | |
4891 } | |
4892 switch (buffer[i] >> 4) { | |
4893 default: break; | |
4894 case 0x8: case 0x9: case 0xA: case 0xB: case 0xF: | |
4895 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4896 case 0xC: case 0xD: // 110xxxxx 10xxxxxx | |
4897 c = (buffer[i] & 0x1F) << 6; | |
4898 i++; | |
4899 if ((i < length) && ((buffer[i] & 0xC0) == 0x80)) { | |
4900 c += buffer[i] & 0x3F; | |
4901 if (_major_version <= 47 || c == 0 || c >= 0x80) { | |
4902 // for classes with major > 47, c must a null or a character in its shortest form | |
4903 break; | |
4904 } | |
4905 } | |
4906 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4907 case 0xE: // 1110xxxx 10xxxxxx 10xxxxxx | |
4908 c = (buffer[i] & 0xF) << 12; | |
4909 i += 2; | |
4910 if ((i < length) && ((buffer[i-1] & 0xC0) == 0x80) && ((buffer[i] & 0xC0) == 0x80)) { | |
4911 c += ((buffer[i-1] & 0x3F) << 6) + (buffer[i] & 0x3F); | |
4912 if (_major_version <= 47 || c >= 0x800) { | |
4913 // for classes with major > 47, c must be in its shortest form | |
4914 break; | |
4915 } | |
4916 } | |
4917 classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); | |
4918 } // end of switch | |
4919 } // end of for | |
4920 } | |
4921 | |
4922 // 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
|
4923 void ClassFileParser::verify_legal_class_name(Symbol* name, TRAPS) { |
0 | 4924 if (!_need_verify || _relax_verify) { return; } |
4925 | |
4926 char buf[fixed_buffer_size]; | |
4927 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4928 unsigned int length = name->utf8_length(); | |
4929 bool legal = false; | |
4930 | |
4931 if (length > 0) { | |
4932 char* p; | |
4933 if (bytes[0] == JVM_SIGNATURE_ARRAY) { | |
4934 p = skip_over_field_signature(bytes, false, length, CHECK); | |
4935 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4936 } else if (_major_version < JAVA_1_5_VERSION) { | |
4937 if (bytes[0] != '<') { | |
4938 p = skip_over_field_name(bytes, true, length); | |
4939 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4940 } | |
4941 } else { | |
4942 // 4900761: relax the constraints based on JSR202 spec | |
4943 // Class names may be drawn from the entire Unicode character set. | |
4944 // Identifiers between '/' must be unqualified names. | |
4945 // The utf8 string has been verified when parsing cpool entries. | |
4946 legal = verify_unqualified_name(bytes, length, LegalClass); | |
4947 } | |
4948 } | |
4949 if (!legal) { | |
4950 ResourceMark rm(THREAD); | |
4951 Exceptions::fthrow( | |
4952 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4953 vmSymbols::java_lang_ClassFormatError(), |
0 | 4954 "Illegal class name \"%s\" in class file %s", bytes, |
4955 _class_name->as_C_string() | |
4956 ); | |
4957 return; | |
4958 } | |
4959 } | |
4960 | |
4961 // 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
|
4962 void ClassFileParser::verify_legal_field_name(Symbol* name, TRAPS) { |
0 | 4963 if (!_need_verify || _relax_verify) { return; } |
4964 | |
4965 char buf[fixed_buffer_size]; | |
4966 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
4967 unsigned int length = name->utf8_length(); | |
4968 bool legal = false; | |
4969 | |
4970 if (length > 0) { | |
4971 if (_major_version < JAVA_1_5_VERSION) { | |
4972 if (bytes[0] != '<') { | |
4973 char* p = skip_over_field_name(bytes, false, length); | |
4974 legal = (p != NULL) && ((p - bytes) == (int)length); | |
4975 } | |
4976 } else { | |
4977 // 4881221: relax the constraints based on JSR202 spec | |
4978 legal = verify_unqualified_name(bytes, length, LegalField); | |
4979 } | |
4980 } | |
4981 | |
4982 if (!legal) { | |
4983 ResourceMark rm(THREAD); | |
4984 Exceptions::fthrow( | |
4985 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4986 vmSymbols::java_lang_ClassFormatError(), |
0 | 4987 "Illegal field name \"%s\" in class %s", bytes, |
4988 _class_name->as_C_string() | |
4989 ); | |
4990 return; | |
4991 } | |
4992 } | |
4993 | |
4994 // 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
|
4995 void ClassFileParser::verify_legal_method_name(Symbol* name, TRAPS) { |
0 | 4996 if (!_need_verify || _relax_verify) { return; } |
4997 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
4998 assert(name != NULL, "method name is null"); |
0 | 4999 char buf[fixed_buffer_size]; |
5000 char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
5001 unsigned int length = name->utf8_length(); | |
5002 bool legal = false; | |
5003 | |
5004 if (length > 0) { | |
5005 if (bytes[0] == '<') { | |
5006 if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) { | |
5007 legal = true; | |
5008 } | |
5009 } else if (_major_version < JAVA_1_5_VERSION) { | |
5010 char* p; | |
5011 p = skip_over_field_name(bytes, false, length); | |
5012 legal = (p != NULL) && ((p - bytes) == (int)length); | |
5013 } else { | |
5014 // 4881221: relax the constraints based on JSR202 spec | |
5015 legal = verify_unqualified_name(bytes, length, LegalMethod); | |
5016 } | |
5017 } | |
5018 | |
5019 if (!legal) { | |
5020 ResourceMark rm(THREAD); | |
5021 Exceptions::fthrow( | |
5022 THREAD_AND_LOCATION, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5023 vmSymbols::java_lang_ClassFormatError(), |
0 | 5024 "Illegal method name \"%s\" in class %s", bytes, |
5025 _class_name->as_C_string() | |
5026 ); | |
5027 return; | |
5028 } | |
5029 } | |
5030 | |
5031 | |
5032 // 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
|
5033 void ClassFileParser::verify_legal_field_signature(Symbol* name, Symbol* signature, TRAPS) { |
0 | 5034 if (!_need_verify) { return; } |
5035 | |
5036 char buf[fixed_buffer_size]; | |
5037 char* bytes = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
5038 unsigned int length = signature->utf8_length(); | |
5039 char* p = skip_over_field_signature(bytes, false, length, CHECK); | |
5040 | |
5041 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
|
5042 throwIllegalSignature("Field", name, signature, CHECK); |
0 | 5043 } |
5044 } | |
5045 | |
5046 // Checks if signature is a legal method signature. | |
5047 // Returns number of parameters | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5048 int ClassFileParser::verify_legal_method_signature(Symbol* name, Symbol* signature, TRAPS) { |
0 | 5049 if (!_need_verify) { |
5050 // make sure caller's args_size will be less than 0 even for non-static | |
5051 // method so it will be recomputed in compute_size_of_parameters(). | |
5052 return -2; | |
5053 } | |
5054 | |
5055 unsigned int args_size = 0; | |
5056 char buf[fixed_buffer_size]; | |
5057 char* p = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); | |
5058 unsigned int length = signature->utf8_length(); | |
5059 char* nextp; | |
5060 | |
5061 // The first character must be a '(' | |
5062 if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) { | |
5063 length--; | |
5064 // Skip over legal field signatures | |
5065 nextp = skip_over_field_signature(p, false, length, CHECK_0); | |
5066 while ((length > 0) && (nextp != NULL)) { | |
5067 args_size++; | |
5068 if (p[0] == 'J' || p[0] == 'D') { | |
5069 args_size++; | |
5070 } | |
5071 length -= nextp - p; | |
5072 p = nextp; | |
5073 nextp = skip_over_field_signature(p, false, length, CHECK_0); | |
5074 } | |
5075 // The first non-signature thing better be a ')' | |
5076 if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { | |
5077 length--; | |
5078 if (name->utf8_length() > 0 && name->byte_at(0) == '<') { | |
5079 // All internal methods must return void | |
5080 if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { | |
5081 return args_size; | |
5082 } | |
5083 } else { | |
5084 // Now we better just have a return value | |
5085 nextp = skip_over_field_signature(p, true, length, CHECK_0); | |
5086 if (nextp && ((int)length == (nextp - p))) { | |
5087 return args_size; | |
5088 } | |
5089 } | |
5090 } | |
5091 } | |
5092 // Report error | |
1586
086d73ccd6c0
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
1513
diff
changeset
|
5093 throwIllegalSignature("Method", name, signature, CHECK_0); |
0 | 5094 return 0; |
5095 } | |
5096 | |
5097 | |
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
|
5098 // 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
|
5099 // 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
|
5100 // 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
|
5101 // 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
|
5102 // 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
|
5103 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
|
5104 char* name, unsigned int length, int type) { |
0 | 5105 jchar ch; |
5106 | |
5107 for (char* p = name; p != name + length; ) { | |
5108 ch = *p; | |
5109 if (ch < 128) { | |
5110 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
|
5111 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
|
5112 return false; // do not permit '.', ';', or '[' |
0 | 5113 } |
5114 if (type != LegalClass && ch == '/') { | |
5115 return false; // do not permit '/' unless it's class name | |
5116 } | |
5117 if (type == LegalMethod && (ch == '<' || ch == '>')) { | |
5118 return false; // do not permit '<' or '>' in method names | |
5119 } | |
5120 } else { | |
5121 char* tmp_p = UTF8::next(p, &ch); | |
5122 p = tmp_p; | |
5123 } | |
5124 } | |
5125 return true; | |
5126 } | |
5127 | |
5128 | |
5129 // Take pointer to a string. Skip over the longest part of the string that could | |
5130 // be taken as a fieldname. Allow '/' if slash_ok is true. | |
5131 // Return a pointer to just past the fieldname. | |
5132 // Return NULL if no fieldname at all was found, or in the case of slash_ok | |
5133 // being true, we saw consecutive slashes (meaning we were looking for a | |
5134 // qualified path but found something that was badly-formed). | |
5135 char* ClassFileParser::skip_over_field_name(char* name, bool slash_ok, unsigned int length) { | |
5136 char* p; | |
5137 jchar ch; | |
5138 jboolean last_is_slash = false; | |
5139 jboolean not_first_ch = false; | |
5140 | |
5141 for (p = name; p != name + length; not_first_ch = true) { | |
5142 char* old_p = p; | |
5143 ch = *p; | |
5144 if (ch < 128) { | |
5145 p++; | |
5146 // quick check for ascii | |
5147 if ((ch >= 'a' && ch <= 'z') || | |
5148 (ch >= 'A' && ch <= 'Z') || | |
5149 (ch == '_' || ch == '$') || | |
5150 (not_first_ch && ch >= '0' && ch <= '9')) { | |
5151 last_is_slash = false; | |
5152 continue; | |
5153 } | |
5154 if (slash_ok && ch == '/') { | |
5155 if (last_is_slash) { | |
5156 return NULL; // Don't permit consecutive slashes | |
5157 } | |
5158 last_is_slash = true; | |
5159 continue; | |
5160 } | |
5161 } else { | |
5162 jint unicode_ch; | |
5163 char* tmp_p = UTF8::next_character(p, &unicode_ch); | |
5164 p = tmp_p; | |
5165 last_is_slash = false; | |
5166 // Check if ch is Java identifier start or is Java identifier part | |
5167 // 4672820: call java.lang.Character methods directly without generating separate tables. | |
5168 EXCEPTION_MARK; | |
1142 | 5169 instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass()); |
0 | 5170 |
5171 // return value | |
5172 JavaValue result(T_BOOLEAN); | |
5173 // Set up the arguments to isJavaIdentifierStart and isJavaIdentifierPart | |
5174 JavaCallArguments args; | |
5175 args.push_int(unicode_ch); | |
5176 | |
5177 // public static boolean isJavaIdentifierStart(char ch); | |
5178 JavaCalls::call_static(&result, | |
5179 klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5180 vmSymbols::isJavaIdentifierStart_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5181 vmSymbols::int_bool_signature(), |
0 | 5182 &args, |
5183 THREAD); | |
5184 | |
5185 if (HAS_PENDING_EXCEPTION) { | |
5186 CLEAR_PENDING_EXCEPTION; | |
5187 return 0; | |
5188 } | |
5189 if (result.get_jboolean()) { | |
5190 continue; | |
5191 } | |
5192 | |
5193 if (not_first_ch) { | |
5194 // public static boolean isJavaIdentifierPart(char ch); | |
5195 JavaCalls::call_static(&result, | |
5196 klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5197 vmSymbols::isJavaIdentifierPart_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2085
diff
changeset
|
5198 vmSymbols::int_bool_signature(), |
0 | 5199 &args, |
5200 THREAD); | |
5201 | |
5202 if (HAS_PENDING_EXCEPTION) { | |
5203 CLEAR_PENDING_EXCEPTION; | |
5204 return 0; | |
5205 } | |
5206 | |
5207 if (result.get_jboolean()) { | |
5208 continue; | |
5209 } | |
5210 } | |
5211 } | |
5212 return (not_first_ch) ? old_p : NULL; | |
5213 } | |
5214 return (not_first_ch) ? p : NULL; | |
5215 } | |
5216 | |
5217 | |
5218 // Take pointer to a string. Skip over the longest part of the string that could | |
5219 // be taken as a field signature. Allow "void" if void_ok. | |
5220 // Return a pointer to just past the signature. | |
5221 // Return NULL if no legal signature is found. | |
5222 char* ClassFileParser::skip_over_field_signature(char* signature, | |
5223 bool void_ok, | |
5224 unsigned int length, | |
5225 TRAPS) { | |
5226 unsigned int array_dim = 0; | |
5227 while (length > 0) { | |
5228 switch (signature[0]) { | |
5229 case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; } | |
5230 case JVM_SIGNATURE_BOOLEAN: | |
5231 case JVM_SIGNATURE_BYTE: | |
5232 case JVM_SIGNATURE_CHAR: | |
5233 case JVM_SIGNATURE_SHORT: | |
5234 case JVM_SIGNATURE_INT: | |
5235 case JVM_SIGNATURE_FLOAT: | |
5236 case JVM_SIGNATURE_LONG: | |
5237 case JVM_SIGNATURE_DOUBLE: | |
5238 return signature + 1; | |
5239 case JVM_SIGNATURE_CLASS: { | |
5240 if (_major_version < JAVA_1_5_VERSION) { | |
5241 // Skip over the class name if one is there | |
5242 char* p = skip_over_field_name(signature + 1, true, --length); | |
5243 | |
5244 // The next character better be a semicolon | |
5245 if (p && (p - signature) > 1 && p[0] == ';') { | |
5246 return p + 1; | |
5247 } | |
5248 } else { | |
5249 // 4900761: For class version > 48, any unicode is allowed in class name. | |
5250 length--; | |
5251 signature++; | |
5252 while (length > 0 && signature[0] != ';') { | |
5253 if (signature[0] == '.') { | |
5254 classfile_parse_error("Class name contains illegal character '.' in descriptor in class file %s", CHECK_0); | |
5255 } | |
5256 length--; | |
5257 signature++; | |
5258 } | |
5259 if (signature[0] == ';') { return signature + 1; } | |
5260 } | |
5261 | |
5262 return NULL; | |
5263 } | |
5264 case JVM_SIGNATURE_ARRAY: | |
5265 array_dim++; | |
5266 if (array_dim > 255) { | |
5267 // 4277370: array descriptor is valid only if it represents 255 or fewer dimensions. | |
5268 classfile_parse_error("Array type descriptor has more than 255 dimensions in class file %s", CHECK_0); | |
5269 } | |
5270 // The rest of what's there better be a legal signature | |
5271 signature++; | |
5272 length--; | |
5273 void_ok = false; | |
5274 break; | |
5275 | |
5276 default: | |
5277 return NULL; | |
5278 } | |
5279 } | |
5280 return NULL; | |
5281 } |