annotate src/share/vm/classfile/classFileParser.cpp @ 7639:22ead76da3f4

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