author | hseigel |
Thu, 09 Jul 2015 08:36:37 -0400 | |
changeset 31776 | 70dd826a47b5 |
parent 31402 | 78cd32274693 |
child 31777 | 0bfed49b6beb |
permissions | -rw-r--r-- |
1 | 1 |
/* |
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
2 |
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5426
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5426
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5426
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "classfile/classFileParser.hpp" |
|
27 |
#include "classfile/classLoader.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
28 |
#include "classfile/classLoaderData.inline.hpp" |
14385 | 29 |
#include "classfile/defaultMethods.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28817
diff
changeset
|
30 |
#include "classfile/javaClasses.inline.hpp" |
7397 | 31 |
#include "classfile/symbolTable.hpp" |
32 |
#include "classfile/systemDictionary.hpp" |
|
33 |
#include "classfile/verificationType.hpp" |
|
34 |
#include "classfile/verifier.hpp" |
|
35 |
#include "classfile/vmSymbols.hpp" |
|
30764 | 36 |
#include "gc/shared/gcLocker.hpp" |
7397 | 37 |
#include "memory/allocation.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
38 |
#include "memory/metadataFactory.hpp" |
7397 | 39 |
#include "memory/oopFactory.hpp" |
18025 | 40 |
#include "memory/referenceType.hpp" |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
41 |
#include "memory/resourceArea.hpp" |
7397 | 42 |
#include "memory/universe.inline.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
43 |
#include "oops/constantPool.hpp" |
10546 | 44 |
#include "oops/fieldStreams.hpp" |
7397 | 45 |
#include "oops/instanceKlass.hpp" |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
46 |
#include "oops/instanceMirrorKlass.hpp" |
7397 | 47 |
#include "oops/klass.inline.hpp" |
48 |
#include "oops/klassVtable.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
49 |
#include "oops/method.hpp" |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
50 |
#include "oops/symbol.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
51 |
#include "prims/jvm.h" |
7397 | 52 |
#include "prims/jvmtiExport.hpp" |
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
53 |
#include "prims/jvmtiThreadState.hpp" |
7397 | 54 |
#include "runtime/javaCalls.hpp" |
55 |
#include "runtime/perfData.hpp" |
|
56 |
#include "runtime/reflection.hpp" |
|
57 |
#include "runtime/signature.hpp" |
|
58 |
#include "runtime/timer.hpp" |
|
59 |
#include "services/classLoadingService.hpp" |
|
60 |
#include "services/threadService.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
61 |
#include "utilities/array.hpp" |
30764 | 62 |
#include "utilities/exceptions.hpp" |
15194
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15185
diff
changeset
|
63 |
#include "utilities/globalDefinitions.hpp" |
27683
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
64 |
#include "utilities/macros.hpp" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
65 |
#include "utilities/ostream.hpp" |
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
66 |
#include "utilities/resourceHash.hpp" |
27683
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
67 |
#if INCLUDE_CDS |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
68 |
#include "classfile/systemDictionaryShared.hpp" |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
69 |
#endif |
1 | 70 |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
71 |
// We generally try to create the oops directly when parsing, rather than |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
72 |
// allocating temporary data structures and copying the bytes twice. A |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
73 |
// temporary area is only needed when parsing utf8 entries in the constant |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
74 |
// pool and when parsing line number tables. |
1 | 75 |
|
76 |
// We add assert in debug mode when class format is not checked. |
|
77 |
||
78 |
#define JAVA_CLASSFILE_MAGIC 0xCAFEBABE |
|
79 |
#define JAVA_MIN_SUPPORTED_VERSION 45 |
|
14079 | 80 |
#define JAVA_MAX_SUPPORTED_VERSION 52 |
1 | 81 |
#define JAVA_MAX_SUPPORTED_MINOR_VERSION 0 |
82 |
||
83 |
// Used for two backward compatibility reasons: |
|
84 |
// - to check for new additions to the class file format in JDK1.5 |
|
85 |
// - to check for bug fixes in the format checker in JDK1.5 |
|
86 |
#define JAVA_1_5_VERSION 49 |
|
87 |
||
88 |
// Used for backward compatibility reasons: |
|
89 |
// - to check for javac bug fixes that happened after 1.5 |
|
602
92e03692ddd6
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
383
diff
changeset
|
90 |
// - also used as the max version when running in jdk6 |
1 | 91 |
#define JAVA_6_VERSION 50 |
92 |
||
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
93 |
// Used for backward compatibility reasons: |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
94 |
// - to check NameAndType_info signatures more aggressively |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
95 |
#define JAVA_7_VERSION 51 |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
96 |
|
14385 | 97 |
// Extension method support. |
98 |
#define JAVA_8_VERSION 52 |
|
99 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
100 |
void ClassFileParser::parse_constant_pool_entries(int length, TRAPS) { |
1 | 101 |
// Use a local copy of ClassFileStream. It helps the C++ compiler to optimize |
102 |
// this function (_current can be allocated in a register, with scalar |
|
103 |
// replacement of aggregates). The _current pointer is copied back to |
|
104 |
// stream() when this function returns. DON'T call another method within |
|
105 |
// this method that uses stream(). |
|
106 |
ClassFileStream* cfs0 = stream(); |
|
107 |
ClassFileStream cfs1 = *cfs0; |
|
108 |
ClassFileStream* cfs = &cfs1; |
|
109 |
#ifdef ASSERT |
|
6180 | 110 |
assert(cfs->allocated_on_stack(),"should be local"); |
1 | 111 |
u1* old_current = cfs0->current(); |
112 |
#endif |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
113 |
Handle class_loader(THREAD, _loader_data->class_loader()); |
1 | 114 |
|
115 |
// Used for batching symbol allocations. |
|
116 |
const char* names[SymbolTable::symbol_alloc_batch_size]; |
|
117 |
int lengths[SymbolTable::symbol_alloc_batch_size]; |
|
118 |
int indices[SymbolTable::symbol_alloc_batch_size]; |
|
119 |
unsigned int hashValues[SymbolTable::symbol_alloc_batch_size]; |
|
120 |
int names_count = 0; |
|
121 |
||
122 |
// parsing Index 0 is unused |
|
123 |
for (int index = 1; index < length; index++) { |
|
124 |
// Each of the following case guarantees one more byte in the stream |
|
125 |
// for the following tag or the access_flags following constant pool, |
|
126 |
// so we don't need bounds-check for reading tag. |
|
127 |
u1 tag = cfs->get_u1_fast(); |
|
128 |
switch (tag) { |
|
129 |
case JVM_CONSTANT_Class : |
|
130 |
{ |
|
131 |
cfs->guarantee_more(3, CHECK); // name_index, tag/access_flags |
|
132 |
u2 name_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
133 |
_cp->klass_index_at_put(index, name_index); |
1 | 134 |
} |
135 |
break; |
|
136 |
case JVM_CONSTANT_Fieldref : |
|
137 |
{ |
|
138 |
cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags |
|
139 |
u2 class_index = cfs->get_u2_fast(); |
|
140 |
u2 name_and_type_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
141 |
_cp->field_at_put(index, class_index, name_and_type_index); |
1 | 142 |
} |
143 |
break; |
|
144 |
case JVM_CONSTANT_Methodref : |
|
145 |
{ |
|
146 |
cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags |
|
147 |
u2 class_index = cfs->get_u2_fast(); |
|
148 |
u2 name_and_type_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
149 |
_cp->method_at_put(index, class_index, name_and_type_index); |
1 | 150 |
} |
151 |
break; |
|
152 |
case JVM_CONSTANT_InterfaceMethodref : |
|
153 |
{ |
|
154 |
cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags |
|
155 |
u2 class_index = cfs->get_u2_fast(); |
|
156 |
u2 name_and_type_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
157 |
_cp->interface_method_at_put(index, class_index, name_and_type_index); |
1 | 158 |
} |
159 |
break; |
|
160 |
case JVM_CONSTANT_String : |
|
161 |
{ |
|
162 |
cfs->guarantee_more(3, CHECK); // string_index, tag/access_flags |
|
163 |
u2 string_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
164 |
_cp->string_index_at_put(index, string_index); |
1 | 165 |
} |
166 |
break; |
|
5882 | 167 |
case JVM_CONSTANT_MethodHandle : |
168 |
case JVM_CONSTANT_MethodType : |
|
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
169 |
if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
5882 | 170 |
classfile_parse_error( |
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
171 |
"Class file version does not support constant tag %u in class file %s", |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
172 |
tag, CHECK); |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
173 |
} |
5882 | 174 |
if (tag == JVM_CONSTANT_MethodHandle) { |
175 |
cfs->guarantee_more(4, CHECK); // ref_kind, method_index, tag/access_flags |
|
176 |
u1 ref_kind = cfs->get_u1_fast(); |
|
177 |
u2 method_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
178 |
_cp->method_handle_index_at_put(index, ref_kind, method_index); |
5882 | 179 |
} else if (tag == JVM_CONSTANT_MethodType) { |
180 |
cfs->guarantee_more(3, CHECK); // signature_index, tag/access_flags |
|
181 |
u2 signature_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
182 |
_cp->method_type_index_at_put(index, signature_index); |
5882 | 183 |
} else { |
184 |
ShouldNotReachHere(); |
|
185 |
} |
|
186 |
break; |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
187 |
case JVM_CONSTANT_InvokeDynamic : |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
188 |
{ |
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
189 |
if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
190 |
classfile_parse_error( |
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
191 |
"Class file version does not support constant tag %u in class file %s", |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
192 |
tag, CHECK); |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
193 |
} |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
194 |
cfs->guarantee_more(5, CHECK); // bsm_index, nt, tag/access_flags |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
195 |
u2 bootstrap_specifier_index = cfs->get_u2_fast(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
196 |
u2 name_and_type_index = cfs->get_u2_fast(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
197 |
if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index) |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
198 |
_max_bootstrap_specifier_index = (int) bootstrap_specifier_index; // collect for later |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
199 |
_cp->invoke_dynamic_at_put(index, bootstrap_specifier_index, name_and_type_index); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
200 |
} |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
201 |
break; |
1 | 202 |
case JVM_CONSTANT_Integer : |
203 |
{ |
|
204 |
cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags |
|
205 |
u4 bytes = cfs->get_u4_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
206 |
_cp->int_at_put(index, (jint) bytes); |
1 | 207 |
} |
208 |
break; |
|
209 |
case JVM_CONSTANT_Float : |
|
210 |
{ |
|
211 |
cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags |
|
212 |
u4 bytes = cfs->get_u4_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
213 |
_cp->float_at_put(index, *(jfloat*)&bytes); |
1 | 214 |
} |
215 |
break; |
|
216 |
case JVM_CONSTANT_Long : |
|
217 |
// A mangled type might cause you to overrun allocated memory |
|
218 |
guarantee_property(index+1 < length, |
|
219 |
"Invalid constant pool entry %u in class file %s", |
|
220 |
index, CHECK); |
|
221 |
{ |
|
222 |
cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags |
|
223 |
u8 bytes = cfs->get_u8_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
224 |
_cp->long_at_put(index, bytes); |
1 | 225 |
} |
226 |
index++; // Skip entry following eigth-byte constant, see JVM book p. 98 |
|
227 |
break; |
|
228 |
case JVM_CONSTANT_Double : |
|
229 |
// A mangled type might cause you to overrun allocated memory |
|
230 |
guarantee_property(index+1 < length, |
|
231 |
"Invalid constant pool entry %u in class file %s", |
|
232 |
index, CHECK); |
|
233 |
{ |
|
234 |
cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags |
|
235 |
u8 bytes = cfs->get_u8_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
236 |
_cp->double_at_put(index, *(jdouble*)&bytes); |
1 | 237 |
} |
238 |
index++; // Skip entry following eigth-byte constant, see JVM book p. 98 |
|
239 |
break; |
|
240 |
case JVM_CONSTANT_NameAndType : |
|
241 |
{ |
|
242 |
cfs->guarantee_more(5, CHECK); // name_index, signature_index, tag/access_flags |
|
243 |
u2 name_index = cfs->get_u2_fast(); |
|
244 |
u2 signature_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
245 |
_cp->name_and_type_at_put(index, name_index, signature_index); |
1 | 246 |
} |
247 |
break; |
|
248 |
case JVM_CONSTANT_Utf8 : |
|
249 |
{ |
|
250 |
cfs->guarantee_more(2, CHECK); // utf8_length |
|
251 |
u2 utf8_length = cfs->get_u2_fast(); |
|
252 |
u1* utf8_buffer = cfs->get_u1_buffer(); |
|
253 |
assert(utf8_buffer != NULL, "null utf8 buffer"); |
|
254 |
// Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward. |
|
255 |
cfs->guarantee_more(utf8_length+1, CHECK); // utf8 string, tag/access_flags |
|
256 |
cfs->skip_u1_fast(utf8_length); |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
257 |
|
1 | 258 |
// Before storing the symbol, make sure it's legal |
259 |
if (_need_verify) { |
|
260 |
verify_legal_utf8((unsigned char*)utf8_buffer, utf8_length, CHECK); |
|
261 |
} |
|
262 |
||
24322 | 263 |
if (has_cp_patch_at(index)) { |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
264 |
Handle patch = clear_cp_patch_at(index); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
265 |
guarantee_property(java_lang_String::is_instance(patch()), |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
266 |
"Illegal utf8 patch at %d in class file %s", |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
267 |
index, CHECK); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
268 |
char* str = java_lang_String::as_utf8_string(patch()); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
269 |
// (could use java_lang_String::as_symbol instead, but might as well batch them) |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
270 |
utf8_buffer = (u1*) str; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
271 |
utf8_length = (int) strlen(str); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
272 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
273 |
|
1 | 274 |
unsigned int hash; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
275 |
Symbol* result = SymbolTable::lookup_only((char*)utf8_buffer, utf8_length, hash); |
1 | 276 |
if (result == NULL) { |
277 |
names[names_count] = (char*)utf8_buffer; |
|
278 |
lengths[names_count] = utf8_length; |
|
279 |
indices[names_count] = index; |
|
280 |
hashValues[names_count++] = hash; |
|
281 |
if (names_count == SymbolTable::symbol_alloc_batch_size) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
282 |
SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK); |
1 | 283 |
names_count = 0; |
284 |
} |
|
285 |
} else { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
286 |
_cp->symbol_at_put(index, result); |
1 | 287 |
} |
288 |
} |
|
289 |
break; |
|
290 |
default: |
|
291 |
classfile_parse_error( |
|
292 |
"Unknown constant tag %u in class file %s", tag, CHECK); |
|
293 |
break; |
|
294 |
} |
|
295 |
} |
|
296 |
||
297 |
// Allocate the remaining symbols |
|
298 |
if (names_count > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
299 |
SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK); |
1 | 300 |
} |
301 |
||
302 |
// Copy _current pointer of local copy back to stream(). |
|
303 |
#ifdef ASSERT |
|
304 |
assert(cfs0->current() == old_current, "non-exclusive use of stream()"); |
|
305 |
#endif |
|
306 |
cfs0->set_current(cfs1.current()); |
|
307 |
} |
|
308 |
||
309 |
bool inline valid_cp_range(int index, int length) { return (index > 0 && index < length); } |
|
310 |
||
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
311 |
inline Symbol* check_symbol_at(constantPoolHandle cp, int index) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
312 |
if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8()) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
313 |
return cp->symbol_at(index); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
314 |
else |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
315 |
return NULL; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
316 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
317 |
|
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
318 |
PRAGMA_DIAG_PUSH |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
319 |
PRAGMA_FORMAT_NONLITERAL_IGNORED |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
320 |
void ClassFileParser::report_assert_property_failure(const char* msg, TRAPS) { |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
321 |
ResourceMark rm(THREAD); |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
322 |
fatal(err_msg(msg, _class_name->as_C_string())); |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
323 |
} |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
324 |
|
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
325 |
void ClassFileParser::report_assert_property_failure(const char* msg, int index, TRAPS) { |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
326 |
ResourceMark rm(THREAD); |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
327 |
fatal(err_msg(msg, index, _class_name->as_C_string())); |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
328 |
} |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
329 |
PRAGMA_DIAG_POP |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
330 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
331 |
constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { |
1 | 332 |
ClassFileStream* cfs = stream(); |
333 |
constantPoolHandle nullHandle; |
|
334 |
||
335 |
cfs->guarantee_more(3, CHECK_(nullHandle)); // length, first cp tag |
|
336 |
u2 length = cfs->get_u2_fast(); |
|
337 |
guarantee_property( |
|
338 |
length >= 1, "Illegal constant pool size %u in class file %s", |
|
339 |
length, CHECK_(nullHandle)); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
340 |
ConstantPool* constant_pool = ConstantPool::allocate(_loader_data, length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
341 |
CHECK_(nullHandle)); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
342 |
_cp = constant_pool; // save in case of errors |
1 | 343 |
constantPoolHandle cp (THREAD, constant_pool); |
344 |
||
345 |
// parsing constant pool entries |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
346 |
parse_constant_pool_entries(length, CHECK_(nullHandle)); |
1 | 347 |
|
348 |
int index = 1; // declared outside of loops for portability |
|
349 |
||
350 |
// first verification pass - validate cross references and fixup class and string constants |
|
351 |
for (index = 1; index < length; index++) { // Index 0 is unused |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
352 |
jbyte tag = cp->tag_at(index).value(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
353 |
switch (tag) { |
1 | 354 |
case JVM_CONSTANT_Class : |
355 |
ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present |
|
356 |
break; |
|
357 |
case JVM_CONSTANT_Fieldref : |
|
358 |
// fall through |
|
359 |
case JVM_CONSTANT_Methodref : |
|
360 |
// fall through |
|
361 |
case JVM_CONSTANT_InterfaceMethodref : { |
|
362 |
if (!_need_verify) break; |
|
363 |
int klass_ref_index = cp->klass_ref_index_at(index); |
|
364 |
int name_and_type_ref_index = cp->name_and_type_ref_index_at(index); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
365 |
check_property(valid_klass_reference_at(klass_ref_index), |
1 | 366 |
"Invalid constant pool index %u in class file %s", |
367 |
klass_ref_index, |
|
368 |
CHECK_(nullHandle)); |
|
369 |
check_property(valid_cp_range(name_and_type_ref_index, length) && |
|
370 |
cp->tag_at(name_and_type_ref_index).is_name_and_type(), |
|
371 |
"Invalid constant pool index %u in class file %s", |
|
372 |
name_and_type_ref_index, |
|
373 |
CHECK_(nullHandle)); |
|
374 |
break; |
|
375 |
} |
|
376 |
case JVM_CONSTANT_String : |
|
377 |
ShouldNotReachHere(); // Only JVM_CONSTANT_StringIndex should be present |
|
378 |
break; |
|
379 |
case JVM_CONSTANT_Integer : |
|
380 |
break; |
|
381 |
case JVM_CONSTANT_Float : |
|
382 |
break; |
|
383 |
case JVM_CONSTANT_Long : |
|
384 |
case JVM_CONSTANT_Double : |
|
385 |
index++; |
|
386 |
check_property( |
|
387 |
(index < length && cp->tag_at(index).is_invalid()), |
|
388 |
"Improper constant pool long/double index %u in class file %s", |
|
389 |
index, CHECK_(nullHandle)); |
|
390 |
break; |
|
391 |
case JVM_CONSTANT_NameAndType : { |
|
392 |
if (!_need_verify) break; |
|
393 |
int name_ref_index = cp->name_ref_index_at(index); |
|
394 |
int signature_ref_index = cp->signature_ref_index_at(index); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
395 |
check_property(valid_symbol_at(name_ref_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
396 |
"Invalid constant pool index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
397 |
name_ref_index, CHECK_(nullHandle)); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
398 |
check_property(valid_symbol_at(signature_ref_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
399 |
"Invalid constant pool index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
400 |
signature_ref_index, CHECK_(nullHandle)); |
1 | 401 |
break; |
402 |
} |
|
403 |
case JVM_CONSTANT_Utf8 : |
|
404 |
break; |
|
405 |
case JVM_CONSTANT_UnresolvedClass : // fall-through |
|
406 |
case JVM_CONSTANT_UnresolvedClassInError: |
|
407 |
ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present |
|
408 |
break; |
|
409 |
case JVM_CONSTANT_ClassIndex : |
|
410 |
{ |
|
411 |
int class_index = cp->klass_index_at(index); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
412 |
check_property(valid_symbol_at(class_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
413 |
"Invalid constant pool index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
414 |
class_index, CHECK_(nullHandle)); |
1 | 415 |
cp->unresolved_klass_at_put(index, cp->symbol_at(class_index)); |
416 |
} |
|
417 |
break; |
|
418 |
case JVM_CONSTANT_StringIndex : |
|
419 |
{ |
|
420 |
int string_index = cp->string_index_at(index); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
421 |
check_property(valid_symbol_at(string_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
422 |
"Invalid constant pool index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
423 |
string_index, CHECK_(nullHandle)); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
424 |
Symbol* sym = cp->symbol_at(string_index); |
1 | 425 |
cp->unresolved_string_at_put(index, sym); |
426 |
} |
|
427 |
break; |
|
5882 | 428 |
case JVM_CONSTANT_MethodHandle : |
429 |
{ |
|
430 |
int ref_index = cp->method_handle_index_at(index); |
|
431 |
check_property( |
|
24322 | 432 |
valid_cp_range(ref_index, length), |
5882 | 433 |
"Invalid constant pool index %u in class file %s", |
434 |
ref_index, CHECK_(nullHandle)); |
|
435 |
constantTag tag = cp->tag_at(ref_index); |
|
436 |
int ref_kind = cp->method_handle_ref_kind_at(index); |
|
437 |
switch (ref_kind) { |
|
438 |
case JVM_REF_getField: |
|
439 |
case JVM_REF_getStatic: |
|
440 |
case JVM_REF_putField: |
|
441 |
case JVM_REF_putStatic: |
|
442 |
check_property( |
|
443 |
tag.is_field(), |
|
444 |
"Invalid constant pool index %u in class file %s (not a field)", |
|
445 |
ref_index, CHECK_(nullHandle)); |
|
446 |
break; |
|
447 |
case JVM_REF_invokeVirtual: |
|
448 |
case JVM_REF_newInvokeSpecial: |
|
449 |
check_property( |
|
450 |
tag.is_method(), |
|
451 |
"Invalid constant pool index %u in class file %s (not a method)", |
|
452 |
ref_index, CHECK_(nullHandle)); |
|
453 |
break; |
|
17024
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
454 |
case JVM_REF_invokeStatic: |
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
455 |
case JVM_REF_invokeSpecial: |
17823
0eeb35991a2e
8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents:
17612
diff
changeset
|
456 |
check_property(tag.is_method() || |
0eeb35991a2e
8014059: JSR292: Failed to reject invalid class cplmhl00201m28n
bharadwaj
parents:
17612
diff
changeset
|
457 |
((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()), |
17024
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
458 |
"Invalid constant pool index %u in class file %s (not a method)", |
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
459 |
ref_index, CHECK_(nullHandle)); |
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
460 |
break; |
5882 | 461 |
case JVM_REF_invokeInterface: |
462 |
check_property( |
|
463 |
tag.is_interface_method(), |
|
464 |
"Invalid constant pool index %u in class file %s (not an interface method)", |
|
465 |
ref_index, CHECK_(nullHandle)); |
|
466 |
break; |
|
467 |
default: |
|
468 |
classfile_parse_error( |
|
469 |
"Bad method handle kind at constant pool index %u in class file %s", |
|
470 |
index, CHECK_(nullHandle)); |
|
471 |
} |
|
472 |
// Keep the ref_index unchanged. It will be indirected at link-time. |
|
473 |
} |
|
474 |
break; |
|
475 |
case JVM_CONSTANT_MethodType : |
|
476 |
{ |
|
477 |
int ref_index = cp->method_type_index_at(index); |
|
24322 | 478 |
check_property(valid_symbol_at(ref_index), |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
479 |
"Invalid constant pool index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
480 |
ref_index, CHECK_(nullHandle)); |
5882 | 481 |
} |
482 |
break; |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
483 |
case JVM_CONSTANT_InvokeDynamic : |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
484 |
{ |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
485 |
int name_and_type_ref_index = cp->invoke_dynamic_name_and_type_ref_index_at(index); |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
486 |
check_property(valid_cp_range(name_and_type_ref_index, length) && |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
487 |
cp->tag_at(name_and_type_ref_index).is_name_and_type(), |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
488 |
"Invalid constant pool index %u in class file %s", |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
489 |
name_and_type_ref_index, |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
490 |
CHECK_(nullHandle)); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
491 |
// bootstrap specifier index must be checked later, when BootstrapMethods attr is available |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
492 |
break; |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
493 |
} |
1 | 494 |
default: |
5403
6b0dd9c75dde
6888954: argument formatting for assert() and friends
jcoomes
parents:
5250
diff
changeset
|
495 |
fatal(err_msg("bad constant pool tag value %u", |
6b0dd9c75dde
6888954: argument formatting for assert() and friends
jcoomes
parents:
5250
diff
changeset
|
496 |
cp->tag_at(index).value())); |
1 | 497 |
ShouldNotReachHere(); |
498 |
break; |
|
499 |
} // end of switch |
|
500 |
} // end of for |
|
501 |
||
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
502 |
if (_cp_patches != NULL) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
503 |
// need to treat this_class specially... |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
504 |
int this_class_index; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
505 |
{ |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
506 |
cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
507 |
u1* mark = cfs->current(); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
508 |
u2 flags = cfs->get_u2_fast(); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
509 |
this_class_index = cfs->get_u2_fast(); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
510 |
cfs->set_current(mark); // revert to mark |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
511 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
512 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
513 |
for (index = 1; index < length; index++) { // Index 0 is unused |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
514 |
if (has_cp_patch_at(index)) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
515 |
guarantee_property(index != this_class_index, |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
516 |
"Illegal constant pool patch to self at %d in class file %s", |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
517 |
index, CHECK_(nullHandle)); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
518 |
patch_constant_pool(cp, index, cp_patch_at(index), CHECK_(nullHandle)); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
519 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
520 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
521 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
522 |
|
1 | 523 |
if (!_need_verify) { |
524 |
return cp; |
|
525 |
} |
|
526 |
||
527 |
// second verification pass - checks the strings are of the right format. |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
528 |
// but not yet to the other entries |
1 | 529 |
for (index = 1; index < length; index++) { |
530 |
jbyte tag = cp->tag_at(index).value(); |
|
531 |
switch (tag) { |
|
532 |
case JVM_CONSTANT_UnresolvedClass: { |
|
25325 | 533 |
Symbol* class_name = cp->klass_name_at(index); |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
534 |
// check the name, even if _cp_patches will overwrite it |
1 | 535 |
verify_legal_class_name(class_name, CHECK_(nullHandle)); |
536 |
break; |
|
537 |
} |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
538 |
case JVM_CONSTANT_NameAndType: { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
539 |
if (_need_verify && _major_version >= JAVA_7_VERSION) { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
540 |
int sig_index = cp->signature_ref_index_at(index); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
541 |
int name_index = cp->name_ref_index_at(index); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
542 |
Symbol* name = cp->symbol_at(name_index); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
543 |
Symbol* sig = cp->symbol_at(sig_index); |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
544 |
if (sig->byte_at(0) == JVM_SIGNATURE_FUNC) { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
545 |
verify_legal_method_signature(name, sig, CHECK_(nullHandle)); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
546 |
} else { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
547 |
verify_legal_field_signature(name, sig, CHECK_(nullHandle)); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
548 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
549 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
550 |
break; |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
551 |
} |
9117
30d757743e56
7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents:
9116
diff
changeset
|
552 |
case JVM_CONSTANT_InvokeDynamic: |
1 | 553 |
case JVM_CONSTANT_Fieldref: |
554 |
case JVM_CONSTANT_Methodref: |
|
555 |
case JVM_CONSTANT_InterfaceMethodref: { |
|
556 |
int name_and_type_ref_index = cp->name_and_type_ref_index_at(index); |
|
557 |
// already verified to be utf8 |
|
558 |
int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index); |
|
559 |
// already verified to be utf8 |
|
560 |
int signature_ref_index = cp->signature_ref_index_at(name_and_type_ref_index); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
561 |
Symbol* name = cp->symbol_at(name_ref_index); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
562 |
Symbol* signature = cp->symbol_at(signature_ref_index); |
1 | 563 |
if (tag == JVM_CONSTANT_Fieldref) { |
564 |
verify_legal_field_name(name, CHECK_(nullHandle)); |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
565 |
if (_need_verify && _major_version >= JAVA_7_VERSION) { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
566 |
// Signature is verified above, when iterating NameAndType_info. |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
567 |
// Need only to be sure it's the right type. |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
568 |
if (signature->byte_at(0) == JVM_SIGNATURE_FUNC) { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
569 |
throwIllegalSignature( |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
570 |
"Field", name, signature, CHECK_(nullHandle)); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
571 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
572 |
} else { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
573 |
verify_legal_field_signature(name, signature, CHECK_(nullHandle)); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
574 |
} |
1 | 575 |
} else { |
576 |
verify_legal_method_name(name, CHECK_(nullHandle)); |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
577 |
if (_need_verify && _major_version >= JAVA_7_VERSION) { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
578 |
// Signature is verified above, when iterating NameAndType_info. |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
579 |
// Need only to be sure it's the right type. |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
580 |
if (signature->byte_at(0) != JVM_SIGNATURE_FUNC) { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
581 |
throwIllegalSignature( |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
582 |
"Method", name, signature, CHECK_(nullHandle)); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
583 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
584 |
} else { |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
585 |
verify_legal_method_signature(name, signature, CHECK_(nullHandle)); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
586 |
} |
1 | 587 |
if (tag == JVM_CONSTANT_Methodref) { |
588 |
// 4509014: If a class method name begins with '<', it must be "<init>". |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
589 |
assert(name != NULL, "method name in constant pool is null"); |
1 | 590 |
unsigned int name_len = name->utf8_length(); |
591 |
assert(name_len > 0, "bad method name"); // already verified as legal name |
|
592 |
if (name->byte_at(0) == '<') { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
593 |
if (name != vmSymbols::object_initializer_name()) { |
1 | 594 |
classfile_parse_error( |
595 |
"Bad method name at constant pool index %u in class file %s", |
|
596 |
name_ref_index, CHECK_(nullHandle)); |
|
597 |
} |
|
598 |
} |
|
599 |
} |
|
600 |
} |
|
601 |
break; |
|
602 |
} |
|
5882 | 603 |
case JVM_CONSTANT_MethodHandle: { |
604 |
int ref_index = cp->method_handle_index_at(index); |
|
605 |
int ref_kind = cp->method_handle_ref_kind_at(index); |
|
606 |
switch (ref_kind) { |
|
607 |
case JVM_REF_invokeVirtual: |
|
608 |
case JVM_REF_invokeStatic: |
|
609 |
case JVM_REF_invokeSpecial: |
|
610 |
case JVM_REF_newInvokeSpecial: |
|
611 |
{ |
|
612 |
int name_and_type_ref_index = cp->name_and_type_ref_index_at(ref_index); |
|
613 |
int name_ref_index = cp->name_ref_index_at(name_and_type_ref_index); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
614 |
Symbol* name = cp->symbol_at(name_ref_index); |
5882 | 615 |
if (ref_kind == JVM_REF_newInvokeSpecial) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
616 |
if (name != vmSymbols::object_initializer_name()) { |
5882 | 617 |
classfile_parse_error( |
618 |
"Bad constructor name at constant pool index %u in class file %s", |
|
619 |
name_ref_index, CHECK_(nullHandle)); |
|
620 |
} |
|
621 |
} else { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
622 |
if (name == vmSymbols::object_initializer_name()) { |
5882 | 623 |
classfile_parse_error( |
624 |
"Bad method name at constant pool index %u in class file %s", |
|
625 |
name_ref_index, CHECK_(nullHandle)); |
|
626 |
} |
|
627 |
} |
|
628 |
} |
|
629 |
break; |
|
630 |
// Other ref_kinds are already fully checked in previous pass. |
|
631 |
} |
|
632 |
break; |
|
633 |
} |
|
634 |
case JVM_CONSTANT_MethodType: { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
635 |
Symbol* no_name = vmSymbols::type_name(); // place holder |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
636 |
Symbol* signature = cp->method_type_signature_at(index); |
5882 | 637 |
verify_legal_method_signature(no_name, signature, CHECK_(nullHandle)); |
638 |
break; |
|
639 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
640 |
case JVM_CONSTANT_Utf8: { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
641 |
assert(cp->symbol_at(index)->refcount() != 0, "count corrupted"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
642 |
} |
1 | 643 |
} // end of switch |
644 |
} // end of for |
|
645 |
||
646 |
return cp; |
|
647 |
} |
|
648 |
||
649 |
||
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
650 |
void ClassFileParser::patch_constant_pool(constantPoolHandle cp, int index, Handle patch, TRAPS) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
651 |
BasicType patch_type = T_VOID; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
652 |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
653 |
switch (cp->tag_at(index).value()) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
654 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
655 |
case JVM_CONSTANT_UnresolvedClass : |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
656 |
// Patching a class means pre-resolving it. |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
657 |
// The name in the constant pool is ignored. |
5882 | 658 |
if (java_lang_Class::is_instance(patch())) { |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
659 |
guarantee_property(!java_lang_Class::is_primitive(patch()), |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
660 |
"Illegal class patch at %d in class file %s", |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
661 |
index, CHECK); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
662 |
cp->klass_at_put(index, java_lang_Class::as_Klass(patch())); |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
663 |
} else { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
664 |
guarantee_property(java_lang_String::is_instance(patch()), |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
665 |
"Illegal class patch at %d in class file %s", |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
666 |
index, CHECK); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
667 |
Symbol* name = java_lang_String::as_symbol(patch(), CHECK); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
668 |
cp->unresolved_klass_at_put(index, name); |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
669 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
670 |
break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
671 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
672 |
case JVM_CONSTANT_String : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
673 |
// skip this patch and don't clear it. Needs the oop array for resolved |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
674 |
// references to be created first. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
675 |
return; |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
676 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
677 |
case JVM_CONSTANT_Integer : patch_type = T_INT; goto patch_prim; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
678 |
case JVM_CONSTANT_Float : patch_type = T_FLOAT; goto patch_prim; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
679 |
case JVM_CONSTANT_Long : patch_type = T_LONG; goto patch_prim; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
680 |
case JVM_CONSTANT_Double : patch_type = T_DOUBLE; goto patch_prim; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
681 |
patch_prim: |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
682 |
{ |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
683 |
jvalue value; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
684 |
BasicType value_type = java_lang_boxing_object::get_value(patch(), &value); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
685 |
guarantee_property(value_type == patch_type, |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
686 |
"Illegal primitive patch at %d in class file %s", |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
687 |
index, CHECK); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
688 |
switch (value_type) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
689 |
case T_INT: cp->int_at_put(index, value.i); break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
690 |
case T_FLOAT: cp->float_at_put(index, value.f); break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
691 |
case T_LONG: cp->long_at_put(index, value.j); break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
692 |
case T_DOUBLE: cp->double_at_put(index, value.d); break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
693 |
default: assert(false, ""); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
694 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
695 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
696 |
break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
697 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
698 |
default: |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
699 |
// %%% TODO: put method handles into CONSTANT_InterfaceMethodref, etc. |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
700 |
guarantee_property(!has_cp_patch_at(index), |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
701 |
"Illegal unexpected patch at %d in class file %s", |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
702 |
index, CHECK); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
703 |
return; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
704 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
705 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
706 |
// On fall-through, mark the patch as used. |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
707 |
clear_cp_patch_at(index); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
708 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
709 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
710 |
|
1 | 711 |
class NameSigHash: public ResourceObj { |
712 |
public: |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
713 |
Symbol* _name; // name |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
714 |
Symbol* _sig; // signature |
1 | 715 |
NameSigHash* _next; // Next entry in hash table |
716 |
}; |
|
717 |
||
718 |
||
719 |
#define HASH_ROW_SIZE 256 |
|
720 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
721 |
unsigned int hash(Symbol* name, Symbol* sig) { |
1 | 722 |
unsigned int raw_hash = 0; |
723 |
raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2); |
|
724 |
raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize; |
|
725 |
||
726 |
return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE; |
|
727 |
} |
|
728 |
||
729 |
||
730 |
void initialize_hashtable(NameSigHash** table) { |
|
731 |
memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE); |
|
732 |
} |
|
733 |
||
734 |
// Return false if the name/sig combination is found in table. |
|
735 |
// Return true if no duplicate is found. And name/sig is added as a new entry in table. |
|
736 |
// The old format checker uses heap sort to find duplicates. |
|
737 |
// NOTE: caller should guarantee that GC doesn't happen during the life cycle |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
738 |
// of table since we don't expect Symbol*'s to move. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
739 |
bool put_after_lookup(Symbol* name, Symbol* sig, NameSigHash** table) { |
1 | 740 |
assert(name != NULL, "name in constant pool is NULL"); |
741 |
||
742 |
// First lookup for duplicates |
|
743 |
int index = hash(name, sig); |
|
744 |
NameSigHash* entry = table[index]; |
|
745 |
while (entry != NULL) { |
|
746 |
if (entry->_name == name && entry->_sig == sig) { |
|
747 |
return false; |
|
748 |
} |
|
749 |
entry = entry->_next; |
|
750 |
} |
|
751 |
||
752 |
// No duplicate is found, allocate a new entry and fill it. |
|
753 |
entry = new NameSigHash(); |
|
754 |
entry->_name = name; |
|
755 |
entry->_sig = sig; |
|
756 |
||
757 |
// Insert into hash table |
|
758 |
entry->_next = table[index]; |
|
759 |
table[index] = entry; |
|
760 |
||
761 |
return true; |
|
762 |
} |
|
763 |
||
764 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
765 |
Array<Klass*>* ClassFileParser::parse_interfaces(int length, |
1 | 766 |
Handle protection_domain, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
767 |
Symbol* class_name, |
14385 | 768 |
bool* has_default_methods, |
1 | 769 |
TRAPS) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
770 |
if (length == 0) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
771 |
_local_interfaces = Universe::the_empty_klass_array(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
772 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
773 |
ClassFileStream* cfs = stream(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
774 |
assert(length > 0, "only called for length>0"); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
775 |
_local_interfaces = MetadataFactory::new_array<Klass*>(_loader_data, length, NULL, CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
776 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
777 |
int index; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
778 |
for (index = 0; index < length; index++) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
779 |
u2 interface_index = cfs->get_u2(CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
780 |
KlassHandle interf; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
781 |
check_property( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
782 |
valid_klass_reference_at(interface_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
783 |
"Interface name has bad constant pool index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
784 |
interface_index, CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
785 |
if (_cp->tag_at(interface_index).is_klass()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
786 |
interf = KlassHandle(THREAD, _cp->resolved_klass_at(interface_index)); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
787 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
788 |
Symbol* unresolved_klass = _cp->klass_name_at(interface_index); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
789 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
790 |
// Don't need to check legal name because it's checked when parsing constant pool. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
791 |
// But need to make sure it's not an array type. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
792 |
guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
793 |
"Bad interface name in class file %s", CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
794 |
Handle class_loader(THREAD, _loader_data->class_loader()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
795 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
796 |
// Call resolve_super so classcircularity is checked |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
797 |
Klass* k = SystemDictionary::resolve_super_or_fail(class_name, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
798 |
unresolved_klass, class_loader, protection_domain, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
799 |
false, CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
800 |
interf = KlassHandle(THREAD, k); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
801 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
802 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
803 |
if (!interf()->is_interface()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
804 |
THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
805 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
806 |
if (InstanceKlass::cast(interf())->has_default_methods()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
807 |
*has_default_methods = true; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
808 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
809 |
_local_interfaces->at_put(index, interf()); |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
810 |
} |
1 | 811 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
812 |
if (!_need_verify || length <= 1) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
813 |
return _local_interfaces; |
14385 | 814 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
815 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
816 |
// Check if there's any duplicates in interfaces |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
817 |
ResourceMark rm(THREAD); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
818 |
NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
819 |
THREAD, NameSigHash*, HASH_ROW_SIZE); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
820 |
initialize_hashtable(interface_names); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
821 |
bool dup = false; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
822 |
{ |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
823 |
debug_only(No_Safepoint_Verifier nsv;) |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
824 |
for (index = 0; index < length; index++) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
825 |
Klass* k = _local_interfaces->at(index); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
826 |
Symbol* name = InstanceKlass::cast(k)->name(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
827 |
// If no duplicates, add (name, NULL) in hashtable interface_names. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
828 |
if (!put_after_lookup(name, NULL, interface_names)) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
829 |
dup = true; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
830 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
831 |
} |
1 | 832 |
} |
833 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
834 |
if (dup) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
835 |
classfile_parse_error("Duplicate interface name in class file %s", CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
836 |
} |
1 | 837 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
838 |
return _local_interfaces; |
1 | 839 |
} |
840 |
||
841 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
842 |
void ClassFileParser::verify_constantvalue(int constantvalue_index, int signature_index, TRAPS) { |
1 | 843 |
// Make sure the constant pool entry is of a type appropriate to this field |
844 |
guarantee_property( |
|
845 |
(constantvalue_index > 0 && |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
846 |
constantvalue_index < _cp->length()), |
1 | 847 |
"Bad initial value index %u in ConstantValue attribute in class file %s", |
848 |
constantvalue_index, CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
849 |
constantTag value_type = _cp->tag_at(constantvalue_index); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
850 |
switch ( _cp->basic_type_for_signature_at(signature_index) ) { |
1 | 851 |
case T_LONG: |
852 |
guarantee_property(value_type.is_long(), "Inconsistent constant value type in class file %s", CHECK); |
|
853 |
break; |
|
854 |
case T_FLOAT: |
|
855 |
guarantee_property(value_type.is_float(), "Inconsistent constant value type in class file %s", CHECK); |
|
856 |
break; |
|
857 |
case T_DOUBLE: |
|
858 |
guarantee_property(value_type.is_double(), "Inconsistent constant value type in class file %s", CHECK); |
|
859 |
break; |
|
860 |
case T_BYTE: case T_CHAR: case T_SHORT: case T_BOOLEAN: case T_INT: |
|
861 |
guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK); |
|
862 |
break; |
|
863 |
case T_OBJECT: |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
864 |
guarantee_property((_cp->symbol_at(signature_index)->equals("Ljava/lang/String;") |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
865 |
&& value_type.is_string()), |
1 | 866 |
"Bad string initial value in class file %s", CHECK); |
867 |
break; |
|
868 |
default: |
|
869 |
classfile_parse_error( |
|
870 |
"Unable to set initial value %u in class file %s", |
|
871 |
constantvalue_index, CHECK); |
|
872 |
} |
|
873 |
} |
|
874 |
||
875 |
||
876 |
// Parse attributes for a field. |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
877 |
void ClassFileParser::parse_field_attributes(u2 attributes_count, |
1 | 878 |
bool is_static, u2 signature_index, |
879 |
u2* constantvalue_index_addr, |
|
880 |
bool* is_synthetic_addr, |
|
881 |
u2* generic_signature_index_addr, |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
882 |
ClassFileParser::FieldAnnotationCollector* parsed_annotations, |
1 | 883 |
TRAPS) { |
884 |
ClassFileStream* cfs = stream(); |
|
885 |
assert(attributes_count > 0, "length should be greater than 0"); |
|
886 |
u2 constantvalue_index = 0; |
|
887 |
u2 generic_signature_index = 0; |
|
888 |
bool is_synthetic = false; |
|
889 |
u1* runtime_visible_annotations = NULL; |
|
890 |
int runtime_visible_annotations_length = 0; |
|
891 |
u1* runtime_invisible_annotations = NULL; |
|
892 |
int runtime_invisible_annotations_length = 0; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
893 |
u1* runtime_visible_type_annotations = NULL; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
894 |
int runtime_visible_type_annotations_length = 0; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
895 |
u1* runtime_invisible_type_annotations = NULL; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
896 |
int runtime_invisible_type_annotations_length = 0; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
897 |
bool runtime_invisible_annotations_exists = false; |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
898 |
bool runtime_invisible_type_annotations_exists = false; |
1 | 899 |
while (attributes_count--) { |
900 |
cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length |
|
901 |
u2 attribute_name_index = cfs->get_u2_fast(); |
|
902 |
u4 attribute_length = cfs->get_u4_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
903 |
check_property(valid_symbol_at(attribute_name_index), |
1 | 904 |
"Invalid field attribute index %u in class file %s", |
905 |
attribute_name_index, |
|
906 |
CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
907 |
Symbol* attribute_name = _cp->symbol_at(attribute_name_index); |
1 | 908 |
if (is_static && attribute_name == vmSymbols::tag_constant_value()) { |
909 |
// ignore if non-static |
|
910 |
if (constantvalue_index != 0) { |
|
911 |
classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK); |
|
912 |
} |
|
913 |
check_property( |
|
914 |
attribute_length == 2, |
|
915 |
"Invalid ConstantValue field attribute length %u in class file %s", |
|
916 |
attribute_length, CHECK); |
|
917 |
constantvalue_index = cfs->get_u2(CHECK); |
|
918 |
if (_need_verify) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
919 |
verify_constantvalue(constantvalue_index, signature_index, CHECK); |
1 | 920 |
} |
921 |
} else if (attribute_name == vmSymbols::tag_synthetic()) { |
|
922 |
if (attribute_length != 0) { |
|
923 |
classfile_parse_error( |
|
924 |
"Invalid Synthetic field attribute length %u in class file %s", |
|
925 |
attribute_length, CHECK); |
|
926 |
} |
|
927 |
is_synthetic = true; |
|
928 |
} else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120 |
|
929 |
if (attribute_length != 0) { |
|
930 |
classfile_parse_error( |
|
931 |
"Invalid Deprecated field attribute length %u in class file %s", |
|
932 |
attribute_length, CHECK); |
|
933 |
} |
|
934 |
} else if (_major_version >= JAVA_1_5_VERSION) { |
|
935 |
if (attribute_name == vmSymbols::tag_signature()) { |
|
936 |
if (attribute_length != 2) { |
|
937 |
classfile_parse_error( |
|
938 |
"Wrong size %u for field's Signature attribute in class file %s", |
|
939 |
attribute_length, CHECK); |
|
940 |
} |
|
25507 | 941 |
generic_signature_index = parse_generic_signature_attribute(CHECK); |
1 | 942 |
} else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) { |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
943 |
if (runtime_visible_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
944 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
945 |
"Multiple RuntimeVisibleAnnotations attributes for field in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
946 |
} |
1 | 947 |
runtime_visible_annotations_length = attribute_length; |
948 |
runtime_visible_annotations = cfs->get_u1_buffer(); |
|
949 |
assert(runtime_visible_annotations != NULL, "null visible annotations"); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
950 |
parse_annotations(runtime_visible_annotations, |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
951 |
runtime_visible_annotations_length, |
31366
67eccccbb2ca
8042041: https://bugs.openjdk.java.net/browse/JDK-8042041
hseigel
parents:
30764
diff
changeset
|
952 |
parsed_annotations); |
1 | 953 |
cfs->skip_u1(runtime_visible_annotations_length, CHECK); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
954 |
} else if (attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
955 |
if (runtime_invisible_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
956 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
957 |
"Multiple RuntimeInvisibleAnnotations attributes for field in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
958 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
959 |
runtime_invisible_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
960 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
961 |
runtime_invisible_annotations_length = attribute_length; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
962 |
runtime_invisible_annotations = cfs->get_u1_buffer(); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
963 |
assert(runtime_invisible_annotations != NULL, "null invisible annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
964 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
965 |
cfs->skip_u1(attribute_length, CHECK); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
966 |
} else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) { |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
967 |
if (runtime_visible_type_annotations != NULL) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
968 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
969 |
"Multiple RuntimeVisibleTypeAnnotations attributes for field in class file %s", CHECK); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
970 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
971 |
runtime_visible_type_annotations_length = attribute_length; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
972 |
runtime_visible_type_annotations = cfs->get_u1_buffer(); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
973 |
assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
974 |
cfs->skip_u1(runtime_visible_type_annotations_length, CHECK); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
975 |
} else if (attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
976 |
if (runtime_invisible_type_annotations_exists) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
977 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
978 |
"Multiple RuntimeInvisibleTypeAnnotations attributes for field in class file %s", CHECK); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
979 |
} else { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
980 |
runtime_invisible_type_annotations_exists = true; |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
981 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
982 |
if (PreserveAllAnnotations) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
983 |
runtime_invisible_type_annotations_length = attribute_length; |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
984 |
runtime_invisible_type_annotations = cfs->get_u1_buffer(); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
985 |
assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations"); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
986 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
987 |
cfs->skip_u1(attribute_length, CHECK); |
1 | 988 |
} else { |
989 |
cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes |
|
990 |
} |
|
991 |
} else { |
|
992 |
cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes |
|
993 |
} |
|
994 |
} |
|
995 |
||
996 |
*constantvalue_index_addr = constantvalue_index; |
|
997 |
*is_synthetic_addr = is_synthetic; |
|
998 |
*generic_signature_index_addr = generic_signature_index; |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
999 |
AnnotationArray* a = assemble_annotations(runtime_visible_annotations, |
1 | 1000 |
runtime_visible_annotations_length, |
1001 |
runtime_invisible_annotations, |
|
1002 |
runtime_invisible_annotations_length, |
|
1003 |
CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1004 |
parsed_annotations->set_field_annotations(a); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1005 |
a = assemble_annotations(runtime_visible_type_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1006 |
runtime_visible_type_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1007 |
runtime_invisible_type_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1008 |
runtime_invisible_type_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1009 |
CHECK); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1010 |
parsed_annotations->set_field_type_annotations(a); |
1 | 1011 |
return; |
1012 |
} |
|
1013 |
||
1014 |
||
1015 |
// Field allocation types. Used for computing field offsets. |
|
1016 |
||
1017 |
enum FieldAllocationType { |
|
1018 |
STATIC_OOP, // Oops |
|
1019 |
STATIC_BYTE, // Boolean, Byte, char |
|
1020 |
STATIC_SHORT, // shorts |
|
1021 |
STATIC_WORD, // ints |
|
10546 | 1022 |
STATIC_DOUBLE, // aligned long or double |
1 | 1023 |
NONSTATIC_OOP, |
1024 |
NONSTATIC_BYTE, |
|
1025 |
NONSTATIC_SHORT, |
|
1026 |
NONSTATIC_WORD, |
|
1027 |
NONSTATIC_DOUBLE, |
|
10546 | 1028 |
MAX_FIELD_ALLOCATION_TYPE, |
1029 |
BAD_ALLOCATION_TYPE = -1 |
|
1 | 1030 |
}; |
1031 |
||
10546 | 1032 |
static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = { |
1033 |
BAD_ALLOCATION_TYPE, // 0 |
|
1034 |
BAD_ALLOCATION_TYPE, // 1 |
|
1035 |
BAD_ALLOCATION_TYPE, // 2 |
|
1036 |
BAD_ALLOCATION_TYPE, // 3 |
|
13969
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1037 |
NONSTATIC_BYTE , // T_BOOLEAN = 4, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1038 |
NONSTATIC_SHORT, // T_CHAR = 5, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1039 |
NONSTATIC_WORD, // T_FLOAT = 6, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1040 |
NONSTATIC_DOUBLE, // T_DOUBLE = 7, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1041 |
NONSTATIC_BYTE, // T_BYTE = 8, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1042 |
NONSTATIC_SHORT, // T_SHORT = 9, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1043 |
NONSTATIC_WORD, // T_INT = 10, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1044 |
NONSTATIC_DOUBLE, // T_LONG = 11, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1045 |
NONSTATIC_OOP, // T_OBJECT = 12, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1046 |
NONSTATIC_OOP, // T_ARRAY = 13, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1047 |
BAD_ALLOCATION_TYPE, // T_VOID = 14, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1048 |
BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1049 |
BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1050 |
BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1051 |
BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1052 |
BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
10546 | 1053 |
BAD_ALLOCATION_TYPE, // 0 |
1054 |
BAD_ALLOCATION_TYPE, // 1 |
|
1055 |
BAD_ALLOCATION_TYPE, // 2 |
|
1056 |
BAD_ALLOCATION_TYPE, // 3 |
|
13969
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1057 |
STATIC_BYTE , // T_BOOLEAN = 4, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1058 |
STATIC_SHORT, // T_CHAR = 5, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1059 |
STATIC_WORD, // T_FLOAT = 6, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1060 |
STATIC_DOUBLE, // T_DOUBLE = 7, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1061 |
STATIC_BYTE, // T_BYTE = 8, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1062 |
STATIC_SHORT, // T_SHORT = 9, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1063 |
STATIC_WORD, // T_INT = 10, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1064 |
STATIC_DOUBLE, // T_LONG = 11, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1065 |
STATIC_OOP, // T_OBJECT = 12, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1066 |
STATIC_OOP, // T_ARRAY = 13, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1067 |
BAD_ALLOCATION_TYPE, // T_VOID = 14, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1068 |
BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1069 |
BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1070 |
BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1071 |
BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1072 |
BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
1 | 1073 |
}; |
1074 |
||
10546 | 1075 |
static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) { |
1076 |
assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values"); |
|
1077 |
FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)]; |
|
1078 |
assert(result != BAD_ALLOCATION_TYPE, "bad type"); |
|
1079 |
return result; |
|
1080 |
} |
|
1081 |
||
1082 |
class FieldAllocationCount: public ResourceObj { |
|
1083 |
public: |
|
11412
62fe312f32c5
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
10546
diff
changeset
|
1084 |
u2 count[MAX_FIELD_ALLOCATION_TYPE]; |
10546 | 1085 |
|
1086 |
FieldAllocationCount() { |
|
1087 |
for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) { |
|
1088 |
count[i] = 0; |
|
1089 |
} |
|
1090 |
} |
|
1091 |
||
1092 |
FieldAllocationType update(bool is_static, BasicType type) { |
|
1093 |
FieldAllocationType atype = basic_type_to_atype(is_static, type); |
|
11412
62fe312f32c5
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
10546
diff
changeset
|
1094 |
// Make sure there is no overflow with injected fields. |
62fe312f32c5
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
10546
diff
changeset
|
1095 |
assert(count[atype] < 0xFFFF, "More than 65535 fields"); |
10546 | 1096 |
count[atype]++; |
1097 |
return atype; |
|
1098 |
} |
|
1099 |
}; |
|
1100 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1101 |
Array<u2>* ClassFileParser::parse_fields(Symbol* class_name, |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
1102 |
bool is_interface, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
1103 |
FieldAllocationCount *fac, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
1104 |
u2* java_fields_count_ptr, TRAPS) { |
1 | 1105 |
ClassFileStream* cfs = stream(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1106 |
cfs->guarantee_more(2, CHECK_NULL); // length |
1 | 1107 |
u2 length = cfs->get_u2_fast(); |
10546 | 1108 |
*java_fields_count_ptr = length; |
1109 |
||
1110 |
int num_injected = 0; |
|
1111 |
InjectedField* injected = JavaClasses::get_injected(class_name, &num_injected); |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1112 |
int total_fields = length + num_injected; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1113 |
|
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1114 |
// The field array starts with tuples of shorts |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1115 |
// [access, name index, sig index, initial value index, byte offset]. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1116 |
// A generic signature slot only exists for field with generic |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1117 |
// signature attribute. And the access flag is set with |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1118 |
// JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE for that field. The generic |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1119 |
// signature slots are at the end of the field array and after all |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1120 |
// other fields data. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1121 |
// |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1122 |
// f1: [access, name index, sig index, initial value index, low_offset, high_offset] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1123 |
// f2: [access, name index, sig index, initial value index, low_offset, high_offset] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1124 |
// ... |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1125 |
// fn: [access, name index, sig index, initial value index, low_offset, high_offset] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1126 |
// [generic signature index] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1127 |
// [generic signature index] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1128 |
// ... |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1129 |
// |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1130 |
// Allocate a temporary resource array for field data. For each field, |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1131 |
// a slot is reserved in the temporary array for the generic signature |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1132 |
// index. After parsing all fields, the data are copied to a permanent |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1133 |
// array and any unused slots will be discarded. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1134 |
ResourceMark rm(THREAD); |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1135 |
u2* fa = NEW_RESOURCE_ARRAY_IN_THREAD( |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1136 |
THREAD, u2, total_fields * (FieldInfo::field_slots + 1)); |
1 | 1137 |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1138 |
// The generic signature slots start after all other fields' data. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1139 |
int generic_signature_slot = total_fields * FieldInfo::field_slots; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1140 |
int num_generic_signature = 0; |
1 | 1141 |
for (int n = 0; n < length; n++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1142 |
cfs->guarantee_more(8, CHECK_NULL); // access_flags, name_index, descriptor_index, attributes_count |
1 | 1143 |
|
1144 |
AccessFlags access_flags; |
|
1145 |
jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1146 |
verify_legal_field_modifiers(flags, is_interface, CHECK_NULL); |
1 | 1147 |
access_flags.set_flags(flags); |
1148 |
||
1149 |
u2 name_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1150 |
int cp_size = _cp->length(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1151 |
check_property(valid_symbol_at(name_index), |
1 | 1152 |
"Invalid constant pool index %u for field name in class file %s", |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1153 |
name_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1154 |
CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1155 |
Symbol* name = _cp->symbol_at(name_index); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1156 |
verify_legal_field_name(name, CHECK_NULL); |
1 | 1157 |
|
1158 |
u2 signature_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1159 |
check_property(valid_symbol_at(signature_index), |
1 | 1160 |
"Invalid constant pool index %u for field signature in class file %s", |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1161 |
signature_index, CHECK_NULL); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1162 |
Symbol* sig = _cp->symbol_at(signature_index); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1163 |
verify_legal_field_signature(name, sig, CHECK_NULL); |
1 | 1164 |
|
1165 |
u2 constantvalue_index = 0; |
|
1166 |
bool is_synthetic = false; |
|
1167 |
u2 generic_signature_index = 0; |
|
1168 |
bool is_static = access_flags.is_static(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1169 |
FieldAnnotationCollector parsed_annotations(_loader_data); |
1 | 1170 |
|
1171 |
u2 attributes_count = cfs->get_u2_fast(); |
|
1172 |
if (attributes_count > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1173 |
parse_field_attributes(attributes_count, is_static, signature_index, |
1 | 1174 |
&constantvalue_index, &is_synthetic, |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1175 |
&generic_signature_index, &parsed_annotations, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1176 |
CHECK_NULL); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1177 |
if (parsed_annotations.field_annotations() != NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1178 |
if (_fields_annotations == NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1179 |
_fields_annotations = MetadataFactory::new_array<AnnotationArray*>( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1180 |
_loader_data, length, NULL, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1181 |
CHECK_NULL); |
1 | 1182 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1183 |
_fields_annotations->at_put(n, parsed_annotations.field_annotations()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1184 |
parsed_annotations.set_field_annotations(NULL); |
1 | 1185 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1186 |
if (parsed_annotations.field_type_annotations() != NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1187 |
if (_fields_type_annotations == NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1188 |
_fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1189 |
_loader_data, length, NULL, |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1190 |
CHECK_NULL); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1191 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1192 |
_fields_type_annotations->at_put(n, parsed_annotations.field_type_annotations()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1193 |
parsed_annotations.set_field_type_annotations(NULL); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1194 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1195 |
|
1 | 1196 |
if (is_synthetic) { |
1197 |
access_flags.set_is_synthetic(); |
|
1198 |
} |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1199 |
if (generic_signature_index != 0) { |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1200 |
access_flags.set_field_has_generic_signature(); |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1201 |
fa[generic_signature_slot] = generic_signature_index; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1202 |
generic_signature_slot ++; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1203 |
num_generic_signature ++; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1204 |
} |
1 | 1205 |
} |
1206 |
||
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1207 |
FieldInfo* field = FieldInfo::from_field_array(fa, n); |
10546 | 1208 |
field->initialize(access_flags.as_short(), |
1209 |
name_index, |
|
1210 |
signature_index, |
|
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1211 |
constantvalue_index); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1212 |
BasicType type = _cp->basic_type_for_signature_at(signature_index); |
1 | 1213 |
|
1214 |
// Remember how many oops we encountered and compute allocation type |
|
10546 | 1215 |
FieldAllocationType atype = fac->update(is_static, type); |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1216 |
field->set_allocation_type(atype); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1217 |
|
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1218 |
// After field is initialized with type, we can augment it with aux info |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1219 |
if (parsed_annotations.has_any_annotations()) |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1220 |
parsed_annotations.apply_to(field); |
10546 | 1221 |
} |
1222 |
||
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1223 |
int index = length; |
10546 | 1224 |
if (num_injected != 0) { |
1225 |
for (int n = 0; n < num_injected; n++) { |
|
1226 |
// Check for duplicates |
|
1227 |
if (injected[n].may_be_java) { |
|
1228 |
Symbol* name = injected[n].name(); |
|
1229 |
Symbol* signature = injected[n].signature(); |
|
1230 |
bool duplicate = false; |
|
1231 |
for (int i = 0; i < length; i++) { |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1232 |
FieldInfo* f = FieldInfo::from_field_array(fa, i); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1233 |
if (name == _cp->symbol_at(f->name_index()) && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1234 |
signature == _cp->symbol_at(f->signature_index())) { |
10546 | 1235 |
// Symbol is desclared in Java so skip this one |
1236 |
duplicate = true; |
|
1237 |
break; |
|
1238 |
} |
|
1239 |
} |
|
1240 |
if (duplicate) { |
|
1241 |
// These will be removed from the field array at the end |
|
1242 |
continue; |
|
1243 |
} |
|
1244 |
} |
|
1245 |
||
1246 |
// Injected field |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1247 |
FieldInfo* field = FieldInfo::from_field_array(fa, index); |
10546 | 1248 |
field->initialize(JVM_ACC_FIELD_INTERNAL, |
1249 |
injected[n].name_index, |
|
1250 |
injected[n].signature_index, |
|
1251 |
0); |
|
1252 |
||
1253 |
BasicType type = FieldType::basic_type(injected[n].signature()); |
|
1254 |
||
1255 |
// Remember how many oops we encountered and compute allocation type |
|
1256 |
FieldAllocationType atype = fac->update(false, type); |
|
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1257 |
field->set_allocation_type(atype); |
10546 | 1258 |
index++; |
1259 |
} |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1260 |
} |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1261 |
|
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1262 |
// Now copy the fields' data from the temporary resource array. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1263 |
// Sometimes injected fields already exist in the Java source so |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1264 |
// the fields array could be too long. In that case the |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1265 |
// fields array is trimed. Also unused slots that were reserved |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1266 |
// for generic signature indexes are discarded. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1267 |
Array<u2>* fields = MetadataFactory::new_array<u2>( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1268 |
_loader_data, index * FieldInfo::field_slots + num_generic_signature, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1269 |
CHECK_NULL); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1270 |
_fields = fields; // save in case of error |
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1271 |
{ |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1272 |
int i = 0; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1273 |
for (; i < index * FieldInfo::field_slots; i++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1274 |
fields->at_put(i, fa[i]); |
10546 | 1275 |
} |
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1276 |
for (int j = total_fields * FieldInfo::field_slots; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1277 |
j < generic_signature_slot; j++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1278 |
fields->at_put(i++, fa[j]); |
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1279 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1280 |
assert(i == fields->length(), ""); |
1 | 1281 |
} |
1282 |
||
1283 |
if (_need_verify && length > 1) { |
|
1284 |
// Check duplicated fields |
|
1285 |
ResourceMark rm(THREAD); |
|
1286 |
NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
1287 |
THREAD, NameSigHash*, HASH_ROW_SIZE); |
|
1288 |
initialize_hashtable(names_and_sigs); |
|
1289 |
bool dup = false; |
|
1290 |
{ |
|
1291 |
debug_only(No_Safepoint_Verifier nsv;) |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1292 |
for (AllFieldStream fs(fields, _cp); !fs.done(); fs.next()) { |
10546 | 1293 |
Symbol* name = fs.name(); |
1294 |
Symbol* sig = fs.signature(); |
|
1 | 1295 |
// If no duplicates, add name/signature in hashtable names_and_sigs. |
1296 |
if (!put_after_lookup(name, sig, names_and_sigs)) { |
|
1297 |
dup = true; |
|
1298 |
break; |
|
1299 |
} |
|
1300 |
} |
|
1301 |
} |
|
1302 |
if (dup) { |
|
1303 |
classfile_parse_error("Duplicate field name&signature in class file %s", |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1304 |
CHECK_NULL); |
1 | 1305 |
} |
1306 |
} |
|
1307 |
||
1308 |
return fields; |
|
1309 |
} |
|
1310 |
||
1311 |
||
1312 |
static void copy_u2_with_conversion(u2* dest, u2* src, int length) { |
|
1313 |
while (length-- > 0) { |
|
1314 |
*dest++ = Bytes::get_Java_u2((u1*) (src++)); |
|
1315 |
} |
|
1316 |
} |
|
1317 |
||
1318 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1319 |
u2* ClassFileParser::parse_exception_table(u4 code_length, |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1320 |
u4 exception_table_length, |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1321 |
TRAPS) { |
1 | 1322 |
ClassFileStream* cfs = stream(); |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1323 |
|
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1324 |
u2* exception_table_start = cfs->get_u2_buffer(); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1325 |
assert(exception_table_start != NULL, "null exception table"); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1326 |
cfs->guarantee_more(8 * exception_table_length, CHECK_NULL); // start_pc, end_pc, handler_pc, catch_type_index |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1327 |
// Will check legal target after parsing code array in verifier. |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1328 |
if (_need_verify) { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1329 |
for (unsigned int i = 0; i < exception_table_length; i++) { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1330 |
u2 start_pc = cfs->get_u2_fast(); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1331 |
u2 end_pc = cfs->get_u2_fast(); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1332 |
u2 handler_pc = cfs->get_u2_fast(); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1333 |
u2 catch_type_index = cfs->get_u2_fast(); |
1 | 1334 |
guarantee_property((start_pc < end_pc) && (end_pc <= code_length), |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1335 |
"Illegal exception table range in class file %s", |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1336 |
CHECK_NULL); |
1 | 1337 |
guarantee_property(handler_pc < code_length, |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1338 |
"Illegal exception table handler in class file %s", |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1339 |
CHECK_NULL); |
1 | 1340 |
if (catch_type_index != 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1341 |
guarantee_property(valid_klass_reference_at(catch_type_index), |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1342 |
"Catch type in exception table has bad constant type in class file %s", CHECK_NULL); |
1 | 1343 |
} |
1344 |
} |
|
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1345 |
} else { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1346 |
cfs->skip_u2_fast(exception_table_length * 4); |
1 | 1347 |
} |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1348 |
return exception_table_start; |
1 | 1349 |
} |
1350 |
||
1351 |
void ClassFileParser::parse_linenumber_table( |
|
1352 |
u4 code_attribute_length, u4 code_length, |
|
1353 |
CompressedLineNumberWriteStream** write_stream, TRAPS) { |
|
1354 |
ClassFileStream* cfs = stream(); |
|
1355 |
unsigned int num_entries = cfs->get_u2(CHECK); |
|
1356 |
||
1357 |
// Each entry is a u2 start_pc, and a u2 line_number |
|
1358 |
unsigned int length_in_bytes = num_entries * (sizeof(u2) + sizeof(u2)); |
|
1359 |
||
1360 |
// Verify line number attribute and table length |
|
1361 |
check_property( |
|
1362 |
code_attribute_length == sizeof(u2) + length_in_bytes, |
|
1363 |
"LineNumberTable attribute has wrong length in class file %s", CHECK); |
|
1364 |
||
1365 |
cfs->guarantee_more(length_in_bytes, CHECK); |
|
1366 |
||
1367 |
if ((*write_stream) == NULL) { |
|
1368 |
if (length_in_bytes > fixed_buffer_size) { |
|
1369 |
(*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes); |
|
1370 |
} else { |
|
1371 |
(*write_stream) = new CompressedLineNumberWriteStream( |
|
1372 |
linenumbertable_buffer, fixed_buffer_size); |
|
1373 |
} |
|
1374 |
} |
|
1375 |
||
1376 |
while (num_entries-- > 0) { |
|
1377 |
u2 bci = cfs->get_u2_fast(); // start_pc |
|
1378 |
u2 line = cfs->get_u2_fast(); // line_number |
|
1379 |
guarantee_property(bci < code_length, |
|
1380 |
"Invalid pc in LineNumberTable in class file %s", CHECK); |
|
1381 |
(*write_stream)->write_pair(bci, line); |
|
1382 |
} |
|
1383 |
} |
|
1384 |
||
1385 |
||
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1386 |
class LVT_Hash : public AllStatic { |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1387 |
public: |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1388 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1389 |
static bool equals(LocalVariableTableElement const& e0, LocalVariableTableElement const& e1) { |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1390 |
/* |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1391 |
* 3-tuple start_bci/length/slot has to be unique key, |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1392 |
* so the following comparison seems to be redundant: |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1393 |
* && elem->name_cp_index == entry->_elem->name_cp_index |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1394 |
*/ |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1395 |
return (e0.start_bci == e1.start_bci && |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1396 |
e0.length == e1.length && |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1397 |
e0.name_cp_index == e1.name_cp_index && |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1398 |
e0.slot == e1.slot); |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1399 |
} |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1400 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1401 |
static unsigned int hash(LocalVariableTableElement const& e0) { |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1402 |
unsigned int raw_hash = e0.start_bci; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1403 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1404 |
raw_hash = e0.length + raw_hash * 37; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1405 |
raw_hash = e0.name_cp_index + raw_hash * 37; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1406 |
raw_hash = e0.slot + raw_hash * 37; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1407 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1408 |
return raw_hash; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1409 |
} |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1410 |
}; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1411 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1412 |
|
1 | 1413 |
// Class file LocalVariableTable elements. |
1414 |
class Classfile_LVT_Element VALUE_OBJ_CLASS_SPEC { |
|
1415 |
public: |
|
1416 |
u2 start_bci; |
|
1417 |
u2 length; |
|
1418 |
u2 name_cp_index; |
|
1419 |
u2 descriptor_cp_index; |
|
1420 |
u2 slot; |
|
1421 |
}; |
|
1422 |
||
1423 |
void copy_lvt_element(Classfile_LVT_Element *src, LocalVariableTableElement *lvt) { |
|
1424 |
lvt->start_bci = Bytes::get_Java_u2((u1*) &src->start_bci); |
|
1425 |
lvt->length = Bytes::get_Java_u2((u1*) &src->length); |
|
1426 |
lvt->name_cp_index = Bytes::get_Java_u2((u1*) &src->name_cp_index); |
|
1427 |
lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index); |
|
1428 |
lvt->signature_cp_index = 0; |
|
1429 |
lvt->slot = Bytes::get_Java_u2((u1*) &src->slot); |
|
1430 |
} |
|
1431 |
||
1432 |
// Function is used to parse both attributes: |
|
1433 |
// LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT) |
|
1434 |
u2* ClassFileParser::parse_localvariable_table(u4 code_length, |
|
1435 |
u2 max_locals, |
|
1436 |
u4 code_attribute_length, |
|
1437 |
u2* localvariable_table_length, |
|
1438 |
bool isLVTT, |
|
1439 |
TRAPS) { |
|
1440 |
ClassFileStream* cfs = stream(); |
|
1441 |
const char * tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable"; |
|
1442 |
*localvariable_table_length = cfs->get_u2(CHECK_NULL); |
|
1443 |
unsigned int size = (*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2); |
|
1444 |
// Verify local variable table attribute has right length |
|
1445 |
if (_need_verify) { |
|
1446 |
guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)), |
|
1447 |
"%s has wrong length in class file %s", tbl_name, CHECK_NULL); |
|
1448 |
} |
|
1449 |
u2* localvariable_table_start = cfs->get_u2_buffer(); |
|
1450 |
assert(localvariable_table_start != NULL, "null local variable table"); |
|
1451 |
if (!_need_verify) { |
|
1452 |
cfs->skip_u2_fast(size); |
|
1453 |
} else { |
|
1454 |
cfs->guarantee_more(size * 2, CHECK_NULL); |
|
1455 |
for(int i = 0; i < (*localvariable_table_length); i++) { |
|
1456 |
u2 start_pc = cfs->get_u2_fast(); |
|
1457 |
u2 length = cfs->get_u2_fast(); |
|
1458 |
u2 name_index = cfs->get_u2_fast(); |
|
1459 |
u2 descriptor_index = cfs->get_u2_fast(); |
|
1460 |
u2 index = cfs->get_u2_fast(); |
|
1461 |
// Assign to a u4 to avoid overflow |
|
1462 |
u4 end_pc = (u4)start_pc + (u4)length; |
|
1463 |
||
1464 |
if (start_pc >= code_length) { |
|
1465 |
classfile_parse_error( |
|
1466 |
"Invalid start_pc %u in %s in class file %s", |
|
1467 |
start_pc, tbl_name, CHECK_NULL); |
|
1468 |
} |
|
1469 |
if (end_pc > code_length) { |
|
1470 |
classfile_parse_error( |
|
1471 |
"Invalid length %u in %s in class file %s", |
|
1472 |
length, tbl_name, CHECK_NULL); |
|
1473 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1474 |
int cp_size = _cp->length(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1475 |
guarantee_property(valid_symbol_at(name_index), |
1 | 1476 |
"Name index %u in %s has bad constant type in class file %s", |
1477 |
name_index, tbl_name, CHECK_NULL); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1478 |
guarantee_property(valid_symbol_at(descriptor_index), |
1 | 1479 |
"Signature index %u in %s has bad constant type in class file %s", |
1480 |
descriptor_index, tbl_name, CHECK_NULL); |
|
1481 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1482 |
Symbol* name = _cp->symbol_at(name_index); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1483 |
Symbol* sig = _cp->symbol_at(descriptor_index); |
1 | 1484 |
verify_legal_field_name(name, CHECK_NULL); |
1485 |
u2 extra_slot = 0; |
|
1486 |
if (!isLVTT) { |
|
1487 |
verify_legal_field_signature(name, sig, CHECK_NULL); |
|
1488 |
||
1489 |
// 4894874: check special cases for double and long local variables |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
1490 |
if (sig == vmSymbols::type_signature(T_DOUBLE) || |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
1491 |
sig == vmSymbols::type_signature(T_LONG)) { |
1 | 1492 |
extra_slot = 1; |
1493 |
} |
|
1494 |
} |
|
1495 |
guarantee_property((index + extra_slot) < max_locals, |
|
1496 |
"Invalid index %u in %s in class file %s", |
|
1497 |
index, tbl_name, CHECK_NULL); |
|
1498 |
} |
|
1499 |
} |
|
1500 |
return localvariable_table_start; |
|
1501 |
} |
|
1502 |
||
1503 |
||
1504 |
void ClassFileParser::parse_type_array(u2 array_length, u4 code_length, u4* u1_index, u4* u2_index, |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1505 |
u1* u1_array, u2* u2_array, TRAPS) { |
1 | 1506 |
ClassFileStream* cfs = stream(); |
1507 |
u2 index = 0; // index in the array with long/double occupying two slots |
|
1508 |
u4 i1 = *u1_index; |
|
1509 |
u4 i2 = *u2_index + 1; |
|
1510 |
for(int i = 0; i < array_length; i++) { |
|
1511 |
u1 tag = u1_array[i1++] = cfs->get_u1(CHECK); |
|
1512 |
index++; |
|
1513 |
if (tag == ITEM_Long || tag == ITEM_Double) { |
|
1514 |
index++; |
|
1515 |
} else if (tag == ITEM_Object) { |
|
1516 |
u2 class_index = u2_array[i2++] = cfs->get_u2(CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1517 |
guarantee_property(valid_klass_reference_at(class_index), |
1 | 1518 |
"Bad class index %u in StackMap in class file %s", |
1519 |
class_index, CHECK); |
|
1520 |
} else if (tag == ITEM_Uninitialized) { |
|
1521 |
u2 offset = u2_array[i2++] = cfs->get_u2(CHECK); |
|
1522 |
guarantee_property( |
|
1523 |
offset < code_length, |
|
1524 |
"Bad uninitialized type offset %u in StackMap in class file %s", |
|
1525 |
offset, CHECK); |
|
1526 |
} else { |
|
1527 |
guarantee_property( |
|
1528 |
tag <= (u1)ITEM_Uninitialized, |
|
1529 |
"Unknown variable type %u in StackMap in class file %s", |
|
1530 |
tag, CHECK); |
|
1531 |
} |
|
1532 |
} |
|
1533 |
u2_array[*u2_index] = index; |
|
1534 |
*u1_index = i1; |
|
1535 |
*u2_index = i2; |
|
1536 |
} |
|
1537 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1538 |
u1* ClassFileParser::parse_stackmap_table( |
1 | 1539 |
u4 code_attribute_length, TRAPS) { |
1540 |
if (code_attribute_length == 0) |
|
1541 |
return NULL; |
|
1542 |
||
1543 |
ClassFileStream* cfs = stream(); |
|
1544 |
u1* stackmap_table_start = cfs->get_u1_buffer(); |
|
1545 |
assert(stackmap_table_start != NULL, "null stackmap table"); |
|
1546 |
||
1547 |
// check code_attribute_length first |
|
1548 |
stream()->skip_u1(code_attribute_length, CHECK_NULL); |
|
1549 |
||
1550 |
if (!_need_verify && !DumpSharedSpaces) { |
|
1551 |
return NULL; |
|
1552 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1553 |
return stackmap_table_start; |
1 | 1554 |
} |
1555 |
||
1556 |
u2* ClassFileParser::parse_checked_exceptions(u2* checked_exceptions_length, |
|
1557 |
u4 method_attribute_length, |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1558 |
TRAPS) { |
1 | 1559 |
ClassFileStream* cfs = stream(); |
1560 |
cfs->guarantee_more(2, CHECK_NULL); // checked_exceptions_length |
|
1561 |
*checked_exceptions_length = cfs->get_u2_fast(); |
|
1562 |
unsigned int size = (*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2); |
|
1563 |
u2* checked_exceptions_start = cfs->get_u2_buffer(); |
|
1564 |
assert(checked_exceptions_start != NULL, "null checked exceptions"); |
|
1565 |
if (!_need_verify) { |
|
1566 |
cfs->skip_u2_fast(size); |
|
1567 |
} else { |
|
1568 |
// Verify each value in the checked exception table |
|
1569 |
u2 checked_exception; |
|
1570 |
u2 len = *checked_exceptions_length; |
|
1571 |
cfs->guarantee_more(2 * len, CHECK_NULL); |
|
1572 |
for (int i = 0; i < len; i++) { |
|
1573 |
checked_exception = cfs->get_u2_fast(); |
|
1574 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1575 |
valid_klass_reference_at(checked_exception), |
1 | 1576 |
"Exception name has bad type at constant pool %u in class file %s", |
1577 |
checked_exception, CHECK_NULL); |
|
1578 |
} |
|
1579 |
} |
|
1580 |
// check exceptions attribute length |
|
1581 |
if (_need_verify) { |
|
1582 |
guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) + |
|
1583 |
sizeof(u2) * size), |
|
1584 |
"Exceptions attribute has wrong length in class file %s", CHECK_NULL); |
|
1585 |
} |
|
1586 |
return checked_exceptions_start; |
|
1587 |
} |
|
1588 |
||
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1589 |
void ClassFileParser::throwIllegalSignature( |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
1590 |
const char* type, Symbol* name, Symbol* sig, TRAPS) { |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1591 |
ResourceMark rm(THREAD); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1592 |
Exceptions::fthrow(THREAD_AND_LOCATION, |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1593 |
vmSymbols::java_lang_ClassFormatError(), |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1594 |
"%s \"%s\" in class %s has illegal signature \"%s\"", type, |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1595 |
name->as_C_string(), _class_name->as_C_string(), sig->as_C_string()); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
1596 |
} |
1 | 1597 |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1598 |
// Skip an annotation. Return >=limit if there is any problem. |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1599 |
int ClassFileParser::skip_annotation(u1* buffer, int limit, int index) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1600 |
// annotation := atype:u2 do(nmem:u2) {member:u2 value} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1601 |
// value := switch (tag:u1) { ... } |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1602 |
index += 2; // skip atype |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1603 |
if ((index += 2) >= limit) return limit; // read nmem |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1604 |
int nmem = Bytes::get_Java_u2(buffer+index-2); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1605 |
while (--nmem >= 0 && index < limit) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1606 |
index += 2; // skip member |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1607 |
index = skip_annotation_value(buffer, limit, index); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1608 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1609 |
return index; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1610 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1611 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1612 |
// Skip an annotation value. Return >=limit if there is any problem. |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1613 |
int ClassFileParser::skip_annotation_value(u1* buffer, int limit, int index) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1614 |
// value := switch (tag:u1) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1615 |
// case B, C, I, S, Z, D, F, J, c: con:u2; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1616 |
// case e: e_class:u2 e_name:u2; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1617 |
// case s: s_con:u2; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1618 |
// case [: do(nval:u2) {value}; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1619 |
// case @: annotation; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1620 |
// case s: s_con:u2; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1621 |
// } |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1622 |
if ((index += 1) >= limit) return limit; // read tag |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1623 |
u1 tag = buffer[index-1]; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1624 |
switch (tag) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1625 |
case 'B': case 'C': case 'I': case 'S': case 'Z': |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1626 |
case 'D': case 'F': case 'J': case 'c': case 's': |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1627 |
index += 2; // skip con or s_con |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1628 |
break; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1629 |
case 'e': |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1630 |
index += 4; // skip e_class, e_name |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1631 |
break; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1632 |
case '[': |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1633 |
{ |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1634 |
if ((index += 2) >= limit) return limit; // read nval |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1635 |
int nval = Bytes::get_Java_u2(buffer+index-2); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1636 |
while (--nval >= 0 && index < limit) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1637 |
index = skip_annotation_value(buffer, limit, index); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1638 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1639 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1640 |
break; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1641 |
case '@': |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1642 |
index = skip_annotation(buffer, limit, index); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1643 |
break; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1644 |
default: |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1645 |
return limit; // bad tag byte |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1646 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1647 |
return index; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1648 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1649 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1650 |
// Sift through annotations, looking for those significant to the VM: |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1651 |
void ClassFileParser::parse_annotations(u1* buffer, int limit, |
31366
67eccccbb2ca
8042041: https://bugs.openjdk.java.net/browse/JDK-8042041
hseigel
parents:
30764
diff
changeset
|
1652 |
ClassFileParser::AnnotationCollector* coll) { |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1653 |
// annotations := do(nann:u2) {annotation} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1654 |
int index = 0; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1655 |
if ((index += 2) >= limit) return; // read nann |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1656 |
int nann = Bytes::get_Java_u2(buffer+index-2); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1657 |
enum { // initial annotation layout |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1658 |
atype_off = 0, // utf8 such as 'Ljava/lang/annotation/Retention;' |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1659 |
count_off = 2, // u2 such as 1 (one value) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1660 |
member_off = 4, // utf8 such as 'value' |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1661 |
tag_off = 6, // u1 such as 'c' (type) or 'e' (enum) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1662 |
e_tag_val = 'e', |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1663 |
e_type_off = 7, // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;' |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1664 |
e_con_off = 9, // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME' |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1665 |
e_size = 11, // end of 'e' annotation |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1666 |
c_tag_val = 'c', // payload is type |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1667 |
c_con_off = 7, // utf8 payload, such as 'I' |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1668 |
c_size = 9, // end of 'c' annotation |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1669 |
s_tag_val = 's', // payload is String |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1670 |
s_con_off = 7, // utf8 payload, such as 'Ljava/lang/String;' |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1671 |
s_size = 9, |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1672 |
min_size = 6 // smallest possible size (zero members) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1673 |
}; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1674 |
while ((--nann) >= 0 && (index-2 + min_size <= limit)) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1675 |
int index0 = index; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1676 |
index = skip_annotation(buffer, limit, index); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1677 |
u1* abase = buffer + index0; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1678 |
int atype = Bytes::get_Java_u2(abase + atype_off); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1679 |
int count = Bytes::get_Java_u2(abase + count_off); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1680 |
Symbol* aname = check_symbol_at(_cp, atype); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1681 |
if (aname == NULL) break; // invalid annotation name |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1682 |
Symbol* member = NULL; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1683 |
if (count >= 1) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1684 |
int member_index = Bytes::get_Java_u2(abase + member_off); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1685 |
member = check_symbol_at(_cp, member_index); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1686 |
if (member == NULL) break; // invalid member name |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1687 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1688 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1689 |
// Here is where parsing particular annotations will take place. |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1690 |
AnnotationCollector::ID id = coll->annotation_index(_loader_data, aname); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1691 |
if (id == AnnotationCollector::_unknown) continue; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1692 |
coll->set_annotation(id); |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1693 |
|
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1694 |
if (id == AnnotationCollector::_sun_misc_Contended) { |
17603
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1695 |
// @Contended can optionally specify the contention group. |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1696 |
// |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1697 |
// Contended group defines the equivalence class over the fields: |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1698 |
// the fields within the same contended group are not treated distinct. |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1699 |
// The only exception is default group, which does not incur the |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1700 |
// equivalence. Naturally, contention group for classes is meaningless. |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1701 |
// |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1702 |
// While the contention group is specified as String, annotation |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1703 |
// values are already interned, and we might as well use the constant |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1704 |
// pool index as the group tag. |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1705 |
// |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1706 |
u2 group_index = 0; // default contended group |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1707 |
if (count == 1 |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1708 |
&& s_size == (index - index0) // match size |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1709 |
&& s_tag_val == *(abase + tag_off) |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1710 |
&& member == vmSymbols::value_name()) { |
17603
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1711 |
group_index = Bytes::get_Java_u2(abase + s_con_off); |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1712 |
if (_cp->symbol_at(group_index)->utf8_length() == 0) { |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1713 |
group_index = 0; // default contended group |
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1714 |
} |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1715 |
} |
17603
30a72a5afcda
8014509: @Contended: explicit default value behaves differently from the implicit value
shade
parents:
17601
diff
changeset
|
1716 |
coll->set_contended_group(group_index); |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1717 |
} |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1718 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1719 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1720 |
|
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1721 |
ClassFileParser::AnnotationCollector::ID |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1722 |
ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_data, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1723 |
Symbol* name) { |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1724 |
vmSymbols::SID sid = vmSymbols::find_sid(name); |
15244
83447fffce1e
8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents:
15221
diff
changeset
|
1725 |
// Privileged code can use all annotations. Other code silently drops some. |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1726 |
const bool privileged = loader_data->is_the_null_class_loader_data() || |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1727 |
loader_data->is_ext_class_loader_data() || |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1728 |
loader_data->is_anonymous(); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1729 |
switch (sid) { |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1730 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_reflect_CallerSensitive_signature): |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1731 |
if (_location != _in_method) break; // only allow for methods |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1732 |
if (!privileged) break; // only allow in privileged code |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1733 |
return _method_CallerSensitive; |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1734 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature): |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1735 |
if (_location != _in_method) break; // only allow for methods |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1736 |
if (!privileged) break; // only allow in privileged code |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1737 |
return _method_ForceInline; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1738 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature): |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1739 |
if (_location != _in_method) break; // only allow for methods |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1740 |
if (!privileged) break; // only allow in privileged code |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1741 |
return _method_DontInline; |
31228
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
1742 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_InjectedProfile_signature): |
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
1743 |
if (_location != _in_method) break; // only allow for methods |
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
1744 |
if (!privileged) break; // only allow in privileged code |
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
1745 |
return _method_InjectedProfile; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1746 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1747 |
if (_location != _in_method) break; // only allow for methods |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1748 |
if (!privileged) break; // only allow in privileged code |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1749 |
return _method_LambdaForm_Compiled; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1750 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1751 |
if (_location != _in_method) break; // only allow for methods |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1752 |
if (!privileged) break; // only allow in privileged code |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1753 |
return _method_LambdaForm_Hidden; |
20299
c4d35cd80be0
8025233: Move sun.invoke.Stable into java.lang.invoke package
vlivanov
parents:
20022
diff
changeset
|
1754 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_Stable_signature): |
19770
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
1755 |
if (_location != _in_field) break; // only allow for fields |
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
1756 |
if (!privileged) break; // only allow in privileged code |
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
1757 |
return _field_Stable; |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1758 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature): |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1759 |
if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1760 |
if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1761 |
return _sun_misc_Contended; |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1762 |
default: break; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1763 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1764 |
return AnnotationCollector::_unknown; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1765 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1766 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1767 |
void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) { |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1768 |
if (is_contended()) |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1769 |
f->set_contended_group(contended_group()); |
19770
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
1770 |
if (is_stable()) |
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
1771 |
f->set_stable(true); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1772 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1773 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1774 |
ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1775 |
// If there's an error deallocate metadata for field annotations |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1776 |
MetadataFactory::free_array<u1>(_loader_data, _field_annotations); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1777 |
MetadataFactory::free_array<u1>(_loader_data, _field_type_annotations); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1778 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1779 |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1780 |
void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) { |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1781 |
if (has_annotation(_method_CallerSensitive)) |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
1782 |
m->set_caller_sensitive(true); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1783 |
if (has_annotation(_method_ForceInline)) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1784 |
m->set_force_inline(true); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1785 |
if (has_annotation(_method_DontInline)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1786 |
m->set_dont_inline(true); |
31228
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
1787 |
if (has_annotation(_method_InjectedProfile)) |
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
1788 |
m->set_has_injected_profile(true); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1789 |
if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1790 |
m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1791 |
if (has_annotation(_method_LambdaForm_Hidden)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
1792 |
m->set_hidden(true); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1793 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1794 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1795 |
void ClassFileParser::ClassAnnotationCollector::apply_to(instanceKlassHandle k) { |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1796 |
k->set_is_contended(is_contended()); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1797 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1798 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1799 |
|
1 | 1800 |
#define MAX_ARGS_SIZE 255 |
1801 |
#define MAX_CODE_SIZE 65535 |
|
1802 |
#define INITIAL_MAX_LVT_NUMBER 256 |
|
1803 |
||
15601 | 1804 |
/* Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
1805 |
* |
|
1806 |
* Rules for LVT's and LVTT's are: |
|
1807 |
* - There can be any number of LVT's and LVTT's. |
|
1808 |
* - If there are n LVT's, it is the same as if there was just |
|
1809 |
* one LVT containing all the entries from the n LVT's. |
|
1810 |
* - There may be no more than one LVT entry per local variable. |
|
1811 |
* Two LVT entries are 'equal' if these fields are the same: |
|
1812 |
* start_pc, length, name, slot |
|
1813 |
* - There may be no more than one LVTT entry per each LVT entry. |
|
1814 |
* Each LVTT entry has to match some LVT entry. |
|
1815 |
* - HotSpot internal LVT keeps natural ordering of class file LVT entries. |
|
1816 |
*/ |
|
1817 |
void ClassFileParser::copy_localvariable_table(ConstMethod* cm, |
|
1818 |
int lvt_cnt, |
|
1819 |
u2* localvariable_table_length, |
|
1820 |
u2** localvariable_table_start, |
|
1821 |
int lvtt_cnt, |
|
1822 |
u2* localvariable_type_table_length, |
|
1823 |
u2** localvariable_type_table_start, |
|
1824 |
TRAPS) { |
|
1825 |
||
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1826 |
ResourceMark rm(THREAD); |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1827 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1828 |
typedef ResourceHashtable<LocalVariableTableElement, LocalVariableTableElement*, |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1829 |
&LVT_Hash::hash, &LVT_Hash::equals> LVT_HashTable; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1830 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1831 |
LVT_HashTable* table = new LVT_HashTable(); |
15601 | 1832 |
|
1833 |
// To fill LocalVariableTable in |
|
1834 |
Classfile_LVT_Element* cf_lvt; |
|
1835 |
LocalVariableTableElement* lvt = cm->localvariable_table_start(); |
|
1836 |
||
1837 |
for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) { |
|
1838 |
cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no]; |
|
1839 |
for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) { |
|
1840 |
copy_lvt_element(&cf_lvt[idx], lvt); |
|
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1841 |
// If no duplicates, add LVT elem in hashtable. |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1842 |
if (table->put(*lvt, lvt) == false |
15601 | 1843 |
&& _need_verify |
1844 |
&& _major_version >= JAVA_1_5_VERSION) { |
|
1845 |
classfile_parse_error("Duplicated LocalVariableTable attribute " |
|
1846 |
"entry for '%s' in class file %s", |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1847 |
_cp->symbol_at(lvt->name_cp_index)->as_utf8(), |
15601 | 1848 |
CHECK); |
1849 |
} |
|
1850 |
} |
|
1851 |
} |
|
1852 |
||
1853 |
// To merge LocalVariableTable and LocalVariableTypeTable |
|
1854 |
Classfile_LVT_Element* cf_lvtt; |
|
1855 |
LocalVariableTableElement lvtt_elem; |
|
1856 |
||
1857 |
for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) { |
|
1858 |
cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no]; |
|
1859 |
for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) { |
|
1860 |
copy_lvt_element(&cf_lvtt[idx], &lvtt_elem); |
|
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1861 |
LocalVariableTableElement** entry = table->get(lvtt_elem); |
15601 | 1862 |
if (entry == NULL) { |
1863 |
if (_need_verify) { |
|
1864 |
classfile_parse_error("LVTT entry for '%s' in class file %s " |
|
1865 |
"does not match any LVT entry", |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1866 |
_cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
15601 | 1867 |
CHECK); |
1868 |
} |
|
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1869 |
} else if ((*entry)->signature_cp_index != 0 && _need_verify) { |
15601 | 1870 |
classfile_parse_error("Duplicated LocalVariableTypeTable attribute " |
1871 |
"entry for '%s' in class file %s", |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1872 |
_cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
15601 | 1873 |
CHECK); |
1874 |
} else { |
|
1875 |
// to add generic signatures into LocalVariableTable |
|
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1876 |
(*entry)->signature_cp_index = lvtt_elem.descriptor_cp_index; |
15601 | 1877 |
} |
1878 |
} |
|
1879 |
} |
|
1880 |
} |
|
1881 |
||
1882 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1883 |
void ClassFileParser::copy_method_annotations(ConstMethod* cm, |
15601 | 1884 |
u1* runtime_visible_annotations, |
1885 |
int runtime_visible_annotations_length, |
|
1886 |
u1* runtime_invisible_annotations, |
|
1887 |
int runtime_invisible_annotations_length, |
|
1888 |
u1* runtime_visible_parameter_annotations, |
|
1889 |
int runtime_visible_parameter_annotations_length, |
|
1890 |
u1* runtime_invisible_parameter_annotations, |
|
1891 |
int runtime_invisible_parameter_annotations_length, |
|
1892 |
u1* runtime_visible_type_annotations, |
|
1893 |
int runtime_visible_type_annotations_length, |
|
1894 |
u1* runtime_invisible_type_annotations, |
|
1895 |
int runtime_invisible_type_annotations_length, |
|
1896 |
u1* annotation_default, |
|
1897 |
int annotation_default_length, |
|
1898 |
TRAPS) { |
|
1899 |
||
1900 |
AnnotationArray* a; |
|
1901 |
||
1902 |
if (runtime_visible_annotations_length + |
|
1903 |
runtime_invisible_annotations_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1904 |
a = assemble_annotations(runtime_visible_annotations, |
15601 | 1905 |
runtime_visible_annotations_length, |
1906 |
runtime_invisible_annotations, |
|
1907 |
runtime_invisible_annotations_length, |
|
1908 |
CHECK); |
|
1909 |
cm->set_method_annotations(a); |
|
1910 |
} |
|
1911 |
||
1912 |
if (runtime_visible_parameter_annotations_length + |
|
1913 |
runtime_invisible_parameter_annotations_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1914 |
a = assemble_annotations(runtime_visible_parameter_annotations, |
15601 | 1915 |
runtime_visible_parameter_annotations_length, |
1916 |
runtime_invisible_parameter_annotations, |
|
1917 |
runtime_invisible_parameter_annotations_length, |
|
1918 |
CHECK); |
|
1919 |
cm->set_parameter_annotations(a); |
|
1920 |
} |
|
1921 |
||
1922 |
if (annotation_default_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1923 |
a = assemble_annotations(annotation_default, |
15601 | 1924 |
annotation_default_length, |
1925 |
NULL, |
|
1926 |
0, |
|
1927 |
CHECK); |
|
1928 |
cm->set_default_annotations(a); |
|
1929 |
} |
|
1930 |
||
1931 |
if (runtime_visible_type_annotations_length + |
|
1932 |
runtime_invisible_type_annotations_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1933 |
a = assemble_annotations(runtime_visible_type_annotations, |
15601 | 1934 |
runtime_visible_type_annotations_length, |
1935 |
runtime_invisible_type_annotations, |
|
1936 |
runtime_invisible_type_annotations_length, |
|
1937 |
CHECK); |
|
1938 |
cm->set_type_annotations(a); |
|
1939 |
} |
|
1940 |
} |
|
1941 |
||
1942 |
||
1 | 1943 |
// Note: the parse_method below is big and clunky because all parsing of the code and exceptions |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1944 |
// attribute is inlined. This is cumbersome to avoid since we inline most of the parts in the |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1945 |
// Method* to save footprint, so we only know the size of the resulting Method* when the |
1 | 1946 |
// entire method attribute is parsed. |
1947 |
// |
|
1948 |
// The promoted_flags parameter is used to pass relevant access_flags |
|
1949 |
// from the method back up to the containing klass. These flag values |
|
1950 |
// are added to klass's access_flags. |
|
1951 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1952 |
methodHandle ClassFileParser::parse_method(bool is_interface, |
1 | 1953 |
AccessFlags *promoted_flags, |
1954 |
TRAPS) { |
|
1955 |
ClassFileStream* cfs = stream(); |
|
1956 |
methodHandle nullHandle; |
|
1957 |
ResourceMark rm(THREAD); |
|
1958 |
// Parse fixed parts |
|
1959 |
cfs->guarantee_more(8, CHECK_(nullHandle)); // access_flags, name_index, descriptor_index, attributes_count |
|
1960 |
||
1961 |
int flags = cfs->get_u2_fast(); |
|
1962 |
u2 name_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1963 |
int cp_size = _cp->length(); |
1 | 1964 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1965 |
valid_symbol_at(name_index), |
1 | 1966 |
"Illegal constant pool index %u for method name in class file %s", |
1967 |
name_index, CHECK_(nullHandle)); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1968 |
Symbol* name = _cp->symbol_at(name_index); |
1 | 1969 |
verify_legal_method_name(name, CHECK_(nullHandle)); |
1970 |
||
1971 |
u2 signature_index = cfs->get_u2_fast(); |
|
1972 |
guarantee_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1973 |
valid_symbol_at(signature_index), |
1 | 1974 |
"Illegal constant pool index %u for method signature in class file %s", |
1975 |
signature_index, CHECK_(nullHandle)); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1976 |
Symbol* signature = _cp->symbol_at(signature_index); |
1 | 1977 |
|
1978 |
AccessFlags access_flags; |
|
1979 |
if (name == vmSymbols::class_initializer_name()) { |
|
8653
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1980 |
// We ignore the other access flags for a valid class initializer. |
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1981 |
// (JVM Spec 2nd ed., chapter 4.6) |
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1982 |
if (_major_version < 51) { // backward compatibility |
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1983 |
flags = JVM_ACC_STATIC; |
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1984 |
} else if ((flags & JVM_ACC_STATIC) == JVM_ACC_STATIC) { |
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1985 |
flags &= JVM_ACC_STATIC | JVM_ACC_STRICT; |
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
1986 |
} |
1 | 1987 |
} else { |
1988 |
verify_legal_method_modifiers(flags, is_interface, name, CHECK_(nullHandle)); |
|
1989 |
} |
|
1990 |
||
1991 |
int args_size = -1; // only used when _need_verify is true |
|
1992 |
if (_need_verify) { |
|
1993 |
args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) + |
|
1994 |
verify_legal_method_signature(name, signature, CHECK_(nullHandle)); |
|
1995 |
if (args_size > MAX_ARGS_SIZE) { |
|
1996 |
classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_(nullHandle)); |
|
1997 |
} |
|
1998 |
} |
|
1999 |
||
2000 |
access_flags.set_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS); |
|
2001 |
||
2002 |
// Default values for code and exceptions attribute elements |
|
2003 |
u2 max_stack = 0; |
|
2004 |
u2 max_locals = 0; |
|
2005 |
u4 code_length = 0; |
|
2006 |
u1* code_start = 0; |
|
2007 |
u2 exception_table_length = 0; |
|
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2008 |
u2* exception_table_start = NULL; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2009 |
Array<int>* exception_handlers = Universe::the_empty_int_array(); |
1 | 2010 |
u2 checked_exceptions_length = 0; |
2011 |
u2* checked_exceptions_start = NULL; |
|
2012 |
CompressedLineNumberWriteStream* linenumber_table = NULL; |
|
2013 |
int linenumber_table_length = 0; |
|
2014 |
int total_lvt_length = 0; |
|
2015 |
u2 lvt_cnt = 0; |
|
2016 |
u2 lvtt_cnt = 0; |
|
2017 |
bool lvt_allocated = false; |
|
2018 |
u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER; |
|
2019 |
u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER; |
|
2020 |
u2* localvariable_table_length; |
|
2021 |
u2** localvariable_table_start; |
|
2022 |
u2* localvariable_type_table_length; |
|
2023 |
u2** localvariable_type_table_start; |
|
27612
7201412afbd0
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents:
27402
diff
changeset
|
2024 |
int method_parameters_length = -1; |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2025 |
u1* method_parameters_data = NULL; |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2026 |
bool method_parameters_seen = false; |
1 | 2027 |
bool parsed_code_attribute = false; |
2028 |
bool parsed_checked_exceptions_attribute = false; |
|
2029 |
bool parsed_stackmap_attribute = false; |
|
2030 |
// stackmap attribute - JDK1.5 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2031 |
u1* stackmap_data = NULL; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2032 |
int stackmap_data_length = 0; |
1 | 2033 |
u2 generic_signature_index = 0; |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2034 |
MethodAnnotationCollector parsed_annotations; |
1 | 2035 |
u1* runtime_visible_annotations = NULL; |
2036 |
int runtime_visible_annotations_length = 0; |
|
2037 |
u1* runtime_invisible_annotations = NULL; |
|
2038 |
int runtime_invisible_annotations_length = 0; |
|
2039 |
u1* runtime_visible_parameter_annotations = NULL; |
|
2040 |
int runtime_visible_parameter_annotations_length = 0; |
|
2041 |
u1* runtime_invisible_parameter_annotations = NULL; |
|
2042 |
int runtime_invisible_parameter_annotations_length = 0; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2043 |
u1* runtime_visible_type_annotations = NULL; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2044 |
int runtime_visible_type_annotations_length = 0; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2045 |
u1* runtime_invisible_type_annotations = NULL; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2046 |
int runtime_invisible_type_annotations_length = 0; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2047 |
bool runtime_invisible_annotations_exists = false; |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2048 |
bool runtime_invisible_type_annotations_exists = false; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2049 |
bool runtime_invisible_parameter_annotations_exists = false; |
1 | 2050 |
u1* annotation_default = NULL; |
2051 |
int annotation_default_length = 0; |
|
2052 |
||
2053 |
// Parse code and exceptions attribute |
|
2054 |
u2 method_attributes_count = cfs->get_u2_fast(); |
|
2055 |
while (method_attributes_count--) { |
|
2056 |
cfs->guarantee_more(6, CHECK_(nullHandle)); // method_attribute_name_index, method_attribute_length |
|
2057 |
u2 method_attribute_name_index = cfs->get_u2_fast(); |
|
2058 |
u4 method_attribute_length = cfs->get_u4_fast(); |
|
2059 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2060 |
valid_symbol_at(method_attribute_name_index), |
1 | 2061 |
"Invalid method attribute name index %u in class file %s", |
2062 |
method_attribute_name_index, CHECK_(nullHandle)); |
|
2063 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2064 |
Symbol* method_attribute_name = _cp->symbol_at(method_attribute_name_index); |
1 | 2065 |
if (method_attribute_name == vmSymbols::tag_code()) { |
2066 |
// Parse Code attribute |
|
2067 |
if (_need_verify) { |
|
14385 | 2068 |
guarantee_property( |
2069 |
!access_flags.is_native() && !access_flags.is_abstract(), |
|
1 | 2070 |
"Code attribute in native or abstract methods in class file %s", |
2071 |
CHECK_(nullHandle)); |
|
2072 |
} |
|
2073 |
if (parsed_code_attribute) { |
|
2074 |
classfile_parse_error("Multiple Code attributes in class file %s", CHECK_(nullHandle)); |
|
2075 |
} |
|
2076 |
parsed_code_attribute = true; |
|
2077 |
||
2078 |
// Stack size, locals size, and code size |
|
2079 |
if (_major_version == 45 && _minor_version <= 2) { |
|
2080 |
cfs->guarantee_more(4, CHECK_(nullHandle)); |
|
2081 |
max_stack = cfs->get_u1_fast(); |
|
2082 |
max_locals = cfs->get_u1_fast(); |
|
2083 |
code_length = cfs->get_u2_fast(); |
|
2084 |
} else { |
|
2085 |
cfs->guarantee_more(8, CHECK_(nullHandle)); |
|
2086 |
max_stack = cfs->get_u2_fast(); |
|
2087 |
max_locals = cfs->get_u2_fast(); |
|
2088 |
code_length = cfs->get_u4_fast(); |
|
2089 |
} |
|
2090 |
if (_need_verify) { |
|
2091 |
guarantee_property(args_size <= max_locals, |
|
2092 |
"Arguments can't fit into locals in class file %s", CHECK_(nullHandle)); |
|
2093 |
guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE, |
|
2094 |
"Invalid method Code length %u in class file %s", |
|
2095 |
code_length, CHECK_(nullHandle)); |
|
2096 |
} |
|
2097 |
// Code pointer |
|
2098 |
code_start = cfs->get_u1_buffer(); |
|
2099 |
assert(code_start != NULL, "null code start"); |
|
2100 |
cfs->guarantee_more(code_length, CHECK_(nullHandle)); |
|
2101 |
cfs->skip_u1_fast(code_length); |
|
2102 |
||
2103 |
// Exception handler table |
|
2104 |
cfs->guarantee_more(2, CHECK_(nullHandle)); // exception_table_length |
|
2105 |
exception_table_length = cfs->get_u2_fast(); |
|
2106 |
if (exception_table_length > 0) { |
|
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2107 |
exception_table_start = |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2108 |
parse_exception_table(code_length, exception_table_length, CHECK_(nullHandle)); |
1 | 2109 |
} |
2110 |
||
2111 |
// Parse additional attributes in code attribute |
|
2112 |
cfs->guarantee_more(2, CHECK_(nullHandle)); // code_attributes_count |
|
2113 |
u2 code_attributes_count = cfs->get_u2_fast(); |
|
339
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2114 |
|
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2115 |
unsigned int calculated_attribute_length = 0; |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2116 |
|
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2117 |
if (_major_version > 45 || (_major_version == 45 && _minor_version > 2)) { |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2118 |
calculated_attribute_length = |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2119 |
sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length); |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2120 |
} else { |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2121 |
// max_stack, locals and length are smaller in pre-version 45.2 classes |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2122 |
calculated_attribute_length = sizeof(u1) + sizeof(u1) + sizeof(u2); |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2123 |
} |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2124 |
calculated_attribute_length += |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2125 |
code_length + |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2126 |
sizeof(exception_table_length) + |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2127 |
sizeof(code_attributes_count) + |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2128 |
exception_table_length * |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2129 |
( sizeof(u2) + // start_pc |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2130 |
sizeof(u2) + // end_pc |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2131 |
sizeof(u2) + // handler_pc |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2132 |
sizeof(u2) ); // catch_type_index |
1 | 2133 |
|
2134 |
while (code_attributes_count--) { |
|
2135 |
cfs->guarantee_more(6, CHECK_(nullHandle)); // code_attribute_name_index, code_attribute_length |
|
2136 |
u2 code_attribute_name_index = cfs->get_u2_fast(); |
|
2137 |
u4 code_attribute_length = cfs->get_u4_fast(); |
|
2138 |
calculated_attribute_length += code_attribute_length + |
|
2139 |
sizeof(code_attribute_name_index) + |
|
2140 |
sizeof(code_attribute_length); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2141 |
check_property(valid_symbol_at(code_attribute_name_index), |
1 | 2142 |
"Invalid code attribute name index %u in class file %s", |
2143 |
code_attribute_name_index, |
|
2144 |
CHECK_(nullHandle)); |
|
2145 |
if (LoadLineNumberTables && |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2146 |
_cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) { |
1 | 2147 |
// Parse and compress line number table |
2148 |
parse_linenumber_table(code_attribute_length, code_length, |
|
2149 |
&linenumber_table, CHECK_(nullHandle)); |
|
2150 |
||
2151 |
} else if (LoadLocalVariableTables && |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2152 |
_cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) { |
1 | 2153 |
// Parse local variable table |
2154 |
if (!lvt_allocated) { |
|
2155 |
localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2156 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2157 |
localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2158 |
THREAD, u2*, INITIAL_MAX_LVT_NUMBER); |
|
2159 |
localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2160 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2161 |
localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2162 |
THREAD, u2*, INITIAL_MAX_LVT_NUMBER); |
|
2163 |
lvt_allocated = true; |
|
2164 |
} |
|
2165 |
if (lvt_cnt == max_lvt_cnt) { |
|
2166 |
max_lvt_cnt <<= 1; |
|
20668 | 2167 |
localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt); |
2168 |
localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt); |
|
1 | 2169 |
} |
2170 |
localvariable_table_start[lvt_cnt] = |
|
2171 |
parse_localvariable_table(code_length, |
|
2172 |
max_locals, |
|
2173 |
code_attribute_length, |
|
2174 |
&localvariable_table_length[lvt_cnt], |
|
2175 |
false, // is not LVTT |
|
2176 |
CHECK_(nullHandle)); |
|
2177 |
total_lvt_length += localvariable_table_length[lvt_cnt]; |
|
2178 |
lvt_cnt++; |
|
2179 |
} else if (LoadLocalVariableTypeTables && |
|
2180 |
_major_version >= JAVA_1_5_VERSION && |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2181 |
_cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) { |
1 | 2182 |
if (!lvt_allocated) { |
2183 |
localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2184 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2185 |
localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2186 |
THREAD, u2*, INITIAL_MAX_LVT_NUMBER); |
|
2187 |
localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2188 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2189 |
localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2190 |
THREAD, u2*, INITIAL_MAX_LVT_NUMBER); |
|
2191 |
lvt_allocated = true; |
|
2192 |
} |
|
2193 |
// Parse local variable type table |
|
2194 |
if (lvtt_cnt == max_lvtt_cnt) { |
|
2195 |
max_lvtt_cnt <<= 1; |
|
20668 | 2196 |
localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt); |
2197 |
localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt); |
|
1 | 2198 |
} |
2199 |
localvariable_type_table_start[lvtt_cnt] = |
|
2200 |
parse_localvariable_table(code_length, |
|
2201 |
max_locals, |
|
2202 |
code_attribute_length, |
|
2203 |
&localvariable_type_table_length[lvtt_cnt], |
|
2204 |
true, // is LVTT |
|
2205 |
CHECK_(nullHandle)); |
|
2206 |
lvtt_cnt++; |
|
16445
cb44d5b3ad89
8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents:
15935
diff
changeset
|
2207 |
} else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION && |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2208 |
_cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) { |
1 | 2209 |
// Stack map is only needed by the new verifier in JDK1.5. |
2210 |
if (parsed_stackmap_attribute) { |
|
2211 |
classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_(nullHandle)); |
|
2212 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2213 |
stackmap_data = parse_stackmap_table(code_attribute_length, CHECK_(nullHandle)); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2214 |
stackmap_data_length = code_attribute_length; |
1 | 2215 |
parsed_stackmap_attribute = true; |
2216 |
} else { |
|
2217 |
// Skip unknown attributes |
|
2218 |
cfs->skip_u1(code_attribute_length, CHECK_(nullHandle)); |
|
2219 |
} |
|
2220 |
} |
|
2221 |
// check method attribute length |
|
2222 |
if (_need_verify) { |
|
2223 |
guarantee_property(method_attribute_length == calculated_attribute_length, |
|
2224 |
"Code segment has wrong length in class file %s", CHECK_(nullHandle)); |
|
2225 |
} |
|
2226 |
} else if (method_attribute_name == vmSymbols::tag_exceptions()) { |
|
2227 |
// Parse Exceptions attribute |
|
2228 |
if (parsed_checked_exceptions_attribute) { |
|
2229 |
classfile_parse_error("Multiple Exceptions attributes in class file %s", CHECK_(nullHandle)); |
|
2230 |
} |
|
2231 |
parsed_checked_exceptions_attribute = true; |
|
2232 |
checked_exceptions_start = |
|
2233 |
parse_checked_exceptions(&checked_exceptions_length, |
|
2234 |
method_attribute_length, |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2235 |
CHECK_(nullHandle)); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2236 |
} else if (method_attribute_name == vmSymbols::tag_method_parameters()) { |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2237 |
// reject multiple method parameters |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2238 |
if (method_parameters_seen) { |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2239 |
classfile_parse_error("Multiple MethodParameters attributes in class file %s", CHECK_(nullHandle)); |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2240 |
} |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2241 |
method_parameters_seen = true; |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2242 |
method_parameters_length = cfs->get_u1_fast(); |
27612
7201412afbd0
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents:
27402
diff
changeset
|
2243 |
const u2 real_length = (method_parameters_length * 4u) + 1u; |
7201412afbd0
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents:
27402
diff
changeset
|
2244 |
if (method_attribute_length != real_length) { |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2245 |
classfile_parse_error( |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2246 |
"Invalid MethodParameters method attribute length %u in class file", |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2247 |
method_attribute_length, CHECK_(nullHandle)); |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2248 |
} |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2249 |
method_parameters_data = cfs->get_u1_buffer(); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2250 |
cfs->skip_u2_fast(method_parameters_length); |
17080
9151a26f5888
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
17024
diff
changeset
|
2251 |
cfs->skip_u2_fast(method_parameters_length); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2252 |
// ignore this attribute if it cannot be reflected |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2253 |
if (!SystemDictionary::Parameter_klass_loaded()) |
27612
7201412afbd0
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents:
27402
diff
changeset
|
2254 |
method_parameters_length = -1; |
1 | 2255 |
} else if (method_attribute_name == vmSymbols::tag_synthetic()) { |
2256 |
if (method_attribute_length != 0) { |
|
2257 |
classfile_parse_error( |
|
2258 |
"Invalid Synthetic method attribute length %u in class file %s", |
|
2259 |
method_attribute_length, CHECK_(nullHandle)); |
|
2260 |
} |
|
2261 |
// Should we check that there hasn't already been a synthetic attribute? |
|
2262 |
access_flags.set_is_synthetic(); |
|
2263 |
} else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120 |
|
2264 |
if (method_attribute_length != 0) { |
|
2265 |
classfile_parse_error( |
|
2266 |
"Invalid Deprecated method attribute length %u in class file %s", |
|
2267 |
method_attribute_length, CHECK_(nullHandle)); |
|
2268 |
} |
|
2269 |
} else if (_major_version >= JAVA_1_5_VERSION) { |
|
2270 |
if (method_attribute_name == vmSymbols::tag_signature()) { |
|
2271 |
if (method_attribute_length != 2) { |
|
2272 |
classfile_parse_error( |
|
2273 |
"Invalid Signature attribute length %u in class file %s", |
|
2274 |
method_attribute_length, CHECK_(nullHandle)); |
|
2275 |
} |
|
25507 | 2276 |
generic_signature_index = parse_generic_signature_attribute(CHECK_(nullHandle)); |
1 | 2277 |
} else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) { |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2278 |
if (runtime_visible_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2279 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2280 |
"Multiple RuntimeVisibleAnnotations attributes for method in class file %s", CHECK_(nullHandle)); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2281 |
} |
1 | 2282 |
runtime_visible_annotations_length = method_attribute_length; |
2283 |
runtime_visible_annotations = cfs->get_u1_buffer(); |
|
2284 |
assert(runtime_visible_annotations != NULL, "null visible annotations"); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2285 |
parse_annotations(runtime_visible_annotations, |
31366
67eccccbb2ca
8042041: https://bugs.openjdk.java.net/browse/JDK-8042041
hseigel
parents:
30764
diff
changeset
|
2286 |
runtime_visible_annotations_length, &parsed_annotations); |
1 | 2287 |
cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle)); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2288 |
} else if (method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2289 |
if (runtime_invisible_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2290 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2291 |
"Multiple RuntimeInvisibleAnnotations attributes for method in class file %s", CHECK_(nullHandle)); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2292 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2293 |
runtime_invisible_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2294 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2295 |
runtime_invisible_annotations_length = method_attribute_length; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2296 |
runtime_invisible_annotations = cfs->get_u1_buffer(); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2297 |
assert(runtime_invisible_annotations != NULL, "null invisible annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2298 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2299 |
cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
1 | 2300 |
} else if (method_attribute_name == vmSymbols::tag_runtime_visible_parameter_annotations()) { |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2301 |
if (runtime_visible_parameter_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2302 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2303 |
"Multiple RuntimeVisibleParameterAnnotations attributes for method in class file %s", CHECK_(nullHandle)); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2304 |
} |
1 | 2305 |
runtime_visible_parameter_annotations_length = method_attribute_length; |
2306 |
runtime_visible_parameter_annotations = cfs->get_u1_buffer(); |
|
2307 |
assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations"); |
|
2308 |
cfs->skip_u1(runtime_visible_parameter_annotations_length, CHECK_(nullHandle)); |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2309 |
} else if (method_attribute_name == vmSymbols::tag_runtime_invisible_parameter_annotations()) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2310 |
if (runtime_invisible_parameter_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2311 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2312 |
"Multiple RuntimeInvisibleParameterAnnotations attributes for method in class file %s", CHECK_(nullHandle)); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2313 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2314 |
runtime_invisible_parameter_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2315 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2316 |
runtime_invisible_parameter_annotations_length = method_attribute_length; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2317 |
runtime_invisible_parameter_annotations = cfs->get_u1_buffer(); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2318 |
assert(runtime_invisible_parameter_annotations != NULL, "null invisible parameter annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2319 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2320 |
cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
1 | 2321 |
} else if (method_attribute_name == vmSymbols::tag_annotation_default()) { |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2322 |
if (annotation_default != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2323 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2324 |
"Multiple AnnotationDefault attributes for method in class file %s", |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2325 |
CHECK_(nullHandle)); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2326 |
} |
1 | 2327 |
annotation_default_length = method_attribute_length; |
2328 |
annotation_default = cfs->get_u1_buffer(); |
|
2329 |
assert(annotation_default != NULL, "null annotation default"); |
|
2330 |
cfs->skip_u1(annotation_default_length, CHECK_(nullHandle)); |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2331 |
} else if (method_attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) { |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2332 |
if (runtime_visible_type_annotations != NULL) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2333 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2334 |
"Multiple RuntimeVisibleTypeAnnotations attributes for method in class file %s", |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2335 |
CHECK_(nullHandle)); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2336 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2337 |
runtime_visible_type_annotations_length = method_attribute_length; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2338 |
runtime_visible_type_annotations = cfs->get_u1_buffer(); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2339 |
assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2340 |
// No need for the VM to parse Type annotations |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2341 |
cfs->skip_u1(runtime_visible_type_annotations_length, CHECK_(nullHandle)); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2342 |
} else if (method_attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2343 |
if (runtime_invisible_type_annotations_exists) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2344 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2345 |
"Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s", |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2346 |
CHECK_(nullHandle)); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2347 |
} else { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2348 |
runtime_invisible_type_annotations_exists = true; |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2349 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2350 |
if (PreserveAllAnnotations) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2351 |
runtime_invisible_type_annotations_length = method_attribute_length; |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2352 |
runtime_invisible_type_annotations = cfs->get_u1_buffer(); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2353 |
assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations"); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2354 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2355 |
cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
1 | 2356 |
} else { |
2357 |
// Skip unknown attributes |
|
2358 |
cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
|
2359 |
} |
|
2360 |
} else { |
|
2361 |
// Skip unknown attributes |
|
2362 |
cfs->skip_u1(method_attribute_length, CHECK_(nullHandle)); |
|
2363 |
} |
|
2364 |
} |
|
2365 |
||
2366 |
if (linenumber_table != NULL) { |
|
2367 |
linenumber_table->write_terminator(); |
|
2368 |
linenumber_table_length = linenumber_table->position(); |
|
2369 |
} |
|
2370 |
||
2371 |
// Make sure there's at least one Code attribute in non-native/non-abstract method |
|
2372 |
if (_need_verify) { |
|
2373 |
guarantee_property(access_flags.is_native() || access_flags.is_abstract() || parsed_code_attribute, |
|
2374 |
"Absent Code attribute in method that is not native or abstract in class file %s", CHECK_(nullHandle)); |
|
2375 |
} |
|
2376 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2377 |
// All sizing information for a Method* is finally available, now create it |
15601 | 2378 |
InlineTableSizes sizes( |
2379 |
total_lvt_length, |
|
2380 |
linenumber_table_length, |
|
2381 |
exception_table_length, |
|
2382 |
checked_exceptions_length, |
|
2383 |
method_parameters_length, |
|
2384 |
generic_signature_index, |
|
2385 |
runtime_visible_annotations_length + |
|
2386 |
runtime_invisible_annotations_length, |
|
2387 |
runtime_visible_parameter_annotations_length + |
|
2388 |
runtime_invisible_parameter_annotations_length, |
|
2389 |
runtime_visible_type_annotations_length + |
|
2390 |
runtime_invisible_type_annotations_length, |
|
2391 |
annotation_default_length, |
|
2392 |
0); |
|
2393 |
||
14385 | 2394 |
Method* m = Method::allocate( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2395 |
_loader_data, code_length, access_flags, &sizes, |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2396 |
ConstMethod::NORMAL, CHECK_(nullHandle)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2397 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2398 |
ClassLoadingService::add_class_method_size(m->size()*HeapWordSize); |
1 | 2399 |
|
2400 |
// Fill in information from fixed part (access_flags already set) |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2401 |
m->set_constants(_cp); |
1 | 2402 |
m->set_name_index(name_index); |
2403 |
m->set_signature_index(signature_index); |
|
2404 |
#ifdef CC_INTERP |
|
2405 |
// hmm is there a gc issue here?? |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2406 |
ResultTypeFinder rtf(_cp->symbol_at(signature_index)); |
1 | 2407 |
m->set_result_index(rtf.type()); |
2408 |
#endif |
|
2409 |
||
2410 |
if (args_size >= 0) { |
|
2411 |
m->set_size_of_parameters(args_size); |
|
2412 |
} else { |
|
2413 |
m->compute_size_of_parameters(THREAD); |
|
2414 |
} |
|
2415 |
#ifdef ASSERT |
|
2416 |
if (args_size >= 0) { |
|
2417 |
m->compute_size_of_parameters(THREAD); |
|
2418 |
assert(args_size == m->size_of_parameters(), ""); |
|
2419 |
} |
|
2420 |
#endif |
|
2421 |
||
2422 |
// Fill in code attribute information |
|
2423 |
m->set_max_stack(max_stack); |
|
2424 |
m->set_max_locals(max_locals); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2425 |
if (stackmap_data != NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2426 |
m->constMethod()->copy_stackmap_data(_loader_data, stackmap_data, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2427 |
stackmap_data_length, CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2428 |
} |
1 | 2429 |
|
2430 |
// Copy byte codes |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4478
diff
changeset
|
2431 |
m->set_code(code_start); |
1 | 2432 |
|
2433 |
// Copy line number table |
|
2434 |
if (linenumber_table != NULL) { |
|
2435 |
memcpy(m->compressed_linenumber_table(), |
|
2436 |
linenumber_table->buffer(), linenumber_table_length); |
|
2437 |
} |
|
2438 |
||
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2439 |
// Copy exception table |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2440 |
if (exception_table_length > 0) { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2441 |
int size = |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2442 |
exception_table_length * sizeof(ExceptionTableElement) / sizeof(u2); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2443 |
copy_u2_with_conversion((u2*) m->exception_table_start(), |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2444 |
exception_table_start, size); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2445 |
} |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2446 |
|
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2447 |
// Copy method parameters |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2448 |
if (method_parameters_length > 0) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2449 |
MethodParametersElement* elem = m->constMethod()->method_parameters_start(); |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2450 |
for (int i = 0; i < method_parameters_length; i++) { |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2451 |
elem[i].name_cp_index = Bytes::get_Java_u2(method_parameters_data); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2452 |
method_parameters_data += 2; |
17080
9151a26f5888
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
17024
diff
changeset
|
2453 |
elem[i].flags = Bytes::get_Java_u2(method_parameters_data); |
9151a26f5888
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
17024
diff
changeset
|
2454 |
method_parameters_data += 2; |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2455 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2456 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2457 |
|
1 | 2458 |
// Copy checked exceptions |
2459 |
if (checked_exceptions_length > 0) { |
|
2460 |
int size = checked_exceptions_length * sizeof(CheckedExceptionElement) / sizeof(u2); |
|
2461 |
copy_u2_with_conversion((u2*) m->checked_exceptions_start(), checked_exceptions_start, size); |
|
2462 |
} |
|
2463 |
||
15601 | 2464 |
// Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
1 | 2465 |
if (total_lvt_length > 0) { |
2466 |
promoted_flags->set_has_localvariable_table(); |
|
15601 | 2467 |
copy_localvariable_table(m->constMethod(), lvt_cnt, |
2468 |
localvariable_table_length, |
|
2469 |
localvariable_table_start, |
|
2470 |
lvtt_cnt, |
|
2471 |
localvariable_type_table_length, |
|
2472 |
localvariable_type_table_start, CHECK_NULL); |
|
1 | 2473 |
} |
2474 |
||
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2475 |
if (parsed_annotations.has_any_annotations()) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2476 |
parsed_annotations.apply_to(m); |
15601 | 2477 |
|
2478 |
// Copy annotations |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2479 |
copy_method_annotations(m->constMethod(), |
15601 | 2480 |
runtime_visible_annotations, |
2481 |
runtime_visible_annotations_length, |
|
2482 |
runtime_invisible_annotations, |
|
2483 |
runtime_invisible_annotations_length, |
|
2484 |
runtime_visible_parameter_annotations, |
|
2485 |
runtime_visible_parameter_annotations_length, |
|
2486 |
runtime_invisible_parameter_annotations, |
|
2487 |
runtime_invisible_parameter_annotations_length, |
|
2488 |
runtime_visible_type_annotations, |
|
2489 |
runtime_visible_type_annotations_length, |
|
2490 |
runtime_invisible_type_annotations, |
|
2491 |
runtime_invisible_type_annotations_length, |
|
2492 |
annotation_default, |
|
2493 |
annotation_default_length, |
|
2494 |
CHECK_NULL); |
|
1 | 2495 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2496 |
if (name == vmSymbols::finalize_method_name() && |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2497 |
signature == vmSymbols::void_method_signature()) { |
1 | 2498 |
if (m->is_empty_method()) { |
2499 |
_has_empty_finalizer = true; |
|
2500 |
} else { |
|
2501 |
_has_finalizer = true; |
|
2502 |
} |
|
2503 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2504 |
if (name == vmSymbols::object_initializer_name() && |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2505 |
signature == vmSymbols::void_method_signature() && |
1 | 2506 |
m->is_vanilla_constructor()) { |
2507 |
_has_vanilla_constructor = true; |
|
2508 |
} |
|
2509 |
||
15601 | 2510 |
NOT_PRODUCT(m->verify()); |
1 | 2511 |
return m; |
2512 |
} |
|
2513 |
||
2514 |
||
2515 |
// The promoted_flags parameter is used to pass relevant access_flags |
|
2516 |
// from the methods back up to the containing klass. These flag values |
|
2517 |
// are added to klass's access_flags. |
|
2518 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2519 |
Array<Method*>* ClassFileParser::parse_methods(bool is_interface, |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
2520 |
AccessFlags* promoted_flags, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
2521 |
bool* has_final_method, |
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2522 |
bool* declares_default_methods, |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
2523 |
TRAPS) { |
1 | 2524 |
ClassFileStream* cfs = stream(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2525 |
cfs->guarantee_more(2, CHECK_NULL); // length |
1 | 2526 |
u2 length = cfs->get_u2_fast(); |
2527 |
if (length == 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2528 |
_methods = Universe::the_empty_method_array(); |
1 | 2529 |
} else { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2530 |
_methods = MetadataFactory::new_array<Method*>(_loader_data, length, NULL, CHECK_NULL); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2531 |
|
1 | 2532 |
HandleMark hm(THREAD); |
2533 |
for (int index = 0; index < length; index++) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2534 |
methodHandle method = parse_method(is_interface, |
1 | 2535 |
promoted_flags, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2536 |
CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2537 |
|
1 | 2538 |
if (method->is_final()) { |
2539 |
*has_final_method = true; |
|
2540 |
} |
|
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2541 |
// declares_default_methods: declares concrete instance methods, any access flags |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2542 |
// used for interface initialization, and default method inheritance analysis |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2543 |
if (is_interface && !(*declares_default_methods) |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2544 |
&& !method->is_abstract() && !method->is_static()) { |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2545 |
*declares_default_methods = true; |
14385 | 2546 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2547 |
_methods->at_put(index, method()); |
1 | 2548 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2549 |
|
1 | 2550 |
if (_need_verify && length > 1) { |
2551 |
// Check duplicated methods |
|
2552 |
ResourceMark rm(THREAD); |
|
2553 |
NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2554 |
THREAD, NameSigHash*, HASH_ROW_SIZE); |
|
2555 |
initialize_hashtable(names_and_sigs); |
|
2556 |
bool dup = false; |
|
2557 |
{ |
|
2558 |
debug_only(No_Safepoint_Verifier nsv;) |
|
2559 |
for (int i = 0; i < length; i++) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2560 |
Method* m = _methods->at(i); |
1 | 2561 |
// If no duplicates, add name/signature in hashtable names_and_sigs. |
2562 |
if (!put_after_lookup(m->name(), m->signature(), names_and_sigs)) { |
|
2563 |
dup = true; |
|
2564 |
break; |
|
2565 |
} |
|
2566 |
} |
|
2567 |
} |
|
2568 |
if (dup) { |
|
2569 |
classfile_parse_error("Duplicate method name&signature in class file %s", |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2570 |
CHECK_NULL); |
1 | 2571 |
} |
2572 |
} |
|
2573 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2574 |
return _methods; |
1 | 2575 |
} |
2576 |
||
2577 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2578 |
intArray* ClassFileParser::sort_methods(Array<Method*>* methods) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2579 |
int length = methods->length(); |
9172
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2580 |
// If JVMTI original method ordering or sharing is enabled we have to |
1 | 2581 |
// remember the original class file ordering. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2582 |
// We temporarily use the vtable_index field in the Method* to store the |
1 | 2583 |
// class file index, so we can read in after calling qsort. |
9172
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2584 |
// Put the method ordering in the shared archive. |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2585 |
if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { |
1 | 2586 |
for (int index = 0; index < length; index++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2587 |
Method* m = methods->at(index); |
1 | 2588 |
assert(!m->valid_vtable_index(), "vtable index should not be set"); |
2589 |
m->set_vtable_index(index); |
|
2590 |
} |
|
2591 |
} |
|
2592 |
// Sort method array by ascending method name (for faster lookups & vtable construction) |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2593 |
// Note that the ordering is not alphabetical, see Symbol::fast_compare |
15601 | 2594 |
Method::sort_methods(methods); |
1 | 2595 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2596 |
intArray* method_ordering = NULL; |
9172
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2597 |
// If JVMTI original method ordering or sharing is enabled construct int |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2598 |
// array remembering the original ordering |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2599 |
if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2600 |
method_ordering = new intArray(length); |
1 | 2601 |
for (int index = 0; index < length; index++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2602 |
Method* m = methods->at(index); |
1 | 2603 |
int old_index = m->vtable_index(); |
2604 |
assert(old_index >= 0 && old_index < length, "invalid method index"); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2605 |
method_ordering->at_put(index, old_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2606 |
m->set_vtable_index(Method::invalid_vtable_index); |
1 | 2607 |
} |
2608 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2609 |
return method_ordering; |
1 | 2610 |
} |
2611 |
||
25507 | 2612 |
// Parse generic_signature attribute for methods and fields |
2613 |
u2 ClassFileParser::parse_generic_signature_attribute(TRAPS) { |
|
2614 |
ClassFileStream* cfs = stream(); |
|
2615 |
cfs->guarantee_more(2, CHECK_0); // generic_signature_index |
|
2616 |
u2 generic_signature_index = cfs->get_u2_fast(); |
|
2617 |
check_property( |
|
2618 |
valid_symbol_at(generic_signature_index), |
|
2619 |
"Invalid Signature attribute at constant pool index %u in class file %s", |
|
2620 |
generic_signature_index, CHECK_0); |
|
2621 |
return generic_signature_index; |
|
2622 |
} |
|
1 | 2623 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2624 |
void ClassFileParser::parse_classfile_sourcefile_attribute(TRAPS) { |
1 | 2625 |
ClassFileStream* cfs = stream(); |
2626 |
cfs->guarantee_more(2, CHECK); // sourcefile_index |
|
2627 |
u2 sourcefile_index = cfs->get_u2_fast(); |
|
2628 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2629 |
valid_symbol_at(sourcefile_index), |
1 | 2630 |
"Invalid SourceFile attribute at constant pool index %u in class file %s", |
2631 |
sourcefile_index, CHECK); |
|
19326
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
2632 |
set_class_sourcefile_index(sourcefile_index); |
1 | 2633 |
} |
2634 |
||
2635 |
||
2636 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2637 |
void ClassFileParser::parse_classfile_source_debug_extension_attribute(int length, TRAPS) { |
1 | 2638 |
ClassFileStream* cfs = stream(); |
2639 |
u1* sde_buffer = cfs->get_u1_buffer(); |
|
2640 |
assert(sde_buffer != NULL, "null sde buffer"); |
|
2641 |
||
2642 |
// Don't bother storing it if there is no way to retrieve it |
|
2643 |
if (JvmtiExport::can_get_source_debug_extension()) { |
|
13295 | 2644 |
assert((length+1) > length, "Overflow checking"); |
2645 |
u1* sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1); |
|
2646 |
for (int i = 0; i < length; i++) { |
|
2647 |
sde[i] = sde_buffer[i]; |
|
2648 |
} |
|
2649 |
sde[length] = '\0'; |
|
2650 |
set_class_sde_buffer((char*)sde, length); |
|
1 | 2651 |
} |
2652 |
// Got utf8 string, set stream position forward |
|
2653 |
cfs->skip_u1(length, CHECK); |
|
2654 |
} |
|
2655 |
||
2656 |
||
2657 |
// Inner classes can be static, private or protected (classic VM does this) |
|
2658 |
#define RECOGNIZED_INNER_CLASS_MODIFIERS (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED | JVM_ACC_STATIC) |
|
2659 |
||
2660 |
// Return number of classes in the inner classes attribute table |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2661 |
u2 ClassFileParser::parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start, |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2662 |
bool parsed_enclosingmethod_attribute, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2663 |
u2 enclosing_method_class_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2664 |
u2 enclosing_method_method_index, |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2665 |
TRAPS) { |
1 | 2666 |
ClassFileStream* cfs = stream(); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2667 |
u1* current_mark = cfs->current(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2668 |
u2 length = 0; |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2669 |
if (inner_classes_attribute_start != NULL) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2670 |
cfs->set_current(inner_classes_attribute_start); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2671 |
cfs->guarantee_more(2, CHECK_0); // length |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2672 |
length = cfs->get_u2_fast(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2673 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2674 |
|
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2675 |
// 4-tuples of shorts of inner classes data and 2 shorts of enclosing |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2676 |
// method data: |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2677 |
// [inner_class_info_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2678 |
// outer_class_info_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2679 |
// inner_name_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2680 |
// inner_class_access_flags, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2681 |
// ... |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2682 |
// enclosing_method_class_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2683 |
// enclosing_method_method_index] |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2684 |
int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2685 |
Array<u2>* inner_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2686 |
_inner_classes = inner_classes; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2687 |
|
1 | 2688 |
int index = 0; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2689 |
int cp_size = _cp->length(); |
1 | 2690 |
cfs->guarantee_more(8 * length, CHECK_0); // 4-tuples of u2 |
2691 |
for (int n = 0; n < length; n++) { |
|
2692 |
// Inner class index |
|
2693 |
u2 inner_class_info_index = cfs->get_u2_fast(); |
|
2694 |
check_property( |
|
31776
70dd826a47b5
8130183: InnerClasses: VM permits wrong inner_class_info_index value of zero
hseigel
parents:
31402
diff
changeset
|
2695 |
valid_klass_reference_at(inner_class_info_index), |
1 | 2696 |
"inner_class_info_index %u has bad constant type in class file %s", |
2697 |
inner_class_info_index, CHECK_0); |
|
2698 |
// Outer class index |
|
2699 |
u2 outer_class_info_index = cfs->get_u2_fast(); |
|
2700 |
check_property( |
|
2701 |
outer_class_info_index == 0 || |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2702 |
valid_klass_reference_at(outer_class_info_index), |
1 | 2703 |
"outer_class_info_index %u has bad constant type in class file %s", |
2704 |
outer_class_info_index, CHECK_0); |
|
2705 |
// Inner class name |
|
2706 |
u2 inner_name_index = cfs->get_u2_fast(); |
|
2707 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2708 |
inner_name_index == 0 || valid_symbol_at(inner_name_index), |
1 | 2709 |
"inner_name_index %u has bad constant type in class file %s", |
2710 |
inner_name_index, CHECK_0); |
|
2711 |
if (_need_verify) { |
|
2712 |
guarantee_property(inner_class_info_index != outer_class_info_index, |
|
2713 |
"Class is both outer and inner class in class file %s", CHECK_0); |
|
2714 |
} |
|
2715 |
// Access flags |
|
2716 |
AccessFlags inner_access_flags; |
|
2717 |
jint flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS; |
|
2718 |
if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { |
|
2719 |
// Set abstract bit for old class files for backward compatibility |
|
2720 |
flags |= JVM_ACC_ABSTRACT; |
|
2721 |
} |
|
2722 |
verify_legal_class_modifiers(flags, CHECK_0); |
|
2723 |
inner_access_flags.set_flags(flags); |
|
2724 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2725 |
inner_classes->at_put(index++, inner_class_info_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2726 |
inner_classes->at_put(index++, outer_class_info_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2727 |
inner_classes->at_put(index++, inner_name_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2728 |
inner_classes->at_put(index++, inner_access_flags.as_short()); |
1 | 2729 |
} |
2730 |
||
2731 |
// 4347400: make sure there's no duplicate entry in the classes array |
|
2732 |
if (_need_verify && _major_version >= JAVA_1_5_VERSION) { |
|
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2733 |
for(int i = 0; i < length * 4; i += 4) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2734 |
for(int j = i + 4; j < length * 4; j += 4) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2735 |
guarantee_property((inner_classes->at(i) != inner_classes->at(j) || |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2736 |
inner_classes->at(i+1) != inner_classes->at(j+1) || |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2737 |
inner_classes->at(i+2) != inner_classes->at(j+2) || |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2738 |
inner_classes->at(i+3) != inner_classes->at(j+3)), |
1 | 2739 |
"Duplicate entry in InnerClasses in class file %s", |
2740 |
CHECK_0); |
|
2741 |
} |
|
2742 |
} |
|
2743 |
} |
|
2744 |
||
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2745 |
// Set EnclosingMethod class and method indexes. |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2746 |
if (parsed_enclosingmethod_attribute) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2747 |
inner_classes->at_put(index++, enclosing_method_class_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2748 |
inner_classes->at_put(index++, enclosing_method_method_index); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2749 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2750 |
assert(index == size, "wrong size"); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2751 |
|
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2752 |
// Restore buffer's current position. |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2753 |
cfs->set_current(current_mark); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2754 |
|
1 | 2755 |
return length; |
2756 |
} |
|
2757 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2758 |
void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) { |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2759 |
set_class_synthetic_flag(true); |
1 | 2760 |
} |
2761 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2762 |
void ClassFileParser::parse_classfile_signature_attribute(TRAPS) { |
1 | 2763 |
ClassFileStream* cfs = stream(); |
2764 |
u2 signature_index = cfs->get_u2(CHECK); |
|
2765 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2766 |
valid_symbol_at(signature_index), |
1 | 2767 |
"Invalid constant pool index %u in Signature attribute in class file %s", |
2768 |
signature_index, CHECK); |
|
19326
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
2769 |
set_class_generic_signature_index(signature_index); |
1 | 2770 |
} |
2771 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2772 |
void ClassFileParser::parse_classfile_bootstrap_methods_attribute(u4 attribute_byte_length, TRAPS) { |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2773 |
ClassFileStream* cfs = stream(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2774 |
u1* current_start = cfs->current(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2775 |
|
25506 | 2776 |
guarantee_property(attribute_byte_length >= sizeof(u2), |
2777 |
"Invalid BootstrapMethods attribute length %u in class file %s", |
|
2778 |
attribute_byte_length, |
|
2779 |
CHECK); |
|
2780 |
||
2781 |
cfs->guarantee_more(attribute_byte_length, CHECK); |
|
2782 |
||
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2783 |
int attribute_array_length = cfs->get_u2_fast(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2784 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2785 |
guarantee_property(_max_bootstrap_specifier_index < attribute_array_length, |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2786 |
"Short length on BootstrapMethods in class file %s", |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2787 |
CHECK); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2788 |
|
23840 | 2789 |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2790 |
// The attribute contains a counted array of counted tuples of shorts, |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2791 |
// represending bootstrap specifiers: |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2792 |
// length*{bootstrap_method_index, argument_count*{argument_index}} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2793 |
int operand_count = (attribute_byte_length - sizeof(u2)) / sizeof(u2); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2794 |
// operand_count = number of shorts in attr, except for leading length |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2795 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2796 |
// The attribute is copied into a short[] array. |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2797 |
// The array begins with a series of short[2] pairs, one for each tuple. |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2798 |
int index_size = (attribute_array_length * 2); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2799 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2800 |
Array<u2>* operands = MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2801 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2802 |
// Eagerly assign operands so they will be deallocated with the constant |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2803 |
// pool if there is an error. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2804 |
_cp->set_operands(operands); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2805 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2806 |
int operand_fill_index = index_size; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2807 |
int cp_size = _cp->length(); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2808 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2809 |
for (int n = 0; n < attribute_array_length; n++) { |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2810 |
// Store a 32-bit offset into the header of the operand array. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2811 |
ConstantPool::operand_offset_at_put(operands, n, operand_fill_index); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2812 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2813 |
// Read a bootstrap specifier. |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2814 |
cfs->guarantee_more(sizeof(u2) * 2, CHECK); // bsm, argc |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2815 |
u2 bootstrap_method_index = cfs->get_u2_fast(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2816 |
u2 argument_count = cfs->get_u2_fast(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2817 |
check_property( |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2818 |
valid_cp_range(bootstrap_method_index, cp_size) && |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2819 |
_cp->tag_at(bootstrap_method_index).is_method_handle(), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2820 |
"bootstrap_method_index %u has bad constant type in class file %s", |
7709 | 2821 |
bootstrap_method_index, |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2822 |
CHECK); |
27023 | 2823 |
|
2824 |
guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(), |
|
2825 |
"Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s", |
|
2826 |
CHECK); |
|
2827 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2828 |
operands->at_put(operand_fill_index++, bootstrap_method_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2829 |
operands->at_put(operand_fill_index++, argument_count); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2830 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2831 |
cfs->guarantee_more(sizeof(u2) * argument_count, CHECK); // argv[argc] |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2832 |
for (int j = 0; j < argument_count; j++) { |
7709 | 2833 |
u2 argument_index = cfs->get_u2_fast(); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2834 |
check_property( |
7709 | 2835 |
valid_cp_range(argument_index, cp_size) && |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2836 |
_cp->tag_at(argument_index).is_loadable_constant(), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2837 |
"argument_index %u has bad constant type in class file %s", |
7709 | 2838 |
argument_index, |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2839 |
CHECK); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2840 |
operands->at_put(operand_fill_index++, argument_index); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2841 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2842 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2843 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2844 |
u1* current_end = cfs->current(); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2845 |
guarantee_property(current_end == current_start + attribute_byte_length, |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2846 |
"Bad length on BootstrapMethods in class file %s", |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2847 |
CHECK); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2848 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2849 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2850 |
void ClassFileParser::parse_classfile_attributes(ClassFileParser::ClassAnnotationCollector* parsed_annotations, |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2851 |
TRAPS) { |
1 | 2852 |
ClassFileStream* cfs = stream(); |
2853 |
// Set inner classes attribute to default sentinel |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2854 |
_inner_classes = Universe::the_empty_short_array(); |
1 | 2855 |
cfs->guarantee_more(2, CHECK); // attributes_count |
2856 |
u2 attributes_count = cfs->get_u2_fast(); |
|
2857 |
bool parsed_sourcefile_attribute = false; |
|
2858 |
bool parsed_innerclasses_attribute = false; |
|
2859 |
bool parsed_enclosingmethod_attribute = false; |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2860 |
bool parsed_bootstrap_methods_attribute = false; |
1 | 2861 |
u1* runtime_visible_annotations = NULL; |
2862 |
int runtime_visible_annotations_length = 0; |
|
2863 |
u1* runtime_invisible_annotations = NULL; |
|
2864 |
int runtime_invisible_annotations_length = 0; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2865 |
u1* runtime_visible_type_annotations = NULL; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2866 |
int runtime_visible_type_annotations_length = 0; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2867 |
u1* runtime_invisible_type_annotations = NULL; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2868 |
int runtime_invisible_type_annotations_length = 0; |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2869 |
bool runtime_invisible_type_annotations_exists = false; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2870 |
bool runtime_invisible_annotations_exists = false; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2871 |
bool parsed_source_debug_ext_annotations_exist = false; |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2872 |
u1* inner_classes_attribute_start = NULL; |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2873 |
u4 inner_classes_attribute_length = 0; |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2874 |
u2 enclosing_method_class_index = 0; |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2875 |
u2 enclosing_method_method_index = 0; |
1 | 2876 |
// Iterate over attributes |
2877 |
while (attributes_count--) { |
|
2878 |
cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length |
|
2879 |
u2 attribute_name_index = cfs->get_u2_fast(); |
|
2880 |
u4 attribute_length = cfs->get_u4_fast(); |
|
2881 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2882 |
valid_symbol_at(attribute_name_index), |
1 | 2883 |
"Attribute name has bad constant pool index %u in class file %s", |
2884 |
attribute_name_index, CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2885 |
Symbol* tag = _cp->symbol_at(attribute_name_index); |
1 | 2886 |
if (tag == vmSymbols::tag_source_file()) { |
2887 |
// Check for SourceFile tag |
|
2888 |
if (_need_verify) { |
|
2889 |
guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK); |
|
2890 |
} |
|
2891 |
if (parsed_sourcefile_attribute) { |
|
2892 |
classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK); |
|
2893 |
} else { |
|
2894 |
parsed_sourcefile_attribute = true; |
|
2895 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2896 |
parse_classfile_sourcefile_attribute(CHECK); |
1 | 2897 |
} else if (tag == vmSymbols::tag_source_debug_extension()) { |
2898 |
// Check for SourceDebugExtension tag |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2899 |
if (parsed_source_debug_ext_annotations_exist) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2900 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2901 |
"Multiple SourceDebugExtension attributes in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2902 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2903 |
parsed_source_debug_ext_annotations_exist = true; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2904 |
parse_classfile_source_debug_extension_attribute((int)attribute_length, CHECK); |
1 | 2905 |
} else if (tag == vmSymbols::tag_inner_classes()) { |
2906 |
// Check for InnerClasses tag |
|
2907 |
if (parsed_innerclasses_attribute) { |
|
2908 |
classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK); |
|
2909 |
} else { |
|
2910 |
parsed_innerclasses_attribute = true; |
|
2911 |
} |
|
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2912 |
inner_classes_attribute_start = cfs->get_u1_buffer(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2913 |
inner_classes_attribute_length = attribute_length; |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2914 |
cfs->skip_u1(inner_classes_attribute_length, CHECK); |
1 | 2915 |
} else if (tag == vmSymbols::tag_synthetic()) { |
2916 |
// Check for Synthetic tag |
|
2917 |
// Shouldn't we check that the synthetic flags wasn't already set? - not required in spec |
|
2918 |
if (attribute_length != 0) { |
|
2919 |
classfile_parse_error( |
|
2920 |
"Invalid Synthetic classfile attribute length %u in class file %s", |
|
2921 |
attribute_length, CHECK); |
|
2922 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2923 |
parse_classfile_synthetic_attribute(CHECK); |
1 | 2924 |
} else if (tag == vmSymbols::tag_deprecated()) { |
2925 |
// Check for Deprecatd tag - 4276120 |
|
2926 |
if (attribute_length != 0) { |
|
2927 |
classfile_parse_error( |
|
2928 |
"Invalid Deprecated classfile attribute length %u in class file %s", |
|
2929 |
attribute_length, CHECK); |
|
2930 |
} |
|
2931 |
} else if (_major_version >= JAVA_1_5_VERSION) { |
|
2932 |
if (tag == vmSymbols::tag_signature()) { |
|
2933 |
if (attribute_length != 2) { |
|
2934 |
classfile_parse_error( |
|
2935 |
"Wrong Signature attribute length %u in class file %s", |
|
2936 |
attribute_length, CHECK); |
|
2937 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2938 |
parse_classfile_signature_attribute(CHECK); |
1 | 2939 |
} else if (tag == vmSymbols::tag_runtime_visible_annotations()) { |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2940 |
if (runtime_visible_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2941 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2942 |
"Multiple RuntimeVisibleAnnotations attributes in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2943 |
} |
1 | 2944 |
runtime_visible_annotations_length = attribute_length; |
2945 |
runtime_visible_annotations = cfs->get_u1_buffer(); |
|
2946 |
assert(runtime_visible_annotations != NULL, "null visible annotations"); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2947 |
parse_annotations(runtime_visible_annotations, |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2948 |
runtime_visible_annotations_length, |
31366
67eccccbb2ca
8042041: https://bugs.openjdk.java.net/browse/JDK-8042041
hseigel
parents:
30764
diff
changeset
|
2949 |
parsed_annotations); |
1 | 2950 |
cfs->skip_u1(runtime_visible_annotations_length, CHECK); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2951 |
} else if (tag == vmSymbols::tag_runtime_invisible_annotations()) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2952 |
if (runtime_invisible_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2953 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2954 |
"Multiple RuntimeInvisibleAnnotations attributes in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2955 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2956 |
runtime_invisible_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2957 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2958 |
runtime_invisible_annotations_length = attribute_length; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2959 |
runtime_invisible_annotations = cfs->get_u1_buffer(); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2960 |
assert(runtime_invisible_annotations != NULL, "null invisible annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2961 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2962 |
cfs->skip_u1(attribute_length, CHECK); |
1 | 2963 |
} else if (tag == vmSymbols::tag_enclosing_method()) { |
2964 |
if (parsed_enclosingmethod_attribute) { |
|
2965 |
classfile_parse_error("Multiple EnclosingMethod attributes in class file %s", CHECK); |
|
25054
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
2966 |
} else { |
1 | 2967 |
parsed_enclosingmethod_attribute = true; |
2968 |
} |
|
25054
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
2969 |
guarantee_property(attribute_length == 4, |
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
2970 |
"Wrong EnclosingMethod attribute length %u in class file %s", |
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
2971 |
attribute_length, CHECK); |
1 | 2972 |
cfs->guarantee_more(4, CHECK); // class_index, method_index |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2973 |
enclosing_method_class_index = cfs->get_u2_fast(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2974 |
enclosing_method_method_index = cfs->get_u2_fast(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2975 |
if (enclosing_method_class_index == 0) { |
1 | 2976 |
classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK); |
2977 |
} |
|
2978 |
// Validate the constant pool indices and types |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2979 |
check_property(valid_klass_reference_at(enclosing_method_class_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2980 |
"Invalid or out-of-bounds class index in EnclosingMethod attribute in class file %s", CHECK); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
2981 |
if (enclosing_method_method_index != 0 && |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2982 |
(!_cp->is_within_bounds(enclosing_method_method_index) || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2983 |
!_cp->tag_at(enclosing_method_method_index).is_name_and_type())) { |
1 | 2984 |
classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK); |
2985 |
} |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2986 |
} else if (tag == vmSymbols::tag_bootstrap_methods() && |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2987 |
_major_version >= Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2988 |
if (parsed_bootstrap_methods_attribute) |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2989 |
classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
2990 |
parsed_bootstrap_methods_attribute = true; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2991 |
parse_classfile_bootstrap_methods_attribute(attribute_length, CHECK); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2992 |
} else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) { |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2993 |
if (runtime_visible_type_annotations != NULL) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2994 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2995 |
"Multiple RuntimeVisibleTypeAnnotations attributes in class file %s", CHECK); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2996 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2997 |
runtime_visible_type_annotations_length = attribute_length; |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2998 |
runtime_visible_type_annotations = cfs->get_u1_buffer(); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2999 |
assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3000 |
// No need for the VM to parse Type annotations |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3001 |
cfs->skip_u1(runtime_visible_type_annotations_length, CHECK); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3002 |
} else if (tag == vmSymbols::tag_runtime_invisible_type_annotations()) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3003 |
if (runtime_invisible_type_annotations_exists) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3004 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3005 |
"Multiple RuntimeInvisibleTypeAnnotations attributes in class file %s", CHECK); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3006 |
} else { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3007 |
runtime_invisible_type_annotations_exists = true; |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3008 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3009 |
if (PreserveAllAnnotations) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3010 |
runtime_invisible_type_annotations_length = attribute_length; |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3011 |
runtime_invisible_type_annotations = cfs->get_u1_buffer(); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3012 |
assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations"); |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3013 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3014 |
cfs->skip_u1(attribute_length, CHECK); |
1 | 3015 |
} else { |
3016 |
// Unknown attribute |
|
3017 |
cfs->skip_u1(attribute_length, CHECK); |
|
3018 |
} |
|
3019 |
} else { |
|
3020 |
// Unknown attribute |
|
3021 |
cfs->skip_u1(attribute_length, CHECK); |
|
3022 |
} |
|
3023 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3024 |
_annotations = assemble_annotations(runtime_visible_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3025 |
runtime_visible_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3026 |
runtime_invisible_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3027 |
runtime_invisible_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3028 |
CHECK); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3029 |
_type_annotations = assemble_annotations(runtime_visible_type_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3030 |
runtime_visible_type_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3031 |
runtime_invisible_type_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3032 |
runtime_invisible_type_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3033 |
CHECK); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3034 |
|
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3035 |
if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3036 |
u2 num_of_classes = parse_classfile_inner_classes_attribute( |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3037 |
inner_classes_attribute_start, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3038 |
parsed_innerclasses_attribute, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3039 |
enclosing_method_class_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3040 |
enclosing_method_method_index, |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3041 |
CHECK); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3042 |
if (parsed_innerclasses_attribute &&_need_verify && _major_version >= JAVA_1_5_VERSION) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3043 |
guarantee_property( |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3044 |
inner_classes_attribute_length == sizeof(num_of_classes) + 4 * sizeof(u2) * num_of_classes, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3045 |
"Wrong InnerClasses attribute length in class file %s", CHECK); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3046 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3047 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3048 |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3049 |
if (_max_bootstrap_specifier_index >= 0) { |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3050 |
guarantee_property(parsed_bootstrap_methods_attribute, |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3051 |
"Missing BootstrapMethods attribute in class file %s", CHECK); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3052 |
} |
1 | 3053 |
} |
3054 |
||
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3055 |
void ClassFileParser::apply_parsed_class_attributes(instanceKlassHandle k) { |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3056 |
if (_synthetic_flag) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3057 |
k->set_is_synthetic(); |
19326
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
3058 |
if (_sourcefile_index != 0) { |
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
3059 |
k->set_source_file_name_index(_sourcefile_index); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3060 |
} |
19326
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
3061 |
if (_generic_signature_index != 0) { |
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
3062 |
k->set_generic_signature_index(_generic_signature_index); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3063 |
} |
13295 | 3064 |
if (_sde_buffer != NULL) { |
3065 |
k->set_source_debug_extension(_sde_buffer, _sde_length); |
|
3066 |
} |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3067 |
} |
1 | 3068 |
|
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3069 |
// Create the Annotations object that will |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3070 |
// hold the annotations array for the Klass. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3071 |
void ClassFileParser::create_combined_annotations(TRAPS) { |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3072 |
if (_annotations == NULL && |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3073 |
_type_annotations == NULL && |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3074 |
_fields_annotations == NULL && |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3075 |
_fields_type_annotations == NULL) { |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3076 |
// Don't create the Annotations object unnecessarily. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3077 |
return; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3078 |
} |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3079 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3080 |
Annotations* annotations = Annotations::allocate(_loader_data, CHECK); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3081 |
annotations->set_class_annotations(_annotations); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3082 |
annotations->set_class_type_annotations(_type_annotations); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3083 |
annotations->set_fields_annotations(_fields_annotations); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3084 |
annotations->set_fields_type_annotations(_fields_type_annotations); |
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3085 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3086 |
// This is the Annotations object that will be |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3087 |
// assigned to InstanceKlass being constructed. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3088 |
_combined_annotations = annotations; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3089 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3090 |
// The annotations arrays below has been transfered the |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3091 |
// _combined_annotations so these fields can now be cleared. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3092 |
_annotations = NULL; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3093 |
_type_annotations = NULL; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3094 |
_fields_annotations = NULL; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3095 |
_fields_type_annotations = NULL; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3096 |
} |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3097 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3098 |
// Transfer ownership of metadata allocated to the InstanceKlass. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3099 |
void ClassFileParser::apply_parsed_class_metadata( |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3100 |
instanceKlassHandle this_klass, |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3101 |
int java_fields_count, TRAPS) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3102 |
_cp->set_pool_holder(this_klass()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3103 |
this_klass->set_constants(_cp); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3104 |
this_klass->set_fields(_fields, java_fields_count); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3105 |
this_klass->set_methods(_methods); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3106 |
this_klass->set_inner_classes(_inner_classes); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3107 |
this_klass->set_local_interfaces(_local_interfaces); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3108 |
this_klass->set_transitive_interfaces(_transitive_interfaces); |
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3109 |
this_klass->set_annotations(_combined_annotations); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3110 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3111 |
// Clear out these fields so they don't get deallocated by the destructor |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3112 |
clear_class_metadata(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3113 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3114 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3115 |
AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annotations, |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3116 |
int runtime_visible_annotations_length, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3117 |
u1* runtime_invisible_annotations, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3118 |
int runtime_invisible_annotations_length, TRAPS) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3119 |
AnnotationArray* annotations = NULL; |
1 | 3120 |
if (runtime_visible_annotations != NULL || |
3121 |
runtime_invisible_annotations != NULL) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3122 |
annotations = MetadataFactory::new_array<u1>(_loader_data, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3123 |
runtime_visible_annotations_length + |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3124 |
runtime_invisible_annotations_length, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3125 |
CHECK_(annotations)); |
1 | 3126 |
if (runtime_visible_annotations != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3127 |
for (int i = 0; i < runtime_visible_annotations_length; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3128 |
annotations->at_put(i, runtime_visible_annotations[i]); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3129 |
} |
1 | 3130 |
} |
3131 |
if (runtime_invisible_annotations != NULL) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3132 |
for (int i = 0; i < runtime_invisible_annotations_length; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3133 |
int append = runtime_visible_annotations_length+i; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3134 |
annotations->at_put(append, runtime_invisible_annotations[i]); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3135 |
} |
1 | 3136 |
} |
3137 |
} |
|
3138 |
return annotations; |
|
3139 |
} |
|
3140 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3141 |
instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3142 |
TRAPS) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3143 |
instanceKlassHandle super_klass; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3144 |
if (super_class_index == 0) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3145 |
check_property(_class_name == vmSymbols::java_lang_Object(), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3146 |
"Invalid superclass index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3147 |
super_class_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3148 |
CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3149 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3150 |
check_property(valid_klass_reference_at(super_class_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3151 |
"Invalid superclass index %u in class file %s", |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3152 |
super_class_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3153 |
CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3154 |
// The class name should be legal because it is checked when parsing constant pool. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3155 |
// However, make sure it is not an array type. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3156 |
bool is_array = false; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3157 |
if (_cp->tag_at(super_class_index).is_klass()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3158 |
super_klass = instanceKlassHandle(THREAD, _cp->resolved_klass_at(super_class_index)); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3159 |
if (_need_verify) |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3160 |
is_array = super_klass->oop_is_array(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3161 |
} else if (_need_verify) { |
25325 | 3162 |
is_array = (_cp->klass_name_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3163 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3164 |
if (_need_verify) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3165 |
guarantee_property(!is_array, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3166 |
"Bad superclass name in class file %s", CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3167 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3168 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3169 |
return super_klass; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3170 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3171 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3172 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3173 |
// Values needed for oopmap and InstanceKlass creation |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3174 |
class FieldLayoutInfo : public StackObj { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3175 |
public: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3176 |
int* nonstatic_oop_offsets; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3177 |
unsigned int* nonstatic_oop_counts; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3178 |
unsigned int nonstatic_oop_map_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3179 |
unsigned int total_oop_map_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3180 |
int instance_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3181 |
int nonstatic_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3182 |
int static_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3183 |
bool has_nonstatic_fields; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3184 |
}; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3185 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3186 |
// Layout fields and fill in FieldLayoutInfo. Could use more refactoring! |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3187 |
void ClassFileParser::layout_fields(Handle class_loader, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3188 |
FieldAllocationCount* fac, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3189 |
ClassAnnotationCollector* parsed_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3190 |
FieldLayoutInfo* info, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3191 |
TRAPS) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3192 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3193 |
// Field size and offset computation |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3194 |
int nonstatic_field_size = _super_klass() == NULL ? 0 : _super_klass()->nonstatic_field_size(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3195 |
int next_static_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3196 |
int next_static_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3197 |
int next_static_word_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3198 |
int next_static_short_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3199 |
int next_static_byte_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3200 |
int next_nonstatic_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3201 |
int next_nonstatic_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3202 |
int next_nonstatic_word_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3203 |
int next_nonstatic_short_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3204 |
int next_nonstatic_byte_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3205 |
int first_nonstatic_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3206 |
int next_nonstatic_field_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3207 |
int next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3208 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3209 |
// Count the contended fields by type. |
17612 | 3210 |
// |
3211 |
// We ignore static fields, because @Contended is not supported for them. |
|
3212 |
// The layout code below will also ignore the static fields. |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3213 |
int nonstatic_contended_count = 0; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3214 |
FieldAllocationCount fac_contended; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3215 |
for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3216 |
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3217 |
if (fs.is_contended()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3218 |
fac_contended.count[atype]++; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3219 |
if (!fs.access_flags().is_static()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3220 |
nonstatic_contended_count++; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3221 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3222 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3223 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3224 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3225 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3226 |
// Calculate the starting byte offsets |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3227 |
next_static_oop_offset = InstanceMirrorKlass::offset_of_static_fields(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3228 |
next_static_double_offset = next_static_oop_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3229 |
((fac->count[STATIC_OOP]) * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3230 |
if ( fac->count[STATIC_DOUBLE] && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3231 |
(Universe::field_type_should_be_aligned(T_DOUBLE) || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3232 |
Universe::field_type_should_be_aligned(T_LONG)) ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3233 |
next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3234 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3235 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3236 |
next_static_word_offset = next_static_double_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3237 |
((fac->count[STATIC_DOUBLE]) * BytesPerLong); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3238 |
next_static_short_offset = next_static_word_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3239 |
((fac->count[STATIC_WORD]) * BytesPerInt); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3240 |
next_static_byte_offset = next_static_short_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3241 |
((fac->count[STATIC_SHORT]) * BytesPerShort); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3242 |
|
17612 | 3243 |
int nonstatic_fields_start = instanceOopDesc::base_offset_in_bytes() + |
3244 |
nonstatic_field_size * heapOopSize; |
|
3245 |
||
3246 |
next_nonstatic_field_offset = nonstatic_fields_start; |
|
3247 |
||
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3248 |
bool is_contended_class = parsed_annotations->is_contended(); |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3249 |
|
17612 | 3250 |
// Class is contended, pad before all the fields |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3251 |
if (is_contended_class) { |
17612 | 3252 |
next_nonstatic_field_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3253 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3254 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3255 |
// Compute the non-contended fields count. |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3256 |
// The packing code below relies on these counts to determine if some field |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3257 |
// can be squeezed into the alignment gap. Contended fields are obviously |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3258 |
// exempt from that. |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3259 |
unsigned int nonstatic_double_count = fac->count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE]; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3260 |
unsigned int nonstatic_word_count = fac->count[NONSTATIC_WORD] - fac_contended.count[NONSTATIC_WORD]; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3261 |
unsigned int nonstatic_short_count = fac->count[NONSTATIC_SHORT] - fac_contended.count[NONSTATIC_SHORT]; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3262 |
unsigned int nonstatic_byte_count = fac->count[NONSTATIC_BYTE] - fac_contended.count[NONSTATIC_BYTE]; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3263 |
unsigned int nonstatic_oop_count = fac->count[NONSTATIC_OOP] - fac_contended.count[NONSTATIC_OOP]; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3264 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3265 |
// Total non-static fields count, including every contended field |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3266 |
unsigned int nonstatic_fields_count = fac->count[NONSTATIC_DOUBLE] + fac->count[NONSTATIC_WORD] + |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3267 |
fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] + |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3268 |
fac->count[NONSTATIC_OOP]; |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3269 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3270 |
bool super_has_nonstatic_fields = |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3271 |
(_super_klass() != NULL && _super_klass->has_nonstatic_fields()); |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3272 |
bool has_nonstatic_fields = super_has_nonstatic_fields || (nonstatic_fields_count != 0); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3273 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3274 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3275 |
// Prepare list of oops for oop map generation. |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3276 |
// |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3277 |
// "offset" and "count" lists are describing the set of contiguous oop |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3278 |
// regions. offset[i] is the start of the i-th region, which then has |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3279 |
// count[i] oops following. Before we know how many regions are required, |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3280 |
// we pessimistically allocate the maps to fit all the oops into the |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3281 |
// distinct regions. |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3282 |
// |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3283 |
// TODO: We add +1 to always allocate non-zero resource arrays; we need |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3284 |
// to figure out if we still need to do this. |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3285 |
int* nonstatic_oop_offsets; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3286 |
unsigned int* nonstatic_oop_counts; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3287 |
unsigned int nonstatic_oop_map_count = 0; |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3288 |
unsigned int max_nonstatic_oop_maps = fac->count[NONSTATIC_OOP] + 1; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3289 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3290 |
nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD( |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3291 |
THREAD, int, max_nonstatic_oop_maps); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3292 |
nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD( |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3293 |
THREAD, unsigned int, max_nonstatic_oop_maps); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3294 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3295 |
first_nonstatic_oop_offset = 0; // will be set for first oop field |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3296 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3297 |
bool compact_fields = CompactFields; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3298 |
int allocation_style = FieldsAllocationStyle; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3299 |
if( allocation_style < 0 || allocation_style > 2 ) { // Out of range? |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3300 |
assert(false, "0 <= FieldsAllocationStyle <= 2"); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3301 |
allocation_style = 1; // Optimistic |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3302 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3303 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3304 |
// The next classes have predefined hard-coded fields offsets |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3305 |
// (see in JavaClasses::compute_hard_coded_offsets()). |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3306 |
// Use default fields allocation order for them. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3307 |
if( (allocation_style != 0 || compact_fields ) && class_loader.is_null() && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3308 |
(_class_name == vmSymbols::java_lang_AssertionStatusDirectives() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3309 |
_class_name == vmSymbols::java_lang_Class() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3310 |
_class_name == vmSymbols::java_lang_ClassLoader() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3311 |
_class_name == vmSymbols::java_lang_ref_Reference() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3312 |
_class_name == vmSymbols::java_lang_ref_SoftReference() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3313 |
_class_name == vmSymbols::java_lang_StackTraceElement() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3314 |
_class_name == vmSymbols::java_lang_String() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3315 |
_class_name == vmSymbols::java_lang_Throwable() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3316 |
_class_name == vmSymbols::java_lang_Boolean() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3317 |
_class_name == vmSymbols::java_lang_Character() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3318 |
_class_name == vmSymbols::java_lang_Float() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3319 |
_class_name == vmSymbols::java_lang_Double() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3320 |
_class_name == vmSymbols::java_lang_Byte() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3321 |
_class_name == vmSymbols::java_lang_Short() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3322 |
_class_name == vmSymbols::java_lang_Integer() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3323 |
_class_name == vmSymbols::java_lang_Long())) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3324 |
allocation_style = 0; // Allocate oops first |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3325 |
compact_fields = false; // Don't compact fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3326 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3327 |
|
17612 | 3328 |
// Rearrange fields for a given allocation style |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3329 |
if( allocation_style == 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3330 |
// Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3331 |
next_nonstatic_oop_offset = next_nonstatic_field_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3332 |
next_nonstatic_double_offset = next_nonstatic_oop_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3333 |
(nonstatic_oop_count * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3334 |
} else if( allocation_style == 1 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3335 |
// Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3336 |
next_nonstatic_double_offset = next_nonstatic_field_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3337 |
} else if( allocation_style == 2 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3338 |
// Fields allocation: oops fields in super and sub classes are together. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3339 |
if( nonstatic_field_size > 0 && _super_klass() != NULL && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3340 |
_super_klass->nonstatic_oop_map_size() > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3341 |
unsigned int map_count = _super_klass->nonstatic_oop_map_count(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3342 |
OopMapBlock* first_map = _super_klass->start_of_nonstatic_oop_maps(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3343 |
OopMapBlock* last_map = first_map + map_count - 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3344 |
int next_offset = last_map->offset() + (last_map->count() * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3345 |
if (next_offset == next_nonstatic_field_offset) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3346 |
allocation_style = 0; // allocate oops first |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3347 |
next_nonstatic_oop_offset = next_nonstatic_field_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3348 |
next_nonstatic_double_offset = next_nonstatic_oop_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3349 |
(nonstatic_oop_count * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3350 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3351 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3352 |
if( allocation_style == 2 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3353 |
allocation_style = 1; // allocate oops last |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3354 |
next_nonstatic_double_offset = next_nonstatic_field_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3355 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3356 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3357 |
ShouldNotReachHere(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3358 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3359 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3360 |
int nonstatic_oop_space_count = 0; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3361 |
int nonstatic_word_space_count = 0; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3362 |
int nonstatic_short_space_count = 0; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3363 |
int nonstatic_byte_space_count = 0; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3364 |
int nonstatic_oop_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3365 |
int nonstatic_word_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3366 |
int nonstatic_short_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3367 |
int nonstatic_byte_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3368 |
|
17612 | 3369 |
// Try to squeeze some of the fields into the gaps due to |
3370 |
// long/double alignment. |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3371 |
if( nonstatic_double_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3372 |
int offset = next_nonstatic_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3373 |
next_nonstatic_double_offset = align_size_up(offset, BytesPerLong); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3374 |
if( compact_fields && offset != next_nonstatic_double_offset ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3375 |
// Allocate available fields into the gap before double field. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3376 |
int length = next_nonstatic_double_offset - offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3377 |
assert(length == BytesPerInt, ""); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3378 |
nonstatic_word_space_offset = offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3379 |
if( nonstatic_word_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3380 |
nonstatic_word_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3381 |
nonstatic_word_space_count = 1; // Only one will fit |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3382 |
length -= BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3383 |
offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3384 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3385 |
nonstatic_short_space_offset = offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3386 |
while( length >= BytesPerShort && nonstatic_short_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3387 |
nonstatic_short_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3388 |
nonstatic_short_space_count += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3389 |
length -= BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3390 |
offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3391 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3392 |
nonstatic_byte_space_offset = offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3393 |
while( length > 0 && nonstatic_byte_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3394 |
nonstatic_byte_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3395 |
nonstatic_byte_space_count += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3396 |
length -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3397 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3398 |
// Allocate oop field in the gap if there are no other fields for that. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3399 |
nonstatic_oop_space_offset = offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3400 |
if( length >= heapOopSize && nonstatic_oop_count > 0 && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3401 |
allocation_style != 0 ) { // when oop fields not first |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3402 |
nonstatic_oop_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3403 |
nonstatic_oop_space_count = 1; // Only one will fit |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3404 |
length -= heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3405 |
offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3406 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3407 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3408 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3409 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3410 |
next_nonstatic_word_offset = next_nonstatic_double_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3411 |
(nonstatic_double_count * BytesPerLong); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3412 |
next_nonstatic_short_offset = next_nonstatic_word_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3413 |
(nonstatic_word_count * BytesPerInt); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3414 |
next_nonstatic_byte_offset = next_nonstatic_short_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3415 |
(nonstatic_short_count * BytesPerShort); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3416 |
next_nonstatic_padded_offset = next_nonstatic_byte_offset + |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3417 |
nonstatic_byte_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3418 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3419 |
// let oops jump before padding with this allocation style |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3420 |
if( allocation_style == 1 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3421 |
next_nonstatic_oop_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3422 |
if( nonstatic_oop_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3423 |
next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3424 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3425 |
next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3426 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3427 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3428 |
// Iterate over fields again and compute correct offsets. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3429 |
// The field allocation type was temporarily stored in the offset slot. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3430 |
// oop fields are located before non-oop fields (static and non-static). |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3431 |
for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3432 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3433 |
// skip already laid out fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3434 |
if (fs.is_offset_set()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3435 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3436 |
// contended instance fields are handled below |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3437 |
if (fs.is_contended() && !fs.access_flags().is_static()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3438 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3439 |
int real_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3440 |
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3441 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3442 |
// pack the rest of the fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3443 |
switch (atype) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3444 |
case STATIC_OOP: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3445 |
real_offset = next_static_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3446 |
next_static_oop_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3447 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3448 |
case STATIC_BYTE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3449 |
real_offset = next_static_byte_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3450 |
next_static_byte_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3451 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3452 |
case STATIC_SHORT: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3453 |
real_offset = next_static_short_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3454 |
next_static_short_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3455 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3456 |
case STATIC_WORD: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3457 |
real_offset = next_static_word_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3458 |
next_static_word_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3459 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3460 |
case STATIC_DOUBLE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3461 |
real_offset = next_static_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3462 |
next_static_double_offset += BytesPerLong; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3463 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3464 |
case NONSTATIC_OOP: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3465 |
if( nonstatic_oop_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3466 |
real_offset = nonstatic_oop_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3467 |
nonstatic_oop_space_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3468 |
nonstatic_oop_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3469 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3470 |
real_offset = next_nonstatic_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3471 |
next_nonstatic_oop_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3472 |
} |
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3473 |
|
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3474 |
// Record this oop in the oop maps |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3475 |
if( nonstatic_oop_map_count > 0 && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3476 |
nonstatic_oop_offsets[nonstatic_oop_map_count - 1] == |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3477 |
real_offset - |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3478 |
int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) * |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3479 |
heapOopSize ) { |
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3480 |
// This oop is adjacent to the previous one, add to current oop map |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3481 |
assert(nonstatic_oop_map_count - 1 < max_nonstatic_oop_maps, "range check"); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3482 |
nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3483 |
} else { |
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3484 |
// This oop is not adjacent to the previous one, create new oop map |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3485 |
assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check"); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3486 |
nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3487 |
nonstatic_oop_counts [nonstatic_oop_map_count] = 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3488 |
nonstatic_oop_map_count += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3489 |
if( first_nonstatic_oop_offset == 0 ) { // Undefined |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3490 |
first_nonstatic_oop_offset = real_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3491 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3492 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3493 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3494 |
case NONSTATIC_BYTE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3495 |
if( nonstatic_byte_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3496 |
real_offset = nonstatic_byte_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3497 |
nonstatic_byte_space_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3498 |
nonstatic_byte_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3499 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3500 |
real_offset = next_nonstatic_byte_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3501 |
next_nonstatic_byte_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3502 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3503 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3504 |
case NONSTATIC_SHORT: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3505 |
if( nonstatic_short_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3506 |
real_offset = nonstatic_short_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3507 |
nonstatic_short_space_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3508 |
nonstatic_short_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3509 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3510 |
real_offset = next_nonstatic_short_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3511 |
next_nonstatic_short_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3512 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3513 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3514 |
case NONSTATIC_WORD: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3515 |
if( nonstatic_word_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3516 |
real_offset = nonstatic_word_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3517 |
nonstatic_word_space_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3518 |
nonstatic_word_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3519 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3520 |
real_offset = next_nonstatic_word_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3521 |
next_nonstatic_word_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3522 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3523 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3524 |
case NONSTATIC_DOUBLE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3525 |
real_offset = next_nonstatic_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3526 |
next_nonstatic_double_offset += BytesPerLong; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3527 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3528 |
default: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3529 |
ShouldNotReachHere(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3530 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3531 |
fs.set_offset(real_offset); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3532 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3533 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3534 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3535 |
// Handle the contended cases. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3536 |
// |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3537 |
// Each contended field should not intersect the cache line with another contended field. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3538 |
// In the absence of alignment information, we end up with pessimistically separating |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3539 |
// the fields with full-width padding. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3540 |
// |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3541 |
// Additionally, this should not break alignment for the fields, so we round the alignment up |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3542 |
// for each field. |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3543 |
if (nonstatic_contended_count > 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3544 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3545 |
// if there is at least one contended field, we need to have pre-padding for them |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3546 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3547 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3548 |
// collect all contended groups |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3549 |
BitMap bm(_cp->size()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3550 |
for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3551 |
// skip already laid out fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3552 |
if (fs.is_offset_set()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3553 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3554 |
if (fs.is_contended()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3555 |
bm.set_bit(fs.contended_group()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3556 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3557 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3558 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3559 |
int current_group = -1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3560 |
while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3561 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3562 |
for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3563 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3564 |
// skip already laid out fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3565 |
if (fs.is_offset_set()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3566 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3567 |
// skip non-contended fields and fields from different group |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3568 |
if (!fs.is_contended() || (fs.contended_group() != current_group)) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3569 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3570 |
// handle statics below |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3571 |
if (fs.access_flags().is_static()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3572 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3573 |
int real_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3574 |
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3575 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3576 |
switch (atype) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3577 |
case NONSTATIC_BYTE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3578 |
next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3579 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3580 |
next_nonstatic_padded_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3581 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3582 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3583 |
case NONSTATIC_SHORT: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3584 |
next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3585 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3586 |
next_nonstatic_padded_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3587 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3588 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3589 |
case NONSTATIC_WORD: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3590 |
next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3591 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3592 |
next_nonstatic_padded_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3593 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3594 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3595 |
case NONSTATIC_DOUBLE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3596 |
next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3597 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3598 |
next_nonstatic_padded_offset += BytesPerLong; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3599 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3600 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3601 |
case NONSTATIC_OOP: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3602 |
next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3603 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3604 |
next_nonstatic_padded_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3605 |
|
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3606 |
// Record this oop in the oop maps |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3607 |
if( nonstatic_oop_map_count > 0 && |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3608 |
nonstatic_oop_offsets[nonstatic_oop_map_count - 1] == |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3609 |
real_offset - |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3610 |
int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) * |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3611 |
heapOopSize ) { |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3612 |
// This oop is adjacent to the previous one, add to current oop map |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3613 |
assert(nonstatic_oop_map_count - 1 < max_nonstatic_oop_maps, "range check"); |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3614 |
nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1; |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3615 |
} else { |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3616 |
// This oop is not adjacent to the previous one, create new oop map |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3617 |
assert(nonstatic_oop_map_count < max_nonstatic_oop_maps, "range check"); |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3618 |
nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset; |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3619 |
nonstatic_oop_counts [nonstatic_oop_map_count] = 1; |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3620 |
nonstatic_oop_map_count += 1; |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3621 |
if( first_nonstatic_oop_offset == 0 ) { // Undefined |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3622 |
first_nonstatic_oop_offset = real_offset; |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
3623 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3624 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3625 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3626 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3627 |
default: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3628 |
ShouldNotReachHere(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3629 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3630 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3631 |
if (fs.contended_group() == 0) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3632 |
// Contended group defines the equivalence class over the fields: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3633 |
// the fields within the same contended group are not inter-padded. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3634 |
// The only exception is default group, which does not incur the |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3635 |
// equivalence, and so requires intra-padding. |
17612 | 3636 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3637 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3638 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3639 |
fs.set_offset(real_offset); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3640 |
} // for |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3641 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3642 |
// Start laying out the next group. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3643 |
// Note that this will effectively pad the last group in the back; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3644 |
// this is expected to alleviate memory contention effects for |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3645 |
// subclass fields and/or adjacent object. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3646 |
// If this was the default group, the padding is already in place. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3647 |
if (current_group != 0) { |
17612 | 3648 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3649 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3650 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3651 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3652 |
// handle static fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3653 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3654 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3655 |
// Entire class is contended, pad in the back. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3656 |
// This helps to alleviate memory contention effects for subclass fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3657 |
// and/or adjacent object. |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3658 |
if (is_contended_class) { |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3659 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3660 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3661 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3662 |
int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset; |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3663 |
|
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3664 |
int nonstatic_fields_end = align_size_up(notaligned_nonstatic_fields_end, heapOopSize); |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3665 |
int instance_end = align_size_up(notaligned_nonstatic_fields_end, wordSize); |
17612 | 3666 |
int static_fields_end = align_size_up(next_static_byte_offset, wordSize); |
3667 |
||
3668 |
int static_field_size = (static_fields_end - |
|
3669 |
InstanceMirrorKlass::offset_of_static_fields()) / wordSize; |
|
3670 |
nonstatic_field_size = nonstatic_field_size + |
|
3671 |
(nonstatic_fields_end - nonstatic_fields_start) / heapOopSize; |
|
3672 |
||
3673 |
int instance_size = align_object_size(instance_end / wordSize); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3674 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3675 |
assert(instance_size == align_object_size(align_size_up( |
17601
0db4dfbb42ca
8012939: @Contended doesn't work correctly with inheritance
shade
parents:
17374
diff
changeset
|
3676 |
(instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize), |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3677 |
wordSize) / wordSize), "consistent layout helper value"); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3678 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3679 |
// Invariant: nonstatic_field end/start should only change if there are |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3680 |
// nonstatic fields in the class, or if the class is contended. We compare |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3681 |
// against the non-aligned value, so that end alignment will not fail the |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3682 |
// assert without actually having the fields. |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3683 |
assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) || |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3684 |
is_contended_class || |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3685 |
(nonstatic_fields_count > 0), "double-check nonstatic start/end"); |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3686 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3687 |
// Number of non-static oop map blocks allocated at end of klass. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3688 |
const unsigned int total_oop_map_count = |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3689 |
compute_oop_map_count(_super_klass, nonstatic_oop_map_count, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3690 |
first_nonstatic_oop_offset); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3691 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3692 |
#ifndef PRODUCT |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3693 |
if (PrintFieldLayout) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3694 |
print_field_layout(_class_name, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3695 |
_fields, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3696 |
_cp, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3697 |
instance_size, |
17612 | 3698 |
nonstatic_fields_start, |
3699 |
nonstatic_fields_end, |
|
3700 |
static_fields_end); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3701 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3702 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3703 |
#endif |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3704 |
// Pass back information needed for InstanceKlass creation |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3705 |
info->nonstatic_oop_offsets = nonstatic_oop_offsets; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3706 |
info->nonstatic_oop_counts = nonstatic_oop_counts; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3707 |
info->nonstatic_oop_map_count = nonstatic_oop_map_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3708 |
info->total_oop_map_count = total_oop_map_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3709 |
info->instance_size = instance_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3710 |
info->static_field_size = static_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3711 |
info->nonstatic_field_size = nonstatic_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3712 |
info->has_nonstatic_fields = has_nonstatic_fields; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3713 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3714 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3715 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3716 |
instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, |
14588
8ec26d2d9339
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
14488
diff
changeset
|
3717 |
ClassLoaderData* loader_data, |
1 | 3718 |
Handle protection_domain, |
2534 | 3719 |
KlassHandle host_klass, |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
3720 |
GrowableArray<Handle>* cp_patches, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3721 |
TempNewSymbol& parsed_name, |
3820
0a8fbbe180db
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
3579
diff
changeset
|
3722 |
bool verify, |
1 | 3723 |
TRAPS) { |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
3724 |
|
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3725 |
// When a retransformable agent is attached, JVMTI caches the |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3726 |
// class bytes that existed before the first retransformation. |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3727 |
// If RedefineClasses() was used before the retransformable |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3728 |
// agent attached, then the cached class bytes may not be the |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3729 |
// original class bytes. |
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
18025
diff
changeset
|
3730 |
JvmtiCachedClassFileData *cached_class_file = NULL; |
14588
8ec26d2d9339
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
14488
diff
changeset
|
3731 |
Handle class_loader(THREAD, loader_data->class_loader()); |
14385 | 3732 |
bool has_default_methods = false; |
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
3733 |
bool declares_default_methods = false; |
14385 | 3734 |
ResourceMark rm(THREAD); |
1 | 3735 |
|
3736 |
ClassFileStream* cfs = stream(); |
|
3737 |
// Timing |
|
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3738 |
assert(THREAD->is_Java_thread(), "must be a JavaThread"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3739 |
JavaThread* jt = (JavaThread*) THREAD; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3740 |
|
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3741 |
PerfClassTraceTime ctimer(ClassLoader::perf_class_parse_time(), |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3742 |
ClassLoader::perf_class_parse_selftime(), |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3743 |
NULL, |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3744 |
jt->get_thread_stat()->perf_recursion_counts_addr(), |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3745 |
jt->get_thread_stat()->perf_timers_addr(), |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
3746 |
PerfClassTraceTime::PARSE_CLASS); |
1 | 3747 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3748 |
init_parsed_class_attributes(loader_data); |
1 | 3749 |
|
3750 |
if (JvmtiExport::should_post_class_file_load_hook()) { |
|
11419
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3751 |
// Get the cached class file bytes (if any) from the class that |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3752 |
// is being redefined or retransformed. We use jvmti_thread_state() |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3753 |
// instead of JvmtiThreadState::state_for(jt) so we don't allocate |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3754 |
// a JvmtiThreadState any earlier than necessary. This will help |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3755 |
// avoid the bug described by 7126851. |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3756 |
JvmtiThreadState *state = jt->jvmti_thread_state(); |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3757 |
if (state != NULL) { |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3758 |
KlassHandle *h_class_being_redefined = |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3759 |
state->get_class_being_redefined(); |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3760 |
if (h_class_being_redefined != NULL) { |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3761 |
instanceKlassHandle ikh_class_being_redefined = |
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3762 |
instanceKlassHandle(THREAD, (*h_class_being_redefined)()); |
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
18025
diff
changeset
|
3763 |
cached_class_file = ikh_class_being_redefined->get_cached_class_file(); |
11419
af92c7669f5a
7127032: fix for 7122253 adds a JvmtiThreadState earlier than necessary
dcubed
parents:
11399
diff
changeset
|
3764 |
} |
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3765 |
} |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3766 |
|
1 | 3767 |
unsigned char* ptr = cfs->buffer(); |
3768 |
unsigned char* end_ptr = cfs->buffer() + cfs->length(); |
|
3769 |
||
14588
8ec26d2d9339
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
14488
diff
changeset
|
3770 |
JvmtiExport::post_class_file_load_hook(name, class_loader(), protection_domain, |
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
18025
diff
changeset
|
3771 |
&ptr, &end_ptr, &cached_class_file); |
1 | 3772 |
|
3773 |
if (ptr != cfs->buffer()) { |
|
3774 |
// JVMTI agent has modified class file data. |
|
3775 |
// Set new class file stream using JVMTI agent modified |
|
3776 |
// class file data. |
|
3777 |
cfs = new ClassFileStream(ptr, end_ptr - ptr, cfs->source()); |
|
3778 |
set_stream(cfs); |
|
3779 |
} |
|
3780 |
} |
|
3781 |
||
2534 | 3782 |
_host_klass = host_klass; |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
3783 |
_cp_patches = cp_patches; |
1 | 3784 |
|
3785 |
instanceKlassHandle nullHandle; |
|
3786 |
||
3787 |
// Figure out whether we can skip format checking (matching classic VM behavior) |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3788 |
if (DumpSharedSpaces) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3789 |
// verify == true means it's a 'remote' class (i.e., non-boot class) |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3790 |
// Verification decision is based on BytecodeVerificationRemote flag |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3791 |
// for those classes. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3792 |
_need_verify = (verify) ? BytecodeVerificationRemote : |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3793 |
BytecodeVerificationLocal; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3794 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3795 |
_need_verify = Verifier::should_verify_for(class_loader(), verify); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3796 |
} |
1 | 3797 |
|
3798 |
// Set the verify flag in stream |
|
3799 |
cfs->set_verify(_need_verify); |
|
3800 |
||
3801 |
// Save the class file name for easier error message printing. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3802 |
_class_name = (name != NULL) ? name : vmSymbols::unknown_class_name(); |
1 | 3803 |
|
3804 |
cfs->guarantee_more(8, CHECK_(nullHandle)); // magic, major, minor |
|
3805 |
// Magic value |
|
3806 |
u4 magic = cfs->get_u4_fast(); |
|
3807 |
guarantee_property(magic == JAVA_CLASSFILE_MAGIC, |
|
3808 |
"Incompatible magic value %u in class file %s", |
|
3809 |
magic, CHECK_(nullHandle)); |
|
3810 |
||
3811 |
// Version numbers |
|
3812 |
u2 minor_version = cfs->get_u2_fast(); |
|
3813 |
u2 major_version = cfs->get_u2_fast(); |
|
3814 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3815 |
if (DumpSharedSpaces && major_version < JAVA_1_5_VERSION) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3816 |
ResourceMark rm; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3817 |
warning("Pre JDK 1.5 class not supported by CDS: %u.%u %s", |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3818 |
major_version, minor_version, name->as_C_string()); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3819 |
Exceptions::fthrow( |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3820 |
THREAD_AND_LOCATION, |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3821 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3822 |
"Unsupported major.minor version for dump time %u.%u", |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3823 |
major_version, |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3824 |
minor_version); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3825 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3826 |
|
1 | 3827 |
// Check version numbers - we check this even with verifier off |
3828 |
if (!is_supported_version(major_version, minor_version)) { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3829 |
if (name == NULL) { |
1 | 3830 |
Exceptions::fthrow( |
3831 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3832 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
22752
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3833 |
"Unsupported class file version %u.%u, " |
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3834 |
"this version of the Java Runtime only recognizes class file versions up to %u.%u", |
1 | 3835 |
major_version, |
22752
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3836 |
minor_version, |
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3837 |
JAVA_MAX_SUPPORTED_VERSION, |
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3838 |
JAVA_MAX_SUPPORTED_MINOR_VERSION); |
1 | 3839 |
} else { |
3840 |
ResourceMark rm(THREAD); |
|
3841 |
Exceptions::fthrow( |
|
3842 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3843 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
22752
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3844 |
"%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), " |
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3845 |
"this version of the Java Runtime only recognizes class file versions up to %u.%u", |
1 | 3846 |
name->as_C_string(), |
3847 |
major_version, |
|
22752
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3848 |
minor_version, |
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3849 |
JAVA_MAX_SUPPORTED_VERSION, |
5796083e0729
8016644: Improve UnsupportedClassVersionError message
ctornqvi
parents:
22534
diff
changeset
|
3850 |
JAVA_MAX_SUPPORTED_MINOR_VERSION); |
1 | 3851 |
} |
3852 |
return nullHandle; |
|
3853 |
} |
|
3854 |
||
3855 |
_major_version = major_version; |
|
3856 |
_minor_version = minor_version; |
|
3857 |
||
3858 |
||
3859 |
// Check if verification needs to be relaxed for this class file |
|
3860 |
// Do not restrict it to jdk1.0 or jdk1.1 to maintain backward compatibility (4982376) |
|
3861 |
_relax_verify = Verifier::relax_verify_for(class_loader()); |
|
3862 |
||
3863 |
// Constant pool |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3864 |
constantPoolHandle cp = parse_constant_pool(CHECK_(nullHandle)); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3865 |
|
1 | 3866 |
int cp_size = cp->length(); |
3867 |
||
3868 |
cfs->guarantee_more(8, CHECK_(nullHandle)); // flags, this_class, super_class, infs_len |
|
3869 |
||
3870 |
// Access flags |
|
3871 |
AccessFlags access_flags; |
|
3872 |
jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS; |
|
3873 |
||
3874 |
if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { |
|
3875 |
// Set abstract bit for old class files for backward compatibility |
|
3876 |
flags |= JVM_ACC_ABSTRACT; |
|
3877 |
} |
|
3878 |
verify_legal_class_modifiers(flags, CHECK_(nullHandle)); |
|
3879 |
access_flags.set_flags(flags); |
|
3880 |
||
3881 |
// This class and superclass |
|
3882 |
u2 this_class_index = cfs->get_u2_fast(); |
|
3883 |
check_property( |
|
3884 |
valid_cp_range(this_class_index, cp_size) && |
|
3885 |
cp->tag_at(this_class_index).is_unresolved_klass(), |
|
3886 |
"Invalid this class index %u in constant pool in class file %s", |
|
3887 |
this_class_index, CHECK_(nullHandle)); |
|
3888 |
||
25325 | 3889 |
Symbol* class_name = cp->klass_name_at(this_class_index); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3890 |
assert(class_name != NULL, "class_name can't be null"); |
1 | 3891 |
|
3892 |
// It's important to set parsed_name *before* resolving the super class. |
|
3893 |
// (it's used for cleanup by the caller if parsing fails) |
|
3894 |
parsed_name = class_name; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3895 |
// parsed_name is returned and can be used if there's an error, so add to |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3896 |
// its reference count. Caller will decrement the refcount. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3897 |
parsed_name->increment_refcount(); |
1 | 3898 |
|
3899 |
// Update _class_name which could be null previously to be class_name |
|
3900 |
_class_name = class_name; |
|
3901 |
||
3902 |
// Don't need to check whether this class name is legal or not. |
|
3903 |
// It has been checked when constant pool is parsed. |
|
3904 |
// However, make sure it is not an array type. |
|
3905 |
if (_need_verify) { |
|
3906 |
guarantee_property(class_name->byte_at(0) != JVM_SIGNATURE_ARRAY, |
|
3907 |
"Bad class name in class file %s", |
|
3908 |
CHECK_(nullHandle)); |
|
3909 |
} |
|
3910 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3911 |
Klass* preserve_this_klass; // for storing result across HandleMark |
1 | 3912 |
|
3913 |
// release all handles when parsing is done |
|
3914 |
{ HandleMark hm(THREAD); |
|
3915 |
||
3916 |
// Checks if name in class file matches requested name |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3917 |
if (name != NULL && class_name != name) { |
1 | 3918 |
ResourceMark rm(THREAD); |
3919 |
Exceptions::fthrow( |
|
3920 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3921 |
vmSymbols::java_lang_NoClassDefFoundError(), |
1 | 3922 |
"%s (wrong name: %s)", |
3923 |
name->as_C_string(), |
|
3924 |
class_name->as_C_string() |
|
3925 |
); |
|
3926 |
return nullHandle; |
|
3927 |
} |
|
3928 |
||
3929 |
if (TraceClassLoadingPreorder) { |
|
17024
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
3930 |
tty->print("[Loading %s", (name != NULL) ? name->as_klass_external_name() : "NoName"); |
1 | 3931 |
if (cfs->source() != NULL) tty->print(" from %s", cfs->source()); |
3932 |
tty->print_cr("]"); |
|
3933 |
} |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3934 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3935 |
if (DumpLoadedClassList != NULL && cfs->source() != NULL && classlist_file->is_open()) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3936 |
// Only dump the classes that can be stored into CDS archive |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3937 |
if (SystemDictionaryShared::is_sharing_possible(loader_data)) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3938 |
if (name != NULL) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3939 |
ResourceMark rm(THREAD); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3940 |
classlist_file->print_cr("%s", name->as_C_string()); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3941 |
classlist_file->flush(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3942 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3943 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3944 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
3945 |
#endif |
1 | 3946 |
|
3947 |
u2 super_class_index = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3948 |
instanceKlassHandle super_klass = parse_super_class(super_class_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3949 |
CHECK_NULL); |
1 | 3950 |
|
3951 |
// Interfaces |
|
3952 |
u2 itfs_len = cfs->get_u2_fast(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3953 |
Array<Klass*>* local_interfaces = |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3954 |
parse_interfaces(itfs_len, protection_domain, _class_name, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3955 |
&has_default_methods, CHECK_(nullHandle)); |
1 | 3956 |
|
11412
62fe312f32c5
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
10546
diff
changeset
|
3957 |
u2 java_fields_count = 0; |
1 | 3958 |
// Fields (offsets are filled in later) |
10546 | 3959 |
FieldAllocationCount fac; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3960 |
Array<u2>* fields = parse_fields(class_name, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3961 |
access_flags.is_interface(), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3962 |
&fac, &java_fields_count, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3963 |
CHECK_(nullHandle)); |
1 | 3964 |
// Methods |
3965 |
bool has_final_method = false; |
|
3966 |
AccessFlags promoted_flags; |
|
3967 |
promoted_flags.set_flags(0); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3968 |
Array<Method*>* methods = parse_methods(access_flags.is_interface(), |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3969 |
&promoted_flags, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3970 |
&has_final_method, |
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
3971 |
&declares_default_methods, |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3972 |
CHECK_(nullHandle)); |
1 | 3973 |
|
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
3974 |
if (declares_default_methods) { |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
3975 |
has_default_methods = true; |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
3976 |
} |
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
3977 |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3978 |
// Additional attributes |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3979 |
ClassAnnotationCollector parsed_annotations; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3980 |
parse_classfile_attributes(&parsed_annotations, CHECK_(nullHandle)); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3981 |
|
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3982 |
// Finalize the Annotations metadata object, |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3983 |
// now that all annotation arrays have been created. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3984 |
create_combined_annotations(CHECK_(nullHandle)); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3985 |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3986 |
// Make sure this is the end of class file stream |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3987 |
guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle)); |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3988 |
|
1 | 3989 |
// We check super class after class file is parsed and format is checked |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
3990 |
if (super_class_index > 0 && super_klass.is_null()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3991 |
Symbol* sk = cp->klass_name_at(super_class_index); |
1 | 3992 |
if (access_flags.is_interface()) { |
3993 |
// Before attempting to resolve the superclass, check for class format |
|
3994 |
// errors not checked yet. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
3995 |
guarantee_property(sk == vmSymbols::java_lang_Object(), |
1 | 3996 |
"Interfaces must have java.lang.Object as superclass in class file %s", |
3997 |
CHECK_(nullHandle)); |
|
3998 |
} |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3999 |
Klass* k = SystemDictionary::resolve_super_or_fail(class_name, sk, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
4000 |
class_loader, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
4001 |
protection_domain, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
4002 |
true, |
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
4003 |
CHECK_(nullHandle)); |
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2534
diff
changeset
|
4004 |
|
1 | 4005 |
KlassHandle kh (THREAD, k); |
4006 |
super_klass = instanceKlassHandle(THREAD, kh()); |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
4007 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
4008 |
if (super_klass.not_null()) { |
14385 | 4009 |
|
4010 |
if (super_klass->has_default_methods()) { |
|
4011 |
has_default_methods = true; |
|
4012 |
} |
|
4013 |
||
1 | 4014 |
if (super_klass->is_interface()) { |
4015 |
ResourceMark rm(THREAD); |
|
4016 |
Exceptions::fthrow( |
|
4017 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4018 |
vmSymbols::java_lang_IncompatibleClassChangeError(), |
1 | 4019 |
"class %s has interface %s as super class", |
4020 |
class_name->as_klass_external_name(), |
|
4021 |
super_klass->external_name() |
|
4022 |
); |
|
4023 |
return nullHandle; |
|
4024 |
} |
|
4025 |
// Make sure super class is not final |
|
4026 |
if (super_klass->is_final()) { |
|
4027 |
THROW_MSG_(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class", nullHandle); |
|
4028 |
} |
|
4029 |
} |
|
4030 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4031 |
// save super klass for error handling. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4032 |
_super_klass = super_klass; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4033 |
|
1 | 4034 |
// Compute the transitive list of all unique interfaces implemented by this class |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4035 |
_transitive_interfaces = |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4036 |
compute_transitive_interfaces(super_klass, local_interfaces, CHECK_(nullHandle)); |
1 | 4037 |
|
4038 |
// sort methods |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4039 |
intArray* method_ordering = sort_methods(methods); |
1 | 4040 |
|
4041 |
// promote flags from parse_methods() to the klass' flags |
|
4042 |
access_flags.add_promoted_flags(promoted_flags.as_int()); |
|
4043 |
||
4044 |
// Size of Java vtable (in words) |
|
4045 |
int vtable_size = 0; |
|
4046 |
int itable_size = 0; |
|
4047 |
int num_miranda_methods = 0; |
|
4048 |
||
14385 | 4049 |
GrowableArray<Method*> all_mirandas(20); |
4050 |
||
4051 |
klassVtable::compute_vtable_size_and_num_mirandas( |
|
4052 |
&vtable_size, &num_miranda_methods, &all_mirandas, super_klass(), methods, |
|
4053 |
access_flags, class_loader, class_name, local_interfaces, |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2105
diff
changeset
|
4054 |
CHECK_(nullHandle)); |
1 | 4055 |
|
4056 |
// Size of Java itable (in words) |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4057 |
itable_size = access_flags.is_interface() ? 0 : klassItable::compute_itable_size(_transitive_interfaces); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4058 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4059 |
FieldLayoutInfo info; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4060 |
layout_fields(class_loader, &fac, &parsed_annotations, &info, CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4061 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4062 |
int total_oop_map_size2 = |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4063 |
InstanceKlass::nonstatic_oop_map_size(info.total_oop_map_count); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4064 |
|
1 | 4065 |
// Compute reference type |
4066 |
ReferenceType rt; |
|
4067 |
if (super_klass() == NULL) { |
|
4068 |
rt = REF_NONE; |
|
4069 |
} else { |
|
4070 |
rt = super_klass->reference_type(); |
|
4071 |
} |
|
4072 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4073 |
// We can now create the basic Klass* for this klass |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4074 |
_klass = InstanceKlass::allocate_instance_klass(loader_data, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4075 |
vtable_size, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4076 |
itable_size, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4077 |
info.static_field_size, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4078 |
total_oop_map_size2, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4079 |
rt, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4080 |
access_flags, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4081 |
name, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4082 |
super_klass(), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4083 |
!host_klass.is_null(), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4084 |
CHECK_(nullHandle)); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4085 |
instanceKlassHandle this_klass (THREAD, _klass); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4086 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4087 |
assert(this_klass->static_field_size() == info.static_field_size, "sanity"); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4088 |
assert(this_klass->nonstatic_oop_map_count() == info.total_oop_map_count, |
3693 | 4089 |
"sanity"); |
1 | 4090 |
|
4091 |
// Fill in information already parsed |
|
3822 | 4092 |
this_klass->set_should_verify_class(verify); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4093 |
jint lh = Klass::instance_layout_helper(info.instance_size, false); |
1 | 4094 |
this_klass->set_layout_helper(lh); |
4095 |
assert(this_klass->oop_is_instance(), "layout is correct"); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4096 |
assert(this_klass->size_helper() == info.instance_size, "correct size_helper"); |
1 | 4097 |
// Not yet: supers are done below to support the new subtype-checking fields |
4098 |
//this_klass->set_super(super_klass()); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4099 |
this_klass->set_class_loader_data(loader_data); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4100 |
this_klass->set_nonstatic_field_size(info.nonstatic_field_size); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4101 |
this_klass->set_has_nonstatic_fields(info.has_nonstatic_fields); |
10546 | 4102 |
this_klass->set_static_oop_field_count(fac.count[STATIC_OOP]); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4103 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4104 |
apply_parsed_class_metadata(this_klass, java_fields_count, CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4105 |
|
1 | 4106 |
if (has_final_method) { |
4107 |
this_klass->set_has_final_method(); |
|
4108 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4109 |
this_klass->copy_method_ordering(method_ordering, CHECK_NULL); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
19770
diff
changeset
|
4110 |
// The InstanceKlass::_methods_jmethod_ids cache |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
19770
diff
changeset
|
4111 |
// is managed on the assumption that the initial cache |
3824
86e9e4b25bdf
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
3822
diff
changeset
|
4112 |
// size is equal to the number of methods in the class. If |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4113 |
// that changes, then InstanceKlass::idnum_can_increment() |
3824
86e9e4b25bdf
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
3822
diff
changeset
|
4114 |
// has to be changed accordingly. |
1 | 4115 |
this_klass->set_initial_method_idnum(methods->length()); |
4116 |
this_klass->set_name(cp->klass_name_at(this_class_index)); |
|
13973 | 4117 |
if (is_anonymous()) // I am well known to myself |
1661
7cb0f0d385f3
6779339: turn off LinkWellKnownClasses by default pending further testing
jrose
parents:
1550
diff
changeset
|
4118 |
cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4119 |
|
1 | 4120 |
this_klass->set_minor_version(minor_version); |
4121 |
this_klass->set_major_version(major_version); |
|
14385 | 4122 |
this_klass->set_has_default_methods(has_default_methods); |
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
4123 |
this_klass->set_declares_default_methods(declares_default_methods); |
1 | 4124 |
|
25066
57d8cb758cf8
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
25057
diff
changeset
|
4125 |
if (!host_klass.is_null()) { |
57d8cb758cf8
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
25057
diff
changeset
|
4126 |
assert (this_klass->is_anonymous(), "should be the same"); |
57d8cb758cf8
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
25057
diff
changeset
|
4127 |
this_klass->set_host_klass(host_klass()); |
57d8cb758cf8
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
25057
diff
changeset
|
4128 |
} |
57d8cb758cf8
8039150: host_klass invariant fails when verifying newly loaded JSR-292 anonymous classes
coleenp
parents:
25057
diff
changeset
|
4129 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4130 |
// Set up Method*::intrinsic_id as soon as we know the names of methods. |
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4131 |
// (We used to do this lazily, but now we query it in Rewriter, |
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4132 |
// which is eagerly done for every method, so we might as well do it now, |
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4133 |
// when everything is fresh in memory.) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4134 |
if (Method::klass_id_for_intrinsics(this_klass()) != vmSymbols::NO_SID) { |
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4135 |
for (int j = 0; j < methods->length(); j++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4136 |
methods->at(j)->init_intrinsic_id(); |
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4137 |
} |
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4138 |
} |
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2534
diff
changeset
|
4139 |
|
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
18025
diff
changeset
|
4140 |
if (cached_class_file != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4141 |
// JVMTI: we have an InstanceKlass now, tell it about the cached bytes |
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
18025
diff
changeset
|
4142 |
this_klass->set_cached_class_file(cached_class_file); |
1 | 4143 |
} |
4144 |
||
14385 | 4145 |
// Fill in field values obtained by parse_classfile_attributes |
4146 |
if (parsed_annotations.has_any_annotations()) |
|
4147 |
parsed_annotations.apply_to(this_klass); |
|
4148 |
apply_parsed_class_attributes(this_klass); |
|
4149 |
||
1 | 4150 |
// Miranda methods |
4151 |
if ((num_miranda_methods > 0) || |
|
4152 |
// if this class introduced new miranda methods or |
|
4153 |
(super_klass.not_null() && (super_klass->has_miranda_methods())) |
|
4154 |
// super class exists and this class inherited miranda methods |
|
4155 |
) { |
|
4156 |
this_klass->set_has_miranda_methods(); // then set a flag |
|
4157 |
} |
|
4158 |
||
4159 |
// Fill in information needed to compute superclasses. |
|
4160 |
this_klass->initialize_supers(super_klass(), CHECK_(nullHandle)); |
|
4161 |
||
4162 |
// Initialize itable offset tables |
|
4163 |
klassItable::setup_itable_offset_table(this_klass); |
|
4164 |
||
14385 | 4165 |
// Compute transitive closure of interfaces this class implements |
1 | 4166 |
// Do final class setup |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4167 |
fill_oop_maps(this_klass, info.nonstatic_oop_map_count, info.nonstatic_oop_offsets, info.nonstatic_oop_counts); |
1 | 4168 |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
4169 |
// Fill in has_finalizer, has_vanilla_constructor, and layout_helper |
1 | 4170 |
set_precomputed_flags(this_klass); |
4171 |
||
4172 |
// reinitialize modifiers, using the InnerClasses attribute |
|
4173 |
int computed_modifiers = this_klass->compute_modifier_flags(CHECK_(nullHandle)); |
|
4174 |
this_klass->set_modifier_flags(computed_modifiers); |
|
4175 |
||
4176 |
// check if this class can access its super class |
|
4177 |
check_super_class_access(this_klass, CHECK_(nullHandle)); |
|
4178 |
||
4179 |
// check if this class can access its superinterfaces |
|
4180 |
check_super_interface_access(this_klass, CHECK_(nullHandle)); |
|
4181 |
||
4182 |
// check if this class overrides any final method |
|
4183 |
check_final_method_override(this_klass, CHECK_(nullHandle)); |
|
4184 |
||
4185 |
// check that if this class is an interface then it doesn't have static methods |
|
4186 |
if (this_klass->is_interface()) { |
|
15185
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4187 |
/* An interface in a JAVA 8 classfile can be static */ |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4188 |
if (_major_version < JAVA_8_VERSION) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4189 |
check_illegal_static_method(this_klass, CHECK_(nullHandle)); |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4190 |
} |
1 | 4191 |
} |
4192 |
||
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17823
diff
changeset
|
4193 |
// Allocate mirror and initialize static fields |
25326
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25325
diff
changeset
|
4194 |
java_lang_Class::create_mirror(this_klass, class_loader, protection_domain, |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25325
diff
changeset
|
4195 |
CHECK_(nullHandle)); |
14385 | 4196 |
|
4197 |
// Generate any default methods - default methods are interface methods |
|
4198 |
// that have a default implementation. This is new with Lambda project. |
|
21556
e75cd34a59e0
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
20670
diff
changeset
|
4199 |
if (has_default_methods ) { |
14385 | 4200 |
DefaultMethods::generate_default_methods( |
4201 |
this_klass(), &all_mirandas, CHECK_(nullHandle)); |
|
4202 |
} |
|
4203 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4204 |
// Update the loader_data graph. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4205 |
record_defined_class_dependencies(this_klass, CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4206 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4207 |
ClassLoadingService::notify_class_loaded(InstanceKlass::cast(this_klass()), |
1 | 4208 |
false /* not shared class */); |
4209 |
||
4210 |
if (TraceClassLoading) { |
|
14385 | 4211 |
ResourceMark rm; |
1 | 4212 |
// print in a single call to reduce interleaving of output |
4213 |
if (cfs->source() != NULL) { |
|
4214 |
tty->print("[Loaded %s from %s]\n", this_klass->external_name(), |
|
4215 |
cfs->source()); |
|
4216 |
} else if (class_loader.is_null()) { |
|
22485
598d024a4a49
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
21765
diff
changeset
|
4217 |
Klass* caller = |
598d024a4a49
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
21765
diff
changeset
|
4218 |
THREAD->is_Java_thread() |
598d024a4a49
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
21765
diff
changeset
|
4219 |
? ((JavaThread*)THREAD)->security_get_caller_class(1) |
598d024a4a49
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
21765
diff
changeset
|
4220 |
: NULL; |
598d024a4a49
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
21765
diff
changeset
|
4221 |
// caller can be NULL, for example, during a JVMTI VM_Init hook |
598d024a4a49
8031376: TraceClassLoading expects there to be a (Java) caller when you load a class with the bootstrap class loader
sla
parents:
21765
diff
changeset
|
4222 |
if (caller != NULL) { |
1 | 4223 |
tty->print("[Loaded %s by instance of %s]\n", |
4224 |
this_klass->external_name(), |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4225 |
InstanceKlass::cast(caller)->external_name()); |
1 | 4226 |
} else { |
4227 |
tty->print("[Loaded %s]\n", this_klass->external_name()); |
|
4228 |
} |
|
4229 |
} else { |
|
4230 |
tty->print("[Loaded %s from %s]\n", this_klass->external_name(), |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4231 |
InstanceKlass::cast(class_loader->klass())->external_name()); |
1 | 4232 |
} |
4233 |
} |
|
4234 |
||
4235 |
if (TraceClassResolution) { |
|
14385 | 4236 |
ResourceMark rm; |
1 | 4237 |
// print out the superclass. |
14488 | 4238 |
const char * from = this_klass()->external_name(); |
1 | 4239 |
if (this_klass->java_super() != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4240 |
tty->print("RESOLVE %s %s (super)\n", from, InstanceKlass::cast(this_klass->java_super())->external_name()); |
1 | 4241 |
} |
4242 |
// print out each of the interface classes referred to by this class. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4243 |
Array<Klass*>* local_interfaces = this_klass->local_interfaces(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4244 |
if (local_interfaces != NULL) { |
1 | 4245 |
int length = local_interfaces->length(); |
4246 |
for (int i = 0; i < length; i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4247 |
Klass* k = local_interfaces->at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4248 |
InstanceKlass* to_class = InstanceKlass::cast(k); |
1 | 4249 |
const char * to = to_class->external_name(); |
2269
ee9da33d43ab
6603316: Improve instrumentation for classes loaded at startup
acorn
parents:
2264
diff
changeset
|
4250 |
tty->print("RESOLVE %s %s (interface)\n", from, to); |
1 | 4251 |
} |
4252 |
} |
|
4253 |
} |
|
4254 |
||
4255 |
// preserve result across HandleMark |
|
4256 |
preserve_this_klass = this_klass(); |
|
4257 |
} |
|
4258 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4259 |
// Create new handle outside HandleMark (might be needed for |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4260 |
// Extended Class Redefinition) |
1 | 4261 |
instanceKlassHandle this_klass (THREAD, preserve_this_klass); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4262 |
debug_only(this_klass->verify();) |
1 | 4263 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4264 |
// Clear class if no error has occurred so destructor doesn't deallocate it |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4265 |
_klass = NULL; |
1 | 4266 |
return this_klass; |
4267 |
} |
|
4268 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4269 |
// Destructor to clean up if there's an error |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4270 |
ClassFileParser::~ClassFileParser() { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4271 |
MetadataFactory::free_metadata(_loader_data, _cp); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4272 |
MetadataFactory::free_array<u2>(_loader_data, _fields); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4273 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4274 |
// Free methods |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4275 |
InstanceKlass::deallocate_methods(_loader_data, _methods); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4276 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4277 |
// beware of the Universe::empty_blah_array!! |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4278 |
if (_inner_classes != Universe::the_empty_short_array()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4279 |
MetadataFactory::free_array<u2>(_loader_data, _inner_classes); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4280 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4281 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4282 |
// Free interfaces |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4283 |
InstanceKlass::deallocate_interfaces(_loader_data, _super_klass(), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4284 |
_local_interfaces, _transitive_interfaces); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4285 |
|
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4286 |
if (_combined_annotations != NULL) { |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4287 |
// After all annotations arrays have been created, they are installed into the |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4288 |
// Annotations object that will be assigned to the InstanceKlass being created. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4289 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4290 |
// Deallocate the Annotations object and the installed annotations arrays. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4291 |
_combined_annotations->deallocate_contents(_loader_data); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4292 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4293 |
// If the _combined_annotations pointer is non-NULL, |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4294 |
// then the other annotations fields should have been cleared. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4295 |
assert(_annotations == NULL, "Should have been cleared"); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4296 |
assert(_type_annotations == NULL, "Should have been cleared"); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4297 |
assert(_fields_annotations == NULL, "Should have been cleared"); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4298 |
assert(_fields_type_annotations == NULL, "Should have been cleared"); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4299 |
} else { |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4300 |
// If the annotations arrays were not installed into the Annotations object, |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4301 |
// then they have to be deallocated explicitly. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4302 |
MetadataFactory::free_array<u1>(_loader_data, _annotations); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4303 |
MetadataFactory::free_array<u1>(_loader_data, _type_annotations); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4304 |
Annotations::free_contents(_loader_data, _fields_annotations); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4305 |
Annotations::free_contents(_loader_data, _fields_type_annotations); |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
4306 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4307 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4308 |
clear_class_metadata(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4309 |
|
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22752
diff
changeset
|
4310 |
// deallocate the klass if already created. Don't directly deallocate, but add |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22752
diff
changeset
|
4311 |
// to the deallocate list so that the klass is removed from the CLD::_klasses list |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22752
diff
changeset
|
4312 |
// at a safepoint. |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22752
diff
changeset
|
4313 |
if (_klass != NULL) { |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22752
diff
changeset
|
4314 |
_loader_data->add_to_deallocate_list(_klass); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22752
diff
changeset
|
4315 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4316 |
_klass = NULL; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4317 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4318 |
|
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4319 |
void ClassFileParser::print_field_layout(Symbol* name, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4320 |
Array<u2>* fields, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4321 |
constantPoolHandle cp, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4322 |
int instance_size, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4323 |
int instance_fields_start, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4324 |
int instance_fields_end, |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4325 |
int static_fields_end) { |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4326 |
tty->print("%s: field layout\n", name->as_klass_external_name()); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4327 |
tty->print(" @%3d %s\n", instance_fields_start, "--- instance fields start ---"); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4328 |
for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4329 |
if (!fs.access_flags().is_static()) { |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4330 |
tty->print(" @%3d \"%s\" %s\n", |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4331 |
fs.offset(), |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4332 |
fs.name()->as_klass_external_name(), |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4333 |
fs.signature()->as_klass_external_name()); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4334 |
} |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4335 |
} |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4336 |
tty->print(" @%3d %s\n", instance_fields_end, "--- instance fields end ---"); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4337 |
tty->print(" @%3d %s\n", instance_size * wordSize, "--- instance ends ---"); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4338 |
tty->print(" @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---"); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4339 |
for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4340 |
if (fs.access_flags().is_static()) { |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4341 |
tty->print(" @%3d \"%s\" %s\n", |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4342 |
fs.offset(), |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4343 |
fs.name()->as_klass_external_name(), |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4344 |
fs.signature()->as_klass_external_name()); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4345 |
} |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4346 |
} |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4347 |
tty->print(" @%3d %s\n", static_fields_end, "--- static fields end ---"); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4348 |
tty->print("\n"); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4349 |
} |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
4350 |
|
3694
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4351 |
unsigned int |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4352 |
ClassFileParser::compute_oop_map_count(instanceKlassHandle super, |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4353 |
unsigned int nonstatic_oop_map_count, |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4354 |
int first_nonstatic_oop_offset) { |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4355 |
unsigned int map_count = |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4356 |
super.is_null() ? 0 : super->nonstatic_oop_map_count(); |
1 | 4357 |
if (nonstatic_oop_map_count > 0) { |
4358 |
// We have oops to add to map |
|
3693 | 4359 |
if (map_count == 0) { |
4360 |
map_count = nonstatic_oop_map_count; |
|
1 | 4361 |
} else { |
3693 | 4362 |
// Check whether we should add a new map block or whether the last one can |
4363 |
// be extended |
|
4364 |
OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps(); |
|
4365 |
OopMapBlock* const last_map = first_map + map_count - 1; |
|
4366 |
||
4367 |
int next_offset = last_map->offset() + last_map->count() * heapOopSize; |
|
1 | 4368 |
if (next_offset == first_nonstatic_oop_offset) { |
4369 |
// There is no gap bettwen superklass's last oop field and first |
|
4370 |
// local oop field, merge maps. |
|
4371 |
nonstatic_oop_map_count -= 1; |
|
4372 |
} else { |
|
4373 |
// Superklass didn't end with a oop field, add extra maps |
|
3693 | 4374 |
assert(next_offset < first_nonstatic_oop_offset, "just checking"); |
1 | 4375 |
} |
3693 | 4376 |
map_count += nonstatic_oop_map_count; |
1 | 4377 |
} |
4378 |
} |
|
3693 | 4379 |
return map_count; |
1 | 4380 |
} |
4381 |
||
4382 |
||
4383 |
void ClassFileParser::fill_oop_maps(instanceKlassHandle k, |
|
3694
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4384 |
unsigned int nonstatic_oop_map_count, |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4385 |
int* nonstatic_oop_offsets, |
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4386 |
unsigned int* nonstatic_oop_counts) { |
1 | 4387 |
OopMapBlock* this_oop_map = k->start_of_nonstatic_oop_maps(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4388 |
const InstanceKlass* const super = k->superklass(); |
3694
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4389 |
const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0; |
3693 | 4390 |
if (super_count > 0) { |
4391 |
// Copy maps from superklass |
|
1 | 4392 |
OopMapBlock* super_oop_map = super->start_of_nonstatic_oop_maps(); |
3694
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4393 |
for (unsigned int i = 0; i < super_count; ++i) { |
1 | 4394 |
*this_oop_map++ = *super_oop_map++; |
4395 |
} |
|
4396 |
} |
|
3693 | 4397 |
|
1 | 4398 |
if (nonstatic_oop_map_count > 0) { |
3693 | 4399 |
if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) { |
4400 |
// The counts differ because there is no gap between superklass's last oop |
|
4401 |
// field and the first local oop field. Extend the last oop map copied |
|
1 | 4402 |
// from the superklass instead of creating new one. |
4403 |
nonstatic_oop_map_count--; |
|
4404 |
nonstatic_oop_offsets++; |
|
4405 |
this_oop_map--; |
|
3693 | 4406 |
this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++); |
1 | 4407 |
this_oop_map++; |
4408 |
} |
|
3693 | 4409 |
|
1 | 4410 |
// Add new map blocks, fill them |
4411 |
while (nonstatic_oop_map_count-- > 0) { |
|
4412 |
this_oop_map->set_offset(*nonstatic_oop_offsets++); |
|
3693 | 4413 |
this_oop_map->set_count(*nonstatic_oop_counts++); |
1 | 4414 |
this_oop_map++; |
4415 |
} |
|
3693 | 4416 |
assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() == |
4417 |
this_oop_map, "sanity"); |
|
1 | 4418 |
} |
4419 |
} |
|
4420 |
||
4421 |
||
4422 |
void ClassFileParser::set_precomputed_flags(instanceKlassHandle k) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4423 |
Klass* super = k->super(); |
1 | 4424 |
|
4425 |
// Check if this klass has an empty finalize method (i.e. one with return bytecode only), |
|
4426 |
// in which case we don't have to register objects as finalizable |
|
4427 |
if (!_has_empty_finalizer) { |
|
4428 |
if (_has_finalizer || |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4429 |
(super != NULL && super->has_finalizer())) { |
1 | 4430 |
k->set_has_finalizer(); |
4431 |
} |
|
4432 |
} |
|
4433 |
||
4434 |
#ifdef ASSERT |
|
4435 |
bool f = false; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4436 |
Method* m = k->lookup_method(vmSymbols::finalize_method_name(), |
1 | 4437 |
vmSymbols::void_method_signature()); |
4438 |
if (m != NULL && !m->is_empty_method()) { |
|
24828
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4439 |
f = true; |
1 | 4440 |
} |
24828
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4441 |
|
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4442 |
// Spec doesn't prevent agent from redefinition of empty finalizer. |
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4443 |
// Despite the fact that it's generally bad idea and redefined finalizer |
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4444 |
// will not work as expected we shouldn't abort vm in this case |
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4445 |
if (!k->has_redefined_this_or_super()) { |
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4446 |
assert(f == k->has_finalizer(), "inconsistent has_finalizer"); |
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4447 |
} |
1 | 4448 |
#endif |
4449 |
||
4450 |
// Check if this klass supports the java.lang.Cloneable interface |
|
4571 | 4451 |
if (SystemDictionary::Cloneable_klass_loaded()) { |
4452 |
if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) { |
|
1 | 4453 |
k->set_is_cloneable(); |
4454 |
} |
|
4455 |
} |
|
4456 |
||
4457 |
// Check if this klass has a vanilla default constructor |
|
4458 |
if (super == NULL) { |
|
4459 |
// java.lang.Object has empty default constructor |
|
4460 |
k->set_has_vanilla_constructor(); |
|
4461 |
} else { |
|
14488 | 4462 |
if (super->has_vanilla_constructor() && |
1 | 4463 |
_has_vanilla_constructor) { |
4464 |
k->set_has_vanilla_constructor(); |
|
4465 |
} |
|
4466 |
#ifdef ASSERT |
|
4467 |
bool v = false; |
|
14488 | 4468 |
if (super->has_vanilla_constructor()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4469 |
Method* constructor = k->find_method(vmSymbols::object_initializer_name( |
1 | 4470 |
), vmSymbols::void_method_signature()); |
4471 |
if (constructor != NULL && constructor->is_vanilla_constructor()) { |
|
4472 |
v = true; |
|
4473 |
} |
|
4474 |
} |
|
4475 |
assert(v == k->has_vanilla_constructor(), "inconsistent has_vanilla_constructor"); |
|
4476 |
#endif |
|
4477 |
} |
|
4478 |
||
4479 |
// If it cannot be fast-path allocated, set a bit in the layout helper. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4480 |
// See documentation of InstanceKlass::can_be_fastpath_allocated(). |
1 | 4481 |
assert(k->size_helper() > 0, "layout_helper is initialized"); |
4482 |
if ((!RegisterFinalizersAtInit && k->has_finalizer()) |
|
4483 |
|| k->is_abstract() || k->is_interface() |
|
14588
8ec26d2d9339
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
14488
diff
changeset
|
4484 |
|| (k->name() == vmSymbols::java_lang_Class() && k->class_loader() == NULL) |
1 | 4485 |
|| k->size_helper() >= FastAllocateSizeLimit) { |
4486 |
// Forbid fast-path allocation. |
|
4487 |
jint lh = Klass::instance_layout_helper(k->size_helper(), true); |
|
4488 |
k->set_layout_helper(lh); |
|
4489 |
} |
|
4490 |
} |
|
4491 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4492 |
// Attach super classes and interface classes to class loader data |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4493 |
void ClassFileParser::record_defined_class_dependencies(instanceKlassHandle defined_klass, TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4494 |
ClassLoaderData * defining_loader_data = defined_klass->class_loader_data(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4495 |
if (defining_loader_data->is_the_null_class_loader_data()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4496 |
// Dependencies to null class loader data are implicit. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4497 |
return; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4498 |
} else { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4499 |
// add super class dependency |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4500 |
Klass* super = defined_klass->super(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4501 |
if (super != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4502 |
defining_loader_data->record_dependency(super, CHECK); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4503 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4504 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4505 |
// add super interface dependencies |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4506 |
Array<Klass*>* local_interfaces = defined_klass->local_interfaces(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4507 |
if (local_interfaces != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4508 |
int length = local_interfaces->length(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4509 |
for (int i = 0; i < length; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4510 |
defining_loader_data->record_dependency(local_interfaces->at(i), CHECK); |
1 | 4511 |
} |
4512 |
} |
|
4513 |
} |
|
4514 |
} |
|
4515 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4516 |
// utility methods for appending an array with check for duplicates |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4517 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4518 |
void append_interfaces(GrowableArray<Klass*>* result, Array<Klass*>* ifs) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4519 |
// iterate over new interfaces |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4520 |
for (int i = 0; i < ifs->length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4521 |
Klass* e = ifs->at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4522 |
assert(e->is_klass() && InstanceKlass::cast(e)->is_interface(), "just checking"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4523 |
// add new interface |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4524 |
result->append_if_missing(e); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4525 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4526 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4527 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4528 |
Array<Klass*>* ClassFileParser::compute_transitive_interfaces( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4529 |
instanceKlassHandle super, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4530 |
Array<Klass*>* local_ifs, TRAPS) { |
1 | 4531 |
// Compute maximum size for transitive interfaces |
4532 |
int max_transitive_size = 0; |
|
4533 |
int super_size = 0; |
|
4534 |
// Add superclass transitive interfaces size |
|
4535 |
if (super.not_null()) { |
|
4536 |
super_size = super->transitive_interfaces()->length(); |
|
4537 |
max_transitive_size += super_size; |
|
4538 |
} |
|
4539 |
// Add local interfaces' super interfaces |
|
4540 |
int local_size = local_ifs->length(); |
|
4541 |
for (int i = 0; i < local_size; i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4542 |
Klass* l = local_ifs->at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4543 |
max_transitive_size += InstanceKlass::cast(l)->transitive_interfaces()->length(); |
1 | 4544 |
} |
4545 |
// Finally add local interfaces |
|
4546 |
max_transitive_size += local_size; |
|
4547 |
// Construct array |
|
4548 |
if (max_transitive_size == 0) { |
|
4549 |
// no interfaces, use canonicalized array |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4550 |
return Universe::the_empty_klass_array(); |
1 | 4551 |
} else if (max_transitive_size == super_size) { |
4552 |
// no new local interfaces added, share superklass' transitive interface array |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4553 |
return super->transitive_interfaces(); |
1 | 4554 |
} else if (max_transitive_size == local_size) { |
4555 |
// only local interfaces added, share local interface array |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4556 |
return local_ifs; |
1 | 4557 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4558 |
ResourceMark rm; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4559 |
GrowableArray<Klass*>* result = new GrowableArray<Klass*>(max_transitive_size); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4560 |
|
1 | 4561 |
// Copy down from superclass |
4562 |
if (super.not_null()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4563 |
append_interfaces(result, super->transitive_interfaces()); |
1 | 4564 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4565 |
|
1 | 4566 |
// Copy down from local interfaces' superinterfaces |
4567 |
for (int i = 0; i < local_ifs->length(); i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4568 |
Klass* l = local_ifs->at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4569 |
append_interfaces(result, InstanceKlass::cast(l)->transitive_interfaces()); |
1 | 4570 |
} |
4571 |
// Finally add local interfaces |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4572 |
append_interfaces(result, local_ifs); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4573 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4574 |
// length will be less than the max_transitive_size if duplicates were removed |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4575 |
int length = result->length(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4576 |
assert(length <= max_transitive_size, "just checking"); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4577 |
Array<Klass*>* new_result = MetadataFactory::new_array<Klass*>(_loader_data, length, CHECK_NULL); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4578 |
for (int i = 0; i < length; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4579 |
Klass* e = result->at(i); |
1 | 4580 |
assert(e != NULL, "just checking"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4581 |
new_result->at_put(i, e); |
1 | 4582 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4583 |
return new_result; |
1 | 4584 |
} |
4585 |
} |
|
4586 |
||
4587 |
void ClassFileParser::check_super_class_access(instanceKlassHandle this_klass, TRAPS) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4588 |
Klass* super = this_klass->super(); |
1 | 4589 |
if ((super != NULL) && |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4590 |
(!Reflection::verify_class_access(this_klass(), super, false))) { |
1 | 4591 |
ResourceMark rm(THREAD); |
4592 |
Exceptions::fthrow( |
|
4593 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4594 |
vmSymbols::java_lang_IllegalAccessError(), |
1 | 4595 |
"class %s cannot access its superclass %s", |
4596 |
this_klass->external_name(), |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4597 |
InstanceKlass::cast(super)->external_name() |
1 | 4598 |
); |
4599 |
return; |
|
4600 |
} |
|
4601 |
} |
|
4602 |
||
4603 |
||
4604 |
void ClassFileParser::check_super_interface_access(instanceKlassHandle this_klass, TRAPS) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4605 |
Array<Klass*>* local_interfaces = this_klass->local_interfaces(); |
1 | 4606 |
int lng = local_interfaces->length(); |
4607 |
for (int i = lng - 1; i >= 0; i--) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4608 |
Klass* k = local_interfaces->at(i); |
14488 | 4609 |
assert (k != NULL && k->is_interface(), "invalid interface"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4610 |
if (!Reflection::verify_class_access(this_klass(), k, false)) { |
1 | 4611 |
ResourceMark rm(THREAD); |
4612 |
Exceptions::fthrow( |
|
4613 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4614 |
vmSymbols::java_lang_IllegalAccessError(), |
1 | 4615 |
"class %s cannot access its superinterface %s", |
4616 |
this_klass->external_name(), |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4617 |
InstanceKlass::cast(k)->external_name() |
1 | 4618 |
); |
4619 |
return; |
|
4620 |
} |
|
4621 |
} |
|
4622 |
} |
|
4623 |
||
4624 |
||
4625 |
void ClassFileParser::check_final_method_override(instanceKlassHandle this_klass, TRAPS) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4626 |
Array<Method*>* methods = this_klass->methods(); |
1 | 4627 |
int num_methods = methods->length(); |
4628 |
||
4629 |
// go thru each method and check if it overrides a final method |
|
4630 |
for (int index = 0; index < num_methods; index++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4631 |
Method* m = methods->at(index); |
1 | 4632 |
|
21765
e2c19a9f1039
8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents:
21556
diff
changeset
|
4633 |
// skip private, static, and <init> methods |
e2c19a9f1039
8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents:
21556
diff
changeset
|
4634 |
if ((!m->is_private() && !m->is_static()) && |
1 | 4635 |
(m->name() != vmSymbols::object_initializer_name())) { |
4636 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4637 |
Symbol* name = m->name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4638 |
Symbol* signature = m->signature(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4639 |
Klass* k = this_klass->super(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4640 |
Method* super_m = NULL; |
1 | 4641 |
while (k != NULL) { |
4642 |
// skip supers that don't have final methods. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4643 |
if (k->has_final_method()) { |
1 | 4644 |
// lookup a matching method in the super class hierarchy |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4645 |
super_m = InstanceKlass::cast(k)->lookup_method(name, signature); |
1 | 4646 |
if (super_m == NULL) { |
4647 |
break; // didn't find any match; get out |
|
4648 |
} |
|
4649 |
||
22534
520f7a937396
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
22485
diff
changeset
|
4650 |
if (super_m->is_final() && !super_m->is_static() && |
520f7a937396
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
22485
diff
changeset
|
4651 |
// matching method in super is final, and not static |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4652 |
(Reflection::verify_field_access(this_klass(), |
1 | 4653 |
super_m->method_holder(), |
4654 |
super_m->method_holder(), |
|
4655 |
super_m->access_flags(), false)) |
|
4656 |
// this class can access super final method and therefore override |
|
4657 |
) { |
|
4658 |
ResourceMark rm(THREAD); |
|
4659 |
Exceptions::fthrow( |
|
4660 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4661 |
vmSymbols::java_lang_VerifyError(), |
25470
4e69740b1547
8026894: Improve VerifyError message about overriding a final method
hseigel
parents:
25326
diff
changeset
|
4662 |
"class %s overrides final method %s.%s%s", |
1 | 4663 |
this_klass->external_name(), |
25470
4e69740b1547
8026894: Improve VerifyError message about overriding a final method
hseigel
parents:
25326
diff
changeset
|
4664 |
super_m->method_holder()->external_name(), |
1 | 4665 |
name->as_C_string(), |
4666 |
signature->as_C_string() |
|
4667 |
); |
|
4668 |
return; |
|
4669 |
} |
|
4670 |
||
4671 |
// continue to look from super_m's holder's super. |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
4672 |
k = super_m->method_holder()->super(); |
1 | 4673 |
continue; |
4674 |
} |
|
4675 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4676 |
k = k->super(); |
1 | 4677 |
} |
4678 |
} |
|
4679 |
} |
|
4680 |
} |
|
4681 |
||
4682 |
||
4683 |
// assumes that this_klass is an interface |
|
4684 |
void ClassFileParser::check_illegal_static_method(instanceKlassHandle this_klass, TRAPS) { |
|
4685 |
assert(this_klass->is_interface(), "not an interface"); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4686 |
Array<Method*>* methods = this_klass->methods(); |
1 | 4687 |
int num_methods = methods->length(); |
4688 |
||
4689 |
for (int index = 0; index < num_methods; index++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4690 |
Method* m = methods->at(index); |
1 | 4691 |
// if m is static and not the init method, throw a verify error |
4692 |
if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) { |
|
4693 |
ResourceMark rm(THREAD); |
|
4694 |
Exceptions::fthrow( |
|
4695 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4696 |
vmSymbols::java_lang_VerifyError(), |
1 | 4697 |
"Illegal static method %s in interface %s", |
4698 |
m->name()->as_C_string(), |
|
4699 |
this_klass->external_name() |
|
4700 |
); |
|
4701 |
return; |
|
4702 |
} |
|
4703 |
} |
|
4704 |
} |
|
4705 |
||
4706 |
// utility methods for format checking |
|
4707 |
||
4708 |
void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) { |
|
4709 |
if (!_need_verify) { return; } |
|
4710 |
||
4711 |
const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0; |
|
4712 |
const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; |
|
4713 |
const bool is_final = (flags & JVM_ACC_FINAL) != 0; |
|
4714 |
const bool is_super = (flags & JVM_ACC_SUPER) != 0; |
|
4715 |
const bool is_enum = (flags & JVM_ACC_ENUM) != 0; |
|
4716 |
const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0; |
|
4717 |
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
|
4718 |
||
4719 |
if ((is_abstract && is_final) || |
|
4720 |
(is_interface && !is_abstract) || |
|
4721 |
(is_interface && major_gte_15 && (is_super || is_enum)) || |
|
4722 |
(!is_interface && major_gte_15 && is_annotation)) { |
|
4723 |
ResourceMark rm(THREAD); |
|
4724 |
Exceptions::fthrow( |
|
4725 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4726 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4727 |
"Illegal class modifiers in class %s: 0x%X", |
4728 |
_class_name->as_C_string(), flags |
|
4729 |
); |
|
4730 |
return; |
|
4731 |
} |
|
4732 |
} |
|
4733 |
||
4734 |
bool ClassFileParser::has_illegal_visibility(jint flags) { |
|
4735 |
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; |
|
4736 |
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
|
4737 |
const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; |
|
4738 |
||
4739 |
return ((is_public && is_protected) || |
|
4740 |
(is_public && is_private) || |
|
4741 |
(is_protected && is_private)); |
|
4742 |
} |
|
4743 |
||
4744 |
bool ClassFileParser::is_supported_version(u2 major, u2 minor) { |
|
25057 | 4745 |
u2 max_version = JAVA_MAX_SUPPORTED_VERSION; |
1 | 4746 |
return (major >= JAVA_MIN_SUPPORTED_VERSION) && |
602
92e03692ddd6
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
383
diff
changeset
|
4747 |
(major <= max_version) && |
92e03692ddd6
6705523: Fix for 6695506 will violate spec when used in JDK6
kamg
parents:
383
diff
changeset
|
4748 |
((major != max_version) || |
1 | 4749 |
(minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION)); |
4750 |
} |
|
4751 |
||
4752 |
void ClassFileParser::verify_legal_field_modifiers( |
|
4753 |
jint flags, bool is_interface, TRAPS) { |
|
4754 |
if (!_need_verify) { return; } |
|
4755 |
||
4756 |
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; |
|
4757 |
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
|
4758 |
const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; |
|
4759 |
const bool is_static = (flags & JVM_ACC_STATIC) != 0; |
|
4760 |
const bool is_final = (flags & JVM_ACC_FINAL) != 0; |
|
4761 |
const bool is_volatile = (flags & JVM_ACC_VOLATILE) != 0; |
|
4762 |
const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0; |
|
4763 |
const bool is_enum = (flags & JVM_ACC_ENUM) != 0; |
|
4764 |
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
|
4765 |
||
4766 |
bool is_illegal = false; |
|
4767 |
||
4768 |
if (is_interface) { |
|
4769 |
if (!is_public || !is_static || !is_final || is_private || |
|
4770 |
is_protected || is_volatile || is_transient || |
|
4771 |
(major_gte_15 && is_enum)) { |
|
4772 |
is_illegal = true; |
|
4773 |
} |
|
4774 |
} else { // not interface |
|
4775 |
if (has_illegal_visibility(flags) || (is_final && is_volatile)) { |
|
4776 |
is_illegal = true; |
|
4777 |
} |
|
4778 |
} |
|
4779 |
||
4780 |
if (is_illegal) { |
|
4781 |
ResourceMark rm(THREAD); |
|
4782 |
Exceptions::fthrow( |
|
4783 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4784 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4785 |
"Illegal field modifiers in class %s: 0x%X", |
4786 |
_class_name->as_C_string(), flags); |
|
4787 |
return; |
|
4788 |
} |
|
4789 |
} |
|
4790 |
||
4791 |
void ClassFileParser::verify_legal_method_modifiers( |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4792 |
jint flags, bool is_interface, Symbol* name, TRAPS) { |
1 | 4793 |
if (!_need_verify) { return; } |
4794 |
||
4795 |
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; |
|
4796 |
const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; |
|
4797 |
const bool is_static = (flags & JVM_ACC_STATIC) != 0; |
|
4798 |
const bool is_final = (flags & JVM_ACC_FINAL) != 0; |
|
4799 |
const bool is_native = (flags & JVM_ACC_NATIVE) != 0; |
|
4800 |
const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; |
|
4801 |
const bool is_bridge = (flags & JVM_ACC_BRIDGE) != 0; |
|
4802 |
const bool is_strict = (flags & JVM_ACC_STRICT) != 0; |
|
4803 |
const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0; |
|
15185
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4804 |
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
1 | 4805 |
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
14385 | 4806 |
const bool major_gte_8 = _major_version >= JAVA_8_VERSION; |
1 | 4807 |
const bool is_initializer = (name == vmSymbols::object_initializer_name()); |
4808 |
||
4809 |
bool is_illegal = false; |
|
4810 |
||
4811 |
if (is_interface) { |
|
15185
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4812 |
if (major_gte_8) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4813 |
// Class file version is JAVA_8_VERSION or later Methods of |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4814 |
// interfaces may set any of the flags except ACC_PROTECTED, |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4815 |
// ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4816 |
// have exactly one of the ACC_PUBLIC or ACC_PRIVATE flags set. |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4817 |
if ((is_public == is_private) || /* Only one of private and public should be true - XNOR */ |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4818 |
(is_native || is_protected || is_final || is_synchronized) || |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4819 |
// If a specific method of a class or interface has its |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4820 |
// ACC_ABSTRACT flag set, it must not have any of its |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4821 |
// ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC, |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4822 |
// ACC_STRICT, or ACC_SYNCHRONIZED flags set. No need to |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4823 |
// check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4824 |
// those flags are illegal irrespective of ACC_ABSTRACT being set or not. |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4825 |
(is_abstract && (is_private || is_static || is_strict))) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4826 |
is_illegal = true; |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4827 |
} |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4828 |
} else if (major_gte_15) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4829 |
// Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION) |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4830 |
if (!is_public || is_static || is_final || is_synchronized || |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4831 |
is_native || !is_abstract || is_strict) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4832 |
is_illegal = true; |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4833 |
} |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4834 |
} else { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4835 |
// Class file version is pre-JAVA_1_5_VERSION |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4836 |
if (!is_public || is_static || is_final || is_native || !is_abstract) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4837 |
is_illegal = true; |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4838 |
} |
1 | 4839 |
} |
4840 |
} else { // not interface |
|
30136
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4841 |
if (has_illegal_visibility(flags)) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4842 |
is_illegal = true; |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4843 |
} else { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4844 |
if (is_initializer) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4845 |
if (is_static || is_final || is_synchronized || is_native || |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4846 |
is_abstract || (major_gte_15 && is_bridge)) { |
1 | 4847 |
is_illegal = true; |
4848 |
} |
|
30136
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4849 |
} else { // not initializer |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4850 |
if (is_abstract) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4851 |
if ((is_final || is_native || is_private || is_static || |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4852 |
(major_gte_15 && (is_synchronized || is_strict)))) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4853 |
is_illegal = true; |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4854 |
} |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4855 |
} |
1 | 4856 |
} |
4857 |
} |
|
4858 |
} |
|
4859 |
||
4860 |
if (is_illegal) { |
|
4861 |
ResourceMark rm(THREAD); |
|
4862 |
Exceptions::fthrow( |
|
4863 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4864 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4865 |
"Method %s in class %s has illegal modifiers: 0x%X", |
4866 |
name->as_C_string(), _class_name->as_C_string(), flags); |
|
4867 |
return; |
|
4868 |
} |
|
4869 |
} |
|
4870 |
||
4871 |
void ClassFileParser::verify_legal_utf8(const unsigned char* buffer, int length, TRAPS) { |
|
4872 |
assert(_need_verify, "only called when _need_verify is true"); |
|
4873 |
int i = 0; |
|
4874 |
int count = length >> 2; |
|
4875 |
for (int k=0; k<count; k++) { |
|
4876 |
unsigned char b0 = buffer[i]; |
|
4877 |
unsigned char b1 = buffer[i+1]; |
|
4878 |
unsigned char b2 = buffer[i+2]; |
|
4879 |
unsigned char b3 = buffer[i+3]; |
|
4880 |
// For an unsigned char v, |
|
4881 |
// (v | v - 1) is < 128 (highest bit 0) for 0 < v < 128; |
|
4882 |
// (v | v - 1) is >= 128 (highest bit 1) for v == 0 or v >= 128. |
|
4883 |
unsigned char res = b0 | b0 - 1 | |
|
4884 |
b1 | b1 - 1 | |
|
4885 |
b2 | b2 - 1 | |
|
4886 |
b3 | b3 - 1; |
|
4887 |
if (res >= 128) break; |
|
4888 |
i += 4; |
|
4889 |
} |
|
4890 |
for(; i < length; i++) { |
|
4891 |
unsigned short c; |
|
4892 |
// no embedded zeros |
|
4893 |
guarantee_property((buffer[i] != 0), "Illegal UTF8 string in constant pool in class file %s", CHECK); |
|
4894 |
if(buffer[i] < 128) { |
|
4895 |
continue; |
|
4896 |
} |
|
4897 |
if ((i + 5) < length) { // see if it's legal supplementary character |
|
4898 |
if (UTF8::is_supplementary_character(&buffer[i])) { |
|
4899 |
c = UTF8::get_supplementary_character(&buffer[i]); |
|
4900 |
i += 5; |
|
4901 |
continue; |
|
4902 |
} |
|
4903 |
} |
|
4904 |
switch (buffer[i] >> 4) { |
|
4905 |
default: break; |
|
4906 |
case 0x8: case 0x9: case 0xA: case 0xB: case 0xF: |
|
4907 |
classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); |
|
4908 |
case 0xC: case 0xD: // 110xxxxx 10xxxxxx |
|
4909 |
c = (buffer[i] & 0x1F) << 6; |
|
4910 |
i++; |
|
4911 |
if ((i < length) && ((buffer[i] & 0xC0) == 0x80)) { |
|
4912 |
c += buffer[i] & 0x3F; |
|
4913 |
if (_major_version <= 47 || c == 0 || c >= 0x80) { |
|
4914 |
// for classes with major > 47, c must a null or a character in its shortest form |
|
4915 |
break; |
|
4916 |
} |
|
4917 |
} |
|
4918 |
classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); |
|
4919 |
case 0xE: // 1110xxxx 10xxxxxx 10xxxxxx |
|
4920 |
c = (buffer[i] & 0xF) << 12; |
|
4921 |
i += 2; |
|
4922 |
if ((i < length) && ((buffer[i-1] & 0xC0) == 0x80) && ((buffer[i] & 0xC0) == 0x80)) { |
|
4923 |
c += ((buffer[i-1] & 0x3F) << 6) + (buffer[i] & 0x3F); |
|
4924 |
if (_major_version <= 47 || c >= 0x800) { |
|
4925 |
// for classes with major > 47, c must be in its shortest form |
|
4926 |
break; |
|
4927 |
} |
|
4928 |
} |
|
4929 |
classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); |
|
4930 |
} // end of switch |
|
4931 |
} // end of for |
|
4932 |
} |
|
4933 |
||
4934 |
// Checks if name is a legal class name. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4935 |
void ClassFileParser::verify_legal_class_name(Symbol* name, TRAPS) { |
1 | 4936 |
if (!_need_verify || _relax_verify) { return; } |
4937 |
||
4938 |
char buf[fixed_buffer_size]; |
|
4939 |
char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); |
|
4940 |
unsigned int length = name->utf8_length(); |
|
4941 |
bool legal = false; |
|
4942 |
||
4943 |
if (length > 0) { |
|
4944 |
char* p; |
|
4945 |
if (bytes[0] == JVM_SIGNATURE_ARRAY) { |
|
4946 |
p = skip_over_field_signature(bytes, false, length, CHECK); |
|
4947 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
4948 |
} else if (_major_version < JAVA_1_5_VERSION) { |
|
4949 |
if (bytes[0] != '<') { |
|
4950 |
p = skip_over_field_name(bytes, true, length); |
|
4951 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
4952 |
} |
|
4953 |
} else { |
|
4954 |
// 4900761: relax the constraints based on JSR202 spec |
|
4955 |
// Class names may be drawn from the entire Unicode character set. |
|
4956 |
// Identifiers between '/' must be unqualified names. |
|
4957 |
// The utf8 string has been verified when parsing cpool entries. |
|
4958 |
legal = verify_unqualified_name(bytes, length, LegalClass); |
|
4959 |
} |
|
4960 |
} |
|
4961 |
if (!legal) { |
|
4962 |
ResourceMark rm(THREAD); |
|
4963 |
Exceptions::fthrow( |
|
4964 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4965 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4966 |
"Illegal class name \"%s\" in class file %s", bytes, |
4967 |
_class_name->as_C_string() |
|
4968 |
); |
|
4969 |
return; |
|
4970 |
} |
|
4971 |
} |
|
4972 |
||
4973 |
// Checks if name is a legal field name. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4974 |
void ClassFileParser::verify_legal_field_name(Symbol* name, TRAPS) { |
1 | 4975 |
if (!_need_verify || _relax_verify) { return; } |
4976 |
||
4977 |
char buf[fixed_buffer_size]; |
|
4978 |
char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); |
|
4979 |
unsigned int length = name->utf8_length(); |
|
4980 |
bool legal = false; |
|
4981 |
||
4982 |
if (length > 0) { |
|
4983 |
if (_major_version < JAVA_1_5_VERSION) { |
|
4984 |
if (bytes[0] != '<') { |
|
4985 |
char* p = skip_over_field_name(bytes, false, length); |
|
4986 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
4987 |
} |
|
4988 |
} else { |
|
4989 |
// 4881221: relax the constraints based on JSR202 spec |
|
4990 |
legal = verify_unqualified_name(bytes, length, LegalField); |
|
4991 |
} |
|
4992 |
} |
|
4993 |
||
4994 |
if (!legal) { |
|
4995 |
ResourceMark rm(THREAD); |
|
4996 |
Exceptions::fthrow( |
|
4997 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4998 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4999 |
"Illegal field name \"%s\" in class %s", bytes, |
5000 |
_class_name->as_C_string() |
|
5001 |
); |
|
5002 |
return; |
|
5003 |
} |
|
5004 |
} |
|
5005 |
||
5006 |
// Checks if name is a legal method name. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5007 |
void ClassFileParser::verify_legal_method_name(Symbol* name, TRAPS) { |
1 | 5008 |
if (!_need_verify || _relax_verify) { return; } |
5009 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5010 |
assert(name != NULL, "method name is null"); |
1 | 5011 |
char buf[fixed_buffer_size]; |
5012 |
char* bytes = name->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); |
|
5013 |
unsigned int length = name->utf8_length(); |
|
5014 |
bool legal = false; |
|
5015 |
||
5016 |
if (length > 0) { |
|
5017 |
if (bytes[0] == '<') { |
|
5018 |
if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) { |
|
5019 |
legal = true; |
|
5020 |
} |
|
5021 |
} else if (_major_version < JAVA_1_5_VERSION) { |
|
5022 |
char* p; |
|
5023 |
p = skip_over_field_name(bytes, false, length); |
|
5024 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
5025 |
} else { |
|
5026 |
// 4881221: relax the constraints based on JSR202 spec |
|
5027 |
legal = verify_unqualified_name(bytes, length, LegalMethod); |
|
5028 |
} |
|
5029 |
} |
|
5030 |
||
5031 |
if (!legal) { |
|
5032 |
ResourceMark rm(THREAD); |
|
5033 |
Exceptions::fthrow( |
|
5034 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5035 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 5036 |
"Illegal method name \"%s\" in class %s", bytes, |
5037 |
_class_name->as_C_string() |
|
5038 |
); |
|
5039 |
return; |
|
5040 |
} |
|
5041 |
} |
|
5042 |
||
5043 |
||
5044 |
// Checks if signature is a legal field signature. |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5045 |
void ClassFileParser::verify_legal_field_signature(Symbol* name, Symbol* signature, TRAPS) { |
1 | 5046 |
if (!_need_verify) { return; } |
5047 |
||
5048 |
char buf[fixed_buffer_size]; |
|
5049 |
char* bytes = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); |
|
5050 |
unsigned int length = signature->utf8_length(); |
|
5051 |
char* p = skip_over_field_signature(bytes, false, length, CHECK); |
|
5052 |
||
5053 |
if (p == NULL || (p - bytes) != (int)length) { |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
5054 |
throwIllegalSignature("Field", name, signature, CHECK); |
1 | 5055 |
} |
5056 |
} |
|
5057 |
||
5058 |
// Checks if signature is a legal method signature. |
|
5059 |
// Returns number of parameters |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5060 |
int ClassFileParser::verify_legal_method_signature(Symbol* name, Symbol* signature, TRAPS) { |
1 | 5061 |
if (!_need_verify) { |
5062 |
// make sure caller's args_size will be less than 0 even for non-static |
|
5063 |
// method so it will be recomputed in compute_size_of_parameters(). |
|
5064 |
return -2; |
|
5065 |
} |
|
5066 |
||
5067 |
unsigned int args_size = 0; |
|
5068 |
char buf[fixed_buffer_size]; |
|
5069 |
char* p = signature->as_utf8_flexible_buffer(THREAD, buf, fixed_buffer_size); |
|
5070 |
unsigned int length = signature->utf8_length(); |
|
5071 |
char* nextp; |
|
5072 |
||
5073 |
// The first character must be a '(' |
|
5074 |
if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) { |
|
5075 |
length--; |
|
5076 |
// Skip over legal field signatures |
|
5077 |
nextp = skip_over_field_signature(p, false, length, CHECK_0); |
|
5078 |
while ((length > 0) && (nextp != NULL)) { |
|
5079 |
args_size++; |
|
5080 |
if (p[0] == 'J' || p[0] == 'D') { |
|
5081 |
args_size++; |
|
5082 |
} |
|
5083 |
length -= nextp - p; |
|
5084 |
p = nextp; |
|
5085 |
nextp = skip_over_field_signature(p, false, length, CHECK_0); |
|
5086 |
} |
|
5087 |
// The first non-signature thing better be a ')' |
|
5088 |
if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { |
|
5089 |
length--; |
|
5090 |
if (name->utf8_length() > 0 && name->byte_at(0) == '<') { |
|
5091 |
// All internal methods must return void |
|
5092 |
if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { |
|
5093 |
return args_size; |
|
5094 |
} |
|
5095 |
} else { |
|
5096 |
// Now we better just have a return value |
|
5097 |
nextp = skip_over_field_signature(p, true, length, CHECK_0); |
|
5098 |
if (nextp && ((int)length == (nextp - p))) { |
|
5099 |
return args_size; |
|
5100 |
} |
|
5101 |
} |
|
5102 |
} |
|
5103 |
} |
|
5104 |
// Report error |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
5105 |
throwIllegalSignature("Method", name, signature, CHECK_0); |
1 | 5106 |
return 0; |
5107 |
} |
|
5108 |
||
5109 |
||
6978
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5110 |
// Unqualified names may not contain the characters '.', ';', '[', or '/'. |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5111 |
// Method names also may not contain the characters '<' or '>', unless <init> |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5112 |
// or <clinit>. Note that method names may not be <init> or <clinit> in this |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5113 |
// method. Because these names have been checked as special cases before |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5114 |
// calling this method in verify_legal_method_name. |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5115 |
bool ClassFileParser::verify_unqualified_name( |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5116 |
char* name, unsigned int length, int type) { |
1 | 5117 |
jchar ch; |
5118 |
||
5119 |
for (char* p = name; p != name + length; ) { |
|
5120 |
ch = *p; |
|
5121 |
if (ch < 128) { |
|
5122 |
p++; |
|
6978
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5123 |
if (ch == '.' || ch == ';' || ch == '[' ) { |
fd89b5882576
6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name
kamg
parents:
6773
diff
changeset
|
5124 |
return false; // do not permit '.', ';', or '[' |
1 | 5125 |
} |
5126 |
if (type != LegalClass && ch == '/') { |
|
5127 |
return false; // do not permit '/' unless it's class name |
|
5128 |
} |
|
5129 |
if (type == LegalMethod && (ch == '<' || ch == '>')) { |
|
5130 |
return false; // do not permit '<' or '>' in method names |
|
5131 |
} |
|
5132 |
} else { |
|
5133 |
char* tmp_p = UTF8::next(p, &ch); |
|
5134 |
p = tmp_p; |
|
5135 |
} |
|
5136 |
} |
|
5137 |
return true; |
|
5138 |
} |
|
5139 |
||
5140 |
||
5141 |
// Take pointer to a string. Skip over the longest part of the string that could |
|
5142 |
// be taken as a fieldname. Allow '/' if slash_ok is true. |
|
5143 |
// Return a pointer to just past the fieldname. |
|
5144 |
// Return NULL if no fieldname at all was found, or in the case of slash_ok |
|
5145 |
// being true, we saw consecutive slashes (meaning we were looking for a |
|
5146 |
// qualified path but found something that was badly-formed). |
|
5147 |
char* ClassFileParser::skip_over_field_name(char* name, bool slash_ok, unsigned int length) { |
|
5148 |
char* p; |
|
5149 |
jchar ch; |
|
5150 |
jboolean last_is_slash = false; |
|
5151 |
jboolean not_first_ch = false; |
|
5152 |
||
5153 |
for (p = name; p != name + length; not_first_ch = true) { |
|
5154 |
char* old_p = p; |
|
5155 |
ch = *p; |
|
5156 |
if (ch < 128) { |
|
5157 |
p++; |
|
5158 |
// quick check for ascii |
|
5159 |
if ((ch >= 'a' && ch <= 'z') || |
|
5160 |
(ch >= 'A' && ch <= 'Z') || |
|
5161 |
(ch == '_' || ch == '$') || |
|
5162 |
(not_first_ch && ch >= '0' && ch <= '9')) { |
|
5163 |
last_is_slash = false; |
|
5164 |
continue; |
|
5165 |
} |
|
5166 |
if (slash_ok && ch == '/') { |
|
5167 |
if (last_is_slash) { |
|
5168 |
return NULL; // Don't permit consecutive slashes |
|
5169 |
} |
|
5170 |
last_is_slash = true; |
|
5171 |
continue; |
|
5172 |
} |
|
5173 |
} else { |
|
5174 |
jint unicode_ch; |
|
5175 |
char* tmp_p = UTF8::next_character(p, &unicode_ch); |
|
5176 |
p = tmp_p; |
|
5177 |
last_is_slash = false; |
|
5178 |
// Check if ch is Java identifier start or is Java identifier part |
|
5179 |
// 4672820: call java.lang.Character methods directly without generating separate tables. |
|
5180 |
EXCEPTION_MARK; |
|
4571 | 5181 |
instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass()); |
1 | 5182 |
|
5183 |
// return value |
|
5184 |
JavaValue result(T_BOOLEAN); |
|
5185 |
// Set up the arguments to isJavaIdentifierStart and isJavaIdentifierPart |
|
5186 |
JavaCallArguments args; |
|
5187 |
args.push_int(unicode_ch); |
|
5188 |
||
5189 |
// public static boolean isJavaIdentifierStart(char ch); |
|
5190 |
JavaCalls::call_static(&result, |
|
5191 |
klass, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5192 |
vmSymbols::isJavaIdentifierStart_name(), |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5193 |
vmSymbols::int_bool_signature(), |
1 | 5194 |
&args, |
5195 |
THREAD); |
|
5196 |
||
5197 |
if (HAS_PENDING_EXCEPTION) { |
|
5198 |
CLEAR_PENDING_EXCEPTION; |
|
5199 |
return 0; |
|
5200 |
} |
|
5201 |
if (result.get_jboolean()) { |
|
5202 |
continue; |
|
5203 |
} |
|
5204 |
||
5205 |
if (not_first_ch) { |
|
5206 |
// public static boolean isJavaIdentifierPart(char ch); |
|
5207 |
JavaCalls::call_static(&result, |
|
5208 |
klass, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5209 |
vmSymbols::isJavaIdentifierPart_name(), |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5210 |
vmSymbols::int_bool_signature(), |
1 | 5211 |
&args, |
5212 |
THREAD); |
|
5213 |
||
5214 |
if (HAS_PENDING_EXCEPTION) { |
|
5215 |
CLEAR_PENDING_EXCEPTION; |
|
5216 |
return 0; |
|
5217 |
} |
|
5218 |
||
5219 |
if (result.get_jboolean()) { |
|
5220 |
continue; |
|
5221 |
} |
|
5222 |
} |
|
5223 |
} |
|
5224 |
return (not_first_ch) ? old_p : NULL; |
|
5225 |
} |
|
5226 |
return (not_first_ch) ? p : NULL; |
|
5227 |
} |
|
5228 |
||
5229 |
||
5230 |
// Take pointer to a string. Skip over the longest part of the string that could |
|
5231 |
// be taken as a field signature. Allow "void" if void_ok. |
|
5232 |
// Return a pointer to just past the signature. |
|
5233 |
// Return NULL if no legal signature is found. |
|
5234 |
char* ClassFileParser::skip_over_field_signature(char* signature, |
|
5235 |
bool void_ok, |
|
5236 |
unsigned int length, |
|
5237 |
TRAPS) { |
|
5238 |
unsigned int array_dim = 0; |
|
5239 |
while (length > 0) { |
|
5240 |
switch (signature[0]) { |
|
5241 |
case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; } |
|
5242 |
case JVM_SIGNATURE_BOOLEAN: |
|
5243 |
case JVM_SIGNATURE_BYTE: |
|
5244 |
case JVM_SIGNATURE_CHAR: |
|
5245 |
case JVM_SIGNATURE_SHORT: |
|
5246 |
case JVM_SIGNATURE_INT: |
|
5247 |
case JVM_SIGNATURE_FLOAT: |
|
5248 |
case JVM_SIGNATURE_LONG: |
|
5249 |
case JVM_SIGNATURE_DOUBLE: |
|
5250 |
return signature + 1; |
|
5251 |
case JVM_SIGNATURE_CLASS: { |
|
5252 |
if (_major_version < JAVA_1_5_VERSION) { |
|
5253 |
// Skip over the class name if one is there |
|
5254 |
char* p = skip_over_field_name(signature + 1, true, --length); |
|
5255 |
||
5256 |
// The next character better be a semicolon |
|
5257 |
if (p && (p - signature) > 1 && p[0] == ';') { |
|
5258 |
return p + 1; |
|
5259 |
} |
|
5260 |
} else { |
|
5261 |
// 4900761: For class version > 48, any unicode is allowed in class name. |
|
5262 |
length--; |
|
5263 |
signature++; |
|
5264 |
while (length > 0 && signature[0] != ';') { |
|
5265 |
if (signature[0] == '.') { |
|
5266 |
classfile_parse_error("Class name contains illegal character '.' in descriptor in class file %s", CHECK_0); |
|
5267 |
} |
|
5268 |
length--; |
|
5269 |
signature++; |
|
5270 |
} |
|
5271 |
if (signature[0] == ';') { return signature + 1; } |
|
5272 |
} |
|
5273 |
||
5274 |
return NULL; |
|
5275 |
} |
|
5276 |
case JVM_SIGNATURE_ARRAY: |
|
5277 |
array_dim++; |
|
5278 |
if (array_dim > 255) { |
|
5279 |
// 4277370: array descriptor is valid only if it represents 255 or fewer dimensions. |
|
5280 |
classfile_parse_error("Array type descriptor has more than 255 dimensions in class file %s", CHECK_0); |
|
5281 |
} |
|
5282 |
// The rest of what's there better be a legal signature |
|
5283 |
signature++; |
|
5284 |
length--; |
|
5285 |
void_ok = false; |
|
5286 |
break; |
|
5287 |
||
5288 |
default: |
|
5289 |
return NULL; |
|
5290 |
} |
|
5291 |
} |
|
5292 |
return NULL; |
|
5293 |
} |