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