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