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