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