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