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