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