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