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