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