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