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