author | coleenp |
Wed, 13 Nov 2019 08:23:23 -0500 | |
changeset 59056 | 15936b142f86 |
parent 58817 | 7f27d70a2424 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
53705
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
2 |
* Copyright (c) 1997, 2019, 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 |
*/ |
|
7397 | 24 |
#include "precompiled.hpp" |
47765
b7c7428eaab9
8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents:
47673
diff
changeset
|
25 |
#include "jvm.h" |
42650 | 26 |
#include "aot/aotLoader.hpp" |
7397 | 27 |
#include "classfile/classFileParser.hpp" |
34666 | 28 |
#include "classfile/classFileStream.hpp" |
7397 | 29 |
#include "classfile/classLoader.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
30 |
#include "classfile/classLoaderData.inline.hpp" |
14385 | 31 |
#include "classfile/defaultMethods.hpp" |
42650 | 32 |
#include "classfile/dictionary.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28817
diff
changeset
|
33 |
#include "classfile/javaClasses.inline.hpp" |
36508 | 34 |
#include "classfile/moduleEntry.hpp" |
54347
235883996bc7
8221698: Remove redundant includes from popular header files
iklam
parents:
54335
diff
changeset
|
35 |
#include "classfile/packageEntry.hpp" |
7397 | 36 |
#include "classfile/symbolTable.hpp" |
37 |
#include "classfile/systemDictionary.hpp" |
|
38 |
#include "classfile/verificationType.hpp" |
|
39 |
#include "classfile/verifier.hpp" |
|
40 |
#include "classfile/vmSymbols.hpp" |
|
35917
463d67f86eaa
8079408: Reimplement TraceClassLoading, TraceClassUnloading, and TraceClassLoaderData with Unified Logging.
mockner
parents:
35911
diff
changeset
|
41 |
#include "logging/log.hpp" |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
42 |
#include "logging/logStream.hpp" |
7397 | 43 |
#include "memory/allocation.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
44 |
#include "memory/metadataFactory.hpp" |
7397 | 45 |
#include "memory/oopFactory.hpp" |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
46 |
#include "memory/resourceArea.hpp" |
49359
59f6547e151f
8199264: Remove universe.inline.hpp to simplify include dependencies
stefank
parents:
49348
diff
changeset
|
47 |
#include "memory/universe.hpp" |
34666 | 48 |
#include "oops/annotations.hpp" |
49340
4e82736053ae
8191102: Incorrect include file use in classLoader.hpp
hseigel
parents:
48826
diff
changeset
|
49 |
#include "oops/constantPool.inline.hpp" |
59056
15936b142f86
8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents:
58817
diff
changeset
|
50 |
#include "oops/fieldStreams.inline.hpp" |
7397 | 51 |
#include "oops/instanceKlass.hpp" |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
52 |
#include "oops/instanceMirrorKlass.hpp" |
7397 | 53 |
#include "oops/klass.inline.hpp" |
54 |
#include "oops/klassVtable.hpp" |
|
34666 | 55 |
#include "oops/metadata.hpp" |
54042
6dd6f988b4e4
8219860: Cleanup ClassFileParser::parse_linenumber_table
redestad
parents:
53908
diff
changeset
|
56 |
#include "oops/method.inline.hpp" |
34666 | 57 |
#include "oops/oop.inline.hpp" |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
58 |
#include "oops/symbol.hpp" |
7397 | 59 |
#include "prims/jvmtiExport.hpp" |
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
60 |
#include "prims/jvmtiThreadState.hpp" |
49716 | 61 |
#include "runtime/arguments.hpp" |
49480
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
62 |
#include "runtime/handles.inline.hpp" |
7397 | 63 |
#include "runtime/javaCalls.hpp" |
53908
45a23c64d0f6
8219583: Windows build failure after JDK-8214777 (Avoid some GCC 8.X strncpy() errors in HotSpot)
shade
parents:
53882
diff
changeset
|
64 |
#include "runtime/os.hpp" |
7397 | 65 |
#include "runtime/perfData.hpp" |
66 |
#include "runtime/reflection.hpp" |
|
49594
898ef81cbc0e
8200106: Move NoSafepointVerifier out from gcLocker.hpp
stefank
parents:
49593
diff
changeset
|
67 |
#include "runtime/safepointVerifiers.hpp" |
7397 | 68 |
#include "runtime/signature.hpp" |
69 |
#include "runtime/timer.hpp" |
|
70 |
#include "services/classLoadingService.hpp" |
|
71 |
#include "services/threadService.hpp" |
|
46625 | 72 |
#include "utilities/align.hpp" |
46502
116a09d8f142
8180755: Remove use of bitMap.inline.hpp include from instanceKlass.hpp and c1_ValueSet.hpp
tschatzl
parents:
46448
diff
changeset
|
73 |
#include "utilities/bitMap.inline.hpp" |
49593
4dd58ecc9912
8200105: Remove cyclic dependency between oop.inline.hpp and collectedHeap.inline.hpp
stefank
parents:
49480
diff
changeset
|
74 |
#include "utilities/copy.hpp" |
30764 | 75 |
#include "utilities/exceptions.hpp" |
15194
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15185
diff
changeset
|
76 |
#include "utilities/globalDefinitions.hpp" |
46448 | 77 |
#include "utilities/growableArray.hpp" |
27683
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
78 |
#include "utilities/macros.hpp" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25507
diff
changeset
|
79 |
#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
|
80 |
#include "utilities/resourceHash.hpp" |
54347
235883996bc7
8221698: Remove redundant includes from popular header files
iklam
parents:
54335
diff
changeset
|
81 |
#include "utilities/utf8.hpp" |
235883996bc7
8221698: Remove redundant includes from popular header files
iklam
parents:
54335
diff
changeset
|
82 |
|
27683
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
83 |
#if INCLUDE_CDS |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
84 |
#include "classfile/systemDictionaryShared.hpp" |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27402
diff
changeset
|
85 |
#endif |
50113 | 86 |
#if INCLUDE_JFR |
87 |
#include "jfr/support/jfrTraceIdExtension.hpp" |
|
88 |
#endif |
|
1 | 89 |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
90 |
// 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
|
91 |
// 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
|
92 |
// 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
|
93 |
// pool and when parsing line number tables. |
1 | 94 |
|
95 |
// We add assert in debug mode when class format is not checked. |
|
96 |
||
97 |
#define JAVA_CLASSFILE_MAGIC 0xCAFEBABE |
|
98 |
#define JAVA_MIN_SUPPORTED_VERSION 45 |
|
49716 | 99 |
#define JAVA_PREVIEW_MINOR_VERSION 65535 |
1 | 100 |
|
101 |
// Used for two backward compatibility reasons: |
|
102 |
// - to check for new additions to the class file format in JDK1.5 |
|
103 |
// - to check for bug fixes in the format checker in JDK1.5 |
|
104 |
#define JAVA_1_5_VERSION 49 |
|
105 |
||
106 |
// Used for backward compatibility reasons: |
|
107 |
// - 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
|
108 |
// - also used as the max version when running in jdk6 |
1 | 109 |
#define JAVA_6_VERSION 50 |
110 |
||
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
111 |
// Used for backward compatibility reasons: |
33799
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
112 |
// - to disallow argument and require ACC_STATIC for <clinit> methods |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
113 |
#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
|
114 |
|
14385 | 115 |
// Extension method support. |
116 |
#define JAVA_8_VERSION 52 |
|
117 |
||
35941
be5a3f551026
8148785: Update class file version to 53 for JDK-9
hseigel
parents:
35917
diff
changeset
|
118 |
#define JAVA_9_VERSION 53 |
be5a3f551026
8148785: Update class file version to 53 for JDK-9
hseigel
parents:
35917
diff
changeset
|
119 |
|
48081 | 120 |
#define JAVA_10_VERSION 54 |
121 |
||
48355 | 122 |
#define JAVA_11_VERSION 55 |
123 |
||
50892 | 124 |
#define JAVA_12_VERSION 56 |
125 |
||
53023 | 126 |
#define JAVA_13_VERSION 57 |
127 |
||
55382 | 128 |
#define JAVA_14_VERSION 58 |
129 |
||
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
130 |
void ClassFileParser::set_class_bad_constant_seen(short bad_constant) { |
54595
a61da18408c1
8222502: Replace 19,20 case alternatives with JVM_CONSTANT_Module/Package names
lfoltan
parents:
54557
diff
changeset
|
131 |
assert((bad_constant == JVM_CONSTANT_Module || |
a61da18408c1
8222502: Replace 19,20 case alternatives with JVM_CONSTANT_Module/Package names
lfoltan
parents:
54557
diff
changeset
|
132 |
bad_constant == JVM_CONSTANT_Package) && _major_version >= JAVA_9_VERSION, |
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
133 |
"Unexpected bad constant pool entry"); |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
134 |
if (_bad_constant_seen == 0) _bad_constant_seen = bad_constant; |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
135 |
} |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
136 |
|
34666 | 137 |
void ClassFileParser::parse_constant_pool_entries(const ClassFileStream* const stream, |
138 |
ConstantPool* cp, |
|
139 |
const int length, |
|
140 |
TRAPS) { |
|
141 |
assert(stream != NULL, "invariant"); |
|
142 |
assert(cp != NULL, "invariant"); |
|
143 |
||
1 | 144 |
// Use a local copy of ClassFileStream. It helps the C++ compiler to optimize |
145 |
// this function (_current can be allocated in a register, with scalar |
|
146 |
// replacement of aggregates). The _current pointer is copied back to |
|
147 |
// stream() when this function returns. DON'T call another method within |
|
148 |
// this method that uses stream(). |
|
34666 | 149 |
const ClassFileStream cfs1 = *stream; |
150 |
const ClassFileStream* const cfs = &cfs1; |
|
151 |
||
152 |
assert(cfs->allocated_on_stack(), "should be local"); |
|
153 |
debug_only(const u1* const old_current = stream->current();) |
|
1 | 154 |
|
155 |
// Used for batching symbol allocations. |
|
156 |
const char* names[SymbolTable::symbol_alloc_batch_size]; |
|
157 |
int lengths[SymbolTable::symbol_alloc_batch_size]; |
|
158 |
int indices[SymbolTable::symbol_alloc_batch_size]; |
|
159 |
unsigned int hashValues[SymbolTable::symbol_alloc_batch_size]; |
|
160 |
int names_count = 0; |
|
161 |
||
162 |
// parsing Index 0 is unused |
|
163 |
for (int index = 1; index < length; index++) { |
|
164 |
// Each of the following case guarantees one more byte in the stream |
|
165 |
// for the following tag or the access_flags following constant pool, |
|
166 |
// so we don't need bounds-check for reading tag. |
|
34666 | 167 |
const u1 tag = cfs->get_u1_fast(); |
1 | 168 |
switch (tag) { |
34666 | 169 |
case JVM_CONSTANT_Class : { |
170 |
cfs->guarantee_more(3, CHECK); // name_index, tag/access_flags |
|
171 |
const u2 name_index = cfs->get_u2_fast(); |
|
172 |
cp->klass_index_at_put(index, name_index); |
|
1 | 173 |
break; |
34666 | 174 |
} |
175 |
case JVM_CONSTANT_Fieldref: { |
|
176 |
cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags |
|
177 |
const u2 class_index = cfs->get_u2_fast(); |
|
178 |
const u2 name_and_type_index = cfs->get_u2_fast(); |
|
179 |
cp->field_at_put(index, class_index, name_and_type_index); |
|
1 | 180 |
break; |
34666 | 181 |
} |
182 |
case JVM_CONSTANT_Methodref: { |
|
183 |
cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags |
|
184 |
const u2 class_index = cfs->get_u2_fast(); |
|
185 |
const u2 name_and_type_index = cfs->get_u2_fast(); |
|
186 |
cp->method_at_put(index, class_index, name_and_type_index); |
|
1 | 187 |
break; |
34666 | 188 |
} |
189 |
case JVM_CONSTANT_InterfaceMethodref: { |
|
190 |
cfs->guarantee_more(5, CHECK); // class_index, name_and_type_index, tag/access_flags |
|
191 |
const u2 class_index = cfs->get_u2_fast(); |
|
192 |
const u2 name_and_type_index = cfs->get_u2_fast(); |
|
193 |
cp->interface_method_at_put(index, class_index, name_and_type_index); |
|
1 | 194 |
break; |
34666 | 195 |
} |
196 |
case JVM_CONSTANT_String : { |
|
197 |
cfs->guarantee_more(3, CHECK); // string_index, tag/access_flags |
|
198 |
const u2 string_index = cfs->get_u2_fast(); |
|
199 |
cp->string_index_at_put(index, string_index); |
|
1 | 200 |
break; |
34666 | 201 |
} |
5882 | 202 |
case JVM_CONSTANT_MethodHandle : |
34666 | 203 |
case JVM_CONSTANT_MethodType: { |
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
204 |
if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
5882 | 205 |
classfile_parse_error( |
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
206 |
"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
|
207 |
tag, CHECK); |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
208 |
} |
5882 | 209 |
if (tag == JVM_CONSTANT_MethodHandle) { |
210 |
cfs->guarantee_more(4, CHECK); // ref_kind, method_index, tag/access_flags |
|
34666 | 211 |
const u1 ref_kind = cfs->get_u1_fast(); |
212 |
const u2 method_index = cfs->get_u2_fast(); |
|
213 |
cp->method_handle_index_at_put(index, ref_kind, method_index); |
|
214 |
} |
|
215 |
else if (tag == JVM_CONSTANT_MethodType) { |
|
5882 | 216 |
cfs->guarantee_more(3, CHECK); // signature_index, tag/access_flags |
34666 | 217 |
const u2 signature_index = cfs->get_u2_fast(); |
218 |
cp->method_type_index_at_put(index, signature_index); |
|
219 |
} |
|
220 |
else { |
|
5882 | 221 |
ShouldNotReachHere(); |
222 |
} |
|
223 |
break; |
|
34666 | 224 |
} |
48826 | 225 |
case JVM_CONSTANT_Dynamic : { |
226 |
if (_major_version < Verifier::DYNAMICCONSTANT_MAJOR_VERSION) { |
|
227 |
classfile_parse_error( |
|
228 |
"Class file version does not support constant tag %u in class file %s", |
|
229 |
tag, CHECK); |
|
230 |
} |
|
231 |
cfs->guarantee_more(5, CHECK); // bsm_index, nt, tag/access_flags |
|
232 |
const u2 bootstrap_specifier_index = cfs->get_u2_fast(); |
|
233 |
const u2 name_and_type_index = cfs->get_u2_fast(); |
|
234 |
if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index) { |
|
235 |
_max_bootstrap_specifier_index = (int) bootstrap_specifier_index; // collect for later |
|
236 |
} |
|
237 |
cp->dynamic_constant_at_put(index, bootstrap_specifier_index, name_and_type_index); |
|
238 |
break; |
|
239 |
} |
|
34666 | 240 |
case JVM_CONSTANT_InvokeDynamic : { |
241 |
if (_major_version < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
|
242 |
classfile_parse_error( |
|
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8653
diff
changeset
|
243 |
"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
|
244 |
tag, CHECK); |
34666 | 245 |
} |
246 |
cfs->guarantee_more(5, CHECK); // bsm_index, nt, tag/access_flags |
|
247 |
const u2 bootstrap_specifier_index = cfs->get_u2_fast(); |
|
248 |
const u2 name_and_type_index = cfs->get_u2_fast(); |
|
249 |
if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index) { |
|
250 |
_max_bootstrap_specifier_index = (int) bootstrap_specifier_index; // collect for later |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5888
diff
changeset
|
251 |
} |
34666 | 252 |
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
|
253 |
break; |
34666 | 254 |
} |
255 |
case JVM_CONSTANT_Integer: { |
|
256 |
cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags |
|
257 |
const u4 bytes = cfs->get_u4_fast(); |
|
258 |
cp->int_at_put(index, (jint)bytes); |
|
1 | 259 |
break; |
34666 | 260 |
} |
261 |
case JVM_CONSTANT_Float: { |
|
262 |
cfs->guarantee_more(5, CHECK); // bytes, tag/access_flags |
|
263 |
const u4 bytes = cfs->get_u4_fast(); |
|
264 |
cp->float_at_put(index, *(jfloat*)&bytes); |
|
1 | 265 |
break; |
34666 | 266 |
} |
267 |
case JVM_CONSTANT_Long: { |
|
1 | 268 |
// A mangled type might cause you to overrun allocated memory |
34666 | 269 |
guarantee_property(index + 1 < length, |
1 | 270 |
"Invalid constant pool entry %u in class file %s", |
34666 | 271 |
index, |
272 |
CHECK); |
|
273 |
cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags |
|
274 |
const u8 bytes = cfs->get_u8_fast(); |
|
275 |
cp->long_at_put(index, bytes); |
|
1 | 276 |
index++; // Skip entry following eigth-byte constant, see JVM book p. 98 |
277 |
break; |
|
34666 | 278 |
} |
279 |
case JVM_CONSTANT_Double: { |
|
1 | 280 |
// A mangled type might cause you to overrun allocated memory |
281 |
guarantee_property(index+1 < length, |
|
282 |
"Invalid constant pool entry %u in class file %s", |
|
34666 | 283 |
index, |
284 |
CHECK); |
|
285 |
cfs->guarantee_more(9, CHECK); // bytes, tag/access_flags |
|
286 |
const u8 bytes = cfs->get_u8_fast(); |
|
287 |
cp->double_at_put(index, *(jdouble*)&bytes); |
|
1 | 288 |
index++; // Skip entry following eigth-byte constant, see JVM book p. 98 |
289 |
break; |
|
34666 | 290 |
} |
291 |
case JVM_CONSTANT_NameAndType: { |
|
292 |
cfs->guarantee_more(5, CHECK); // name_index, signature_index, tag/access_flags |
|
293 |
const u2 name_index = cfs->get_u2_fast(); |
|
294 |
const u2 signature_index = cfs->get_u2_fast(); |
|
295 |
cp->name_and_type_at_put(index, name_index, signature_index); |
|
296 |
break; |
|
297 |
} |
|
298 |
case JVM_CONSTANT_Utf8 : { |
|
299 |
cfs->guarantee_more(2, CHECK); // utf8_length |
|
300 |
u2 utf8_length = cfs->get_u2_fast(); |
|
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
301 |
const u1* utf8_buffer = cfs->current(); |
34666 | 302 |
assert(utf8_buffer != NULL, "null utf8 buffer"); |
303 |
// Got utf8 string, guarantee utf8_length+1 bytes, set stream position forward. |
|
304 |
cfs->guarantee_more(utf8_length+1, CHECK); // utf8 string, tag/access_flags |
|
305 |
cfs->skip_u1_fast(utf8_length); |
|
306 |
||
307 |
// Before storing the symbol, make sure it's legal |
|
308 |
if (_need_verify) { |
|
309 |
verify_legal_utf8(utf8_buffer, utf8_length, CHECK); |
|
310 |
} |
|
311 |
||
312 |
if (has_cp_patch_at(index)) { |
|
313 |
Handle patch = clear_cp_patch_at(index); |
|
314 |
guarantee_property(java_lang_String::is_instance(patch()), |
|
315 |
"Illegal utf8 patch at %d in class file %s", |
|
316 |
index, |
|
317 |
CHECK); |
|
318 |
const char* const str = java_lang_String::as_utf8_string(patch()); |
|
319 |
// (could use java_lang_String::as_symbol instead, but might as well batch them) |
|
320 |
utf8_buffer = (const u1*) str; |
|
54335
d9f6d16299b1
8221408: Windows 32bit build build errors/warnings in hotspot
stuefe
parents:
54257
diff
changeset
|
321 |
utf8_length = (u2) strlen(str); |
34666 | 322 |
} |
323 |
||
324 |
unsigned int hash; |
|
325 |
Symbol* const result = SymbolTable::lookup_only((const char*)utf8_buffer, |
|
326 |
utf8_length, |
|
327 |
hash); |
|
328 |
if (result == NULL) { |
|
329 |
names[names_count] = (const char*)utf8_buffer; |
|
330 |
lengths[names_count] = utf8_length; |
|
331 |
indices[names_count] = index; |
|
332 |
hashValues[names_count++] = hash; |
|
333 |
if (names_count == SymbolTable::symbol_alloc_batch_size) { |
|
334 |
SymbolTable::new_symbols(_loader_data, |
|
59056
15936b142f86
8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents:
58817
diff
changeset
|
335 |
constantPoolHandle(THREAD, cp), |
34666 | 336 |
names_count, |
337 |
names, |
|
338 |
lengths, |
|
339 |
indices, |
|
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54595
diff
changeset
|
340 |
hashValues); |
34666 | 341 |
names_count = 0; |
342 |
} |
|
343 |
} else { |
|
344 |
cp->symbol_at_put(index, result); |
|
1 | 345 |
} |
346 |
break; |
|
34666 | 347 |
} |
54595
a61da18408c1
8222502: Replace 19,20 case alternatives with JVM_CONSTANT_Module/Package names
lfoltan
parents:
54557
diff
changeset
|
348 |
case JVM_CONSTANT_Module: |
a61da18408c1
8222502: Replace 19,20 case alternatives with JVM_CONSTANT_Module/Package names
lfoltan
parents:
54557
diff
changeset
|
349 |
case JVM_CONSTANT_Package: { |
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
350 |
// Record that an error occurred in these two cases but keep parsing so |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
351 |
// that ACC_Module can be checked for in the access_flags. Need to |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
352 |
// throw NoClassDefFoundError in that case. |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
353 |
if (_major_version >= JAVA_9_VERSION) { |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
354 |
cfs->guarantee_more(3, CHECK); |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
355 |
cfs->get_u2_fast(); |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
356 |
set_class_bad_constant_seen(tag); |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
357 |
break; |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
358 |
} |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
359 |
} |
34666 | 360 |
default: { |
361 |
classfile_parse_error("Unknown constant tag %u in class file %s", |
|
362 |
tag, |
|
363 |
CHECK); |
|
1 | 364 |
break; |
34666 | 365 |
} |
366 |
} // end of switch(tag) |
|
367 |
} // end of for |
|
1 | 368 |
|
369 |
// Allocate the remaining symbols |
|
370 |
if (names_count > 0) { |
|
34666 | 371 |
SymbolTable::new_symbols(_loader_data, |
59056
15936b142f86
8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents:
58817
diff
changeset
|
372 |
constantPoolHandle(THREAD, cp), |
34666 | 373 |
names_count, |
374 |
names, |
|
375 |
lengths, |
|
376 |
indices, |
|
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54595
diff
changeset
|
377 |
hashValues); |
1 | 378 |
} |
379 |
||
34666 | 380 |
// Copy _current pointer of local copy back to stream. |
381 |
assert(stream->current() == old_current, "non-exclusive use of stream"); |
|
382 |
stream->set_current(cfs1.current()); |
|
383 |
||
1 | 384 |
} |
385 |
||
34666 | 386 |
static inline bool valid_cp_range(int index, int length) { |
387 |
return (index > 0 && index < length); |
|
388 |
} |
|
389 |
||
390 |
static inline Symbol* check_symbol_at(const ConstantPool* cp, int index) { |
|
391 |
assert(cp != NULL, "invariant"); |
|
392 |
if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8()) { |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
393 |
return cp->symbol_at(index); |
34666 | 394 |
} |
395 |
return NULL; |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
396 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
397 |
|
33604
ad1cd9269bd4
8139116: Fixes for warning "format not a string literal"
goetz
parents:
33602
diff
changeset
|
398 |
#ifdef ASSERT |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
399 |
PRAGMA_DIAG_PUSH |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
400 |
PRAGMA_FORMAT_NONLITERAL_IGNORED |
34666 | 401 |
void ClassFileParser::report_assert_property_failure(const char* msg, TRAPS) const { |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
402 |
ResourceMark rm(THREAD); |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
32824
diff
changeset
|
403 |
fatal(msg, _class_name->as_C_string()); |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
404 |
} |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
405 |
|
34666 | 406 |
void ClassFileParser::report_assert_property_failure(const char* msg, |
407 |
int index, |
|
408 |
TRAPS) const { |
|
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
409 |
ResourceMark rm(THREAD); |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
32824
diff
changeset
|
410 |
fatal(msg, index, _class_name->as_C_string()); |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
411 |
} |
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
412 |
PRAGMA_DIAG_POP |
33604
ad1cd9269bd4
8139116: Fixes for warning "format not a string literal"
goetz
parents:
33602
diff
changeset
|
413 |
#endif |
29201
fee2bbb2ec1d
8073389: Remove the include of resourceArea.hpp from classFileParser.hpp
stefank
parents:
29081
diff
changeset
|
414 |
|
34666 | 415 |
void ClassFileParser::parse_constant_pool(const ClassFileStream* const stream, |
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
416 |
ConstantPool* const cp, |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
417 |
const int length, |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
418 |
TRAPS) { |
34666 | 419 |
assert(cp != NULL, "invariant"); |
420 |
assert(stream != NULL, "invariant"); |
|
1 | 421 |
|
422 |
// parsing constant pool entries |
|
34666 | 423 |
parse_constant_pool_entries(stream, cp, length, CHECK); |
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
424 |
if (class_bad_constant_seen() != 0) { |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
425 |
// a bad CP entry has been detected previously so stop parsing and just return. |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
426 |
return; |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
427 |
} |
1 | 428 |
|
429 |
int index = 1; // declared outside of loops for portability |
|
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
430 |
int num_klasses = 0; |
1 | 431 |
|
34666 | 432 |
// first verification pass - validate cross references |
433 |
// and fixup class and string constants |
|
1 | 434 |
for (index = 1; index < length; index++) { // Index 0 is unused |
34666 | 435 |
const jbyte tag = cp->tag_at(index).value(); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
436 |
switch (tag) { |
34666 | 437 |
case JVM_CONSTANT_Class: { |
1 | 438 |
ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present |
439 |
break; |
|
34666 | 440 |
} |
441 |
case JVM_CONSTANT_Fieldref: |
|
1 | 442 |
// fall through |
34666 | 443 |
case JVM_CONSTANT_Methodref: |
1 | 444 |
// fall through |
34666 | 445 |
case JVM_CONSTANT_InterfaceMethodref: { |
1 | 446 |
if (!_need_verify) break; |
34666 | 447 |
const int klass_ref_index = cp->klass_ref_index_at(index); |
448 |
const 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
|
449 |
check_property(valid_klass_reference_at(klass_ref_index), |
1 | 450 |
"Invalid constant pool index %u in class file %s", |
34666 | 451 |
klass_ref_index, CHECK); |
1 | 452 |
check_property(valid_cp_range(name_and_type_ref_index, length) && |
34666 | 453 |
cp->tag_at(name_and_type_ref_index).is_name_and_type(), |
454 |
"Invalid constant pool index %u in class file %s", |
|
455 |
name_and_type_ref_index, CHECK); |
|
1 | 456 |
break; |
457 |
} |
|
34666 | 458 |
case JVM_CONSTANT_String: { |
1 | 459 |
ShouldNotReachHere(); // Only JVM_CONSTANT_StringIndex should be present |
460 |
break; |
|
34666 | 461 |
} |
462 |
case JVM_CONSTANT_Integer: |
|
1 | 463 |
break; |
34666 | 464 |
case JVM_CONSTANT_Float: |
1 | 465 |
break; |
34666 | 466 |
case JVM_CONSTANT_Long: |
467 |
case JVM_CONSTANT_Double: { |
|
1 | 468 |
index++; |
469 |
check_property( |
|
470 |
(index < length && cp->tag_at(index).is_invalid()), |
|
471 |
"Improper constant pool long/double index %u in class file %s", |
|
34666 | 472 |
index, CHECK); |
1 | 473 |
break; |
474 |
} |
|
34666 | 475 |
case JVM_CONSTANT_NameAndType: { |
476 |
if (!_need_verify) break; |
|
477 |
const int name_ref_index = cp->name_ref_index_at(index); |
|
478 |
const int signature_ref_index = cp->signature_ref_index_at(index); |
|
479 |
check_property(valid_symbol_at(name_ref_index), |
|
480 |
"Invalid constant pool index %u in class file %s", |
|
481 |
name_ref_index, CHECK); |
|
482 |
check_property(valid_symbol_at(signature_ref_index), |
|
483 |
"Invalid constant pool index %u in class file %s", |
|
484 |
signature_ref_index, CHECK); |
|
1 | 485 |
break; |
34666 | 486 |
} |
487 |
case JVM_CONSTANT_Utf8: |
|
488 |
break; |
|
489 |
case JVM_CONSTANT_UnresolvedClass: // fall-through |
|
490 |
case JVM_CONSTANT_UnresolvedClassInError: { |
|
1 | 491 |
ShouldNotReachHere(); // Only JVM_CONSTANT_ClassIndex should be present |
492 |
break; |
|
34666 | 493 |
} |
494 |
case JVM_CONSTANT_ClassIndex: { |
|
495 |
const int class_index = cp->klass_index_at(index); |
|
496 |
check_property(valid_symbol_at(class_index), |
|
497 |
"Invalid constant pool index %u in class file %s", |
|
498 |
class_index, CHECK); |
|
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
499 |
cp->unresolved_klass_at_put(index, class_index, num_klasses++); |
1 | 500 |
break; |
34666 | 501 |
} |
502 |
case JVM_CONSTANT_StringIndex: { |
|
503 |
const int string_index = cp->string_index_at(index); |
|
504 |
check_property(valid_symbol_at(string_index), |
|
505 |
"Invalid constant pool index %u in class file %s", |
|
506 |
string_index, CHECK); |
|
507 |
Symbol* const sym = cp->symbol_at(string_index); |
|
508 |
cp->unresolved_string_at_put(index, sym); |
|
1 | 509 |
break; |
34666 | 510 |
} |
511 |
case JVM_CONSTANT_MethodHandle: { |
|
512 |
const int ref_index = cp->method_handle_index_at(index); |
|
513 |
check_property(valid_cp_range(ref_index, length), |
|
514 |
"Invalid constant pool index %u in class file %s", |
|
515 |
ref_index, CHECK); |
|
516 |
const constantTag tag = cp->tag_at(ref_index); |
|
517 |
const int ref_kind = cp->method_handle_ref_kind_at(index); |
|
518 |
||
519 |
switch (ref_kind) { |
|
5882 | 520 |
case JVM_REF_getField: |
521 |
case JVM_REF_getStatic: |
|
522 |
case JVM_REF_putField: |
|
34666 | 523 |
case JVM_REF_putStatic: { |
5882 | 524 |
check_property( |
525 |
tag.is_field(), |
|
526 |
"Invalid constant pool index %u in class file %s (not a field)", |
|
34666 | 527 |
ref_index, CHECK); |
5882 | 528 |
break; |
34666 | 529 |
} |
5882 | 530 |
case JVM_REF_invokeVirtual: |
34666 | 531 |
case JVM_REF_newInvokeSpecial: { |
5882 | 532 |
check_property( |
533 |
tag.is_method(), |
|
534 |
"Invalid constant pool index %u in class file %s (not a method)", |
|
34666 | 535 |
ref_index, CHECK); |
5882 | 536 |
break; |
34666 | 537 |
} |
17024
49cbeca23983
8006267: InterfaceMethod_ref should allow invokestatic and invokespecial
bharadwaj
parents:
16692
diff
changeset
|
538 |
case JVM_REF_invokeStatic: |
34666 | 539 |
case JVM_REF_invokeSpecial: { |
540 |
check_property( |
|
541 |
tag.is_method() || |
|
542 |
((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()), |
|
543 |
"Invalid constant pool index %u in class file %s (not a method)", |
|
544 |
ref_index, CHECK); |
|
545 |
break; |
|
546 |
} |
|
547 |
case JVM_REF_invokeInterface: { |
|
5882 | 548 |
check_property( |
549 |
tag.is_interface_method(), |
|
550 |
"Invalid constant pool index %u in class file %s (not an interface method)", |
|
34666 | 551 |
ref_index, CHECK); |
5882 | 552 |
break; |
34666 | 553 |
} |
554 |
default: { |
|
5882 | 555 |
classfile_parse_error( |
556 |
"Bad method handle kind at constant pool index %u in class file %s", |
|
34666 | 557 |
index, CHECK); |
5882 | 558 |
} |
34666 | 559 |
} // switch(refkind) |
560 |
// Keep the ref_index unchanged. It will be indirected at link-time. |
|
5882 | 561 |
break; |
34666 | 562 |
} // case MethodHandle |
563 |
case JVM_CONSTANT_MethodType: { |
|
564 |
const int ref_index = cp->method_type_index_at(index); |
|
565 |
check_property(valid_symbol_at(ref_index), |
|
566 |
"Invalid constant pool index %u in class file %s", |
|
567 |
ref_index, CHECK); |
|
5882 | 568 |
break; |
34666 | 569 |
} |
48826 | 570 |
case JVM_CONSTANT_Dynamic: { |
571 |
const int name_and_type_ref_index = |
|
53745
a535ba736cab
8218004: Clean up terminology for shared methods within the JVM for indy and condy support
lfoltan
parents:
53739
diff
changeset
|
572 |
cp->bootstrap_name_and_type_ref_index_at(index); |
48826 | 573 |
|
574 |
check_property(valid_cp_range(name_and_type_ref_index, length) && |
|
575 |
cp->tag_at(name_and_type_ref_index).is_name_and_type(), |
|
576 |
"Invalid constant pool index %u in class file %s", |
|
577 |
name_and_type_ref_index, CHECK); |
|
578 |
// bootstrap specifier index must be checked later, |
|
579 |
// when BootstrapMethods attr is available |
|
580 |
||
581 |
// Mark the constant pool as having a CONSTANT_Dynamic_info structure |
|
582 |
cp->set_has_dynamic_constant(); |
|
583 |
break; |
|
584 |
} |
|
34666 | 585 |
case JVM_CONSTANT_InvokeDynamic: { |
586 |
const int name_and_type_ref_index = |
|
53745
a535ba736cab
8218004: Clean up terminology for shared methods within the JVM for indy and condy support
lfoltan
parents:
53739
diff
changeset
|
587 |
cp->bootstrap_name_and_type_ref_index_at(index); |
34666 | 588 |
|
589 |
check_property(valid_cp_range(name_and_type_ref_index, length) && |
|
590 |
cp->tag_at(name_and_type_ref_index).is_name_and_type(), |
|
591 |
"Invalid constant pool index %u in class file %s", |
|
592 |
name_and_type_ref_index, CHECK); |
|
593 |
// bootstrap specifier index must be checked later, |
|
594 |
// when BootstrapMethods attr is available |
|
595 |
break; |
|
596 |
} |
|
597 |
default: { |
|
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
32824
diff
changeset
|
598 |
fatal("bad constant pool tag value %u", cp->tag_at(index).value()); |
1 | 599 |
ShouldNotReachHere(); |
600 |
break; |
|
34666 | 601 |
} |
602 |
} // switch(tag) |
|
1 | 603 |
} // end of for |
604 |
||
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
605 |
_first_patched_klass_resolved_index = num_klasses; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
606 |
cp->allocate_resolved_klasses(_loader_data, num_klasses + _max_num_patched_klasses, CHECK); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
607 |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
608 |
if (_cp_patches != NULL) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
609 |
// need to treat this_class specially... |
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
610 |
|
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
611 |
// Add dummy utf8 entries in the space reserved for names of patched classes. We'll use "*" |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
612 |
// for now. These will be replaced with actual names of the patched classes in patch_class(). |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
613 |
Symbol* s = vmSymbols::star_name(); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
614 |
for (int n=_orig_cp_size; n<cp->length(); n++) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
615 |
cp->symbol_at_put(n, s); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
616 |
} |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
617 |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
618 |
int this_class_index; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
619 |
{ |
34666 | 620 |
stream->guarantee_more(8, CHECK); // flags, this_class, super_class, infs_len |
621 |
const u1* const mark = stream->current(); |
|
622 |
stream->skip_u2_fast(1); // skip flags |
|
623 |
this_class_index = stream->get_u2_fast(); |
|
624 |
stream->set_current(mark); // revert to mark |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
625 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
626 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
627 |
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
|
628 |
if (has_cp_patch_at(index)) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
629 |
guarantee_property(index != this_class_index, |
34666 | 630 |
"Illegal constant pool patch to self at %d in class file %s", |
631 |
index, CHECK); |
|
632 |
patch_constant_pool(cp, index, cp_patch_at(index), CHECK); |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
633 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
634 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
635 |
} |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
636 |
|
1 | 637 |
if (!_need_verify) { |
34666 | 638 |
return; |
1 | 639 |
} |
640 |
||
641 |
// 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
|
642 |
// but not yet to the other entries |
1 | 643 |
for (index = 1; index < length; index++) { |
34666 | 644 |
const jbyte tag = cp->tag_at(index).value(); |
1 | 645 |
switch (tag) { |
646 |
case JVM_CONSTANT_UnresolvedClass: { |
|
34666 | 647 |
const Symbol* const 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
|
648 |
// check the name, even if _cp_patches will overwrite it |
34666 | 649 |
verify_legal_class_name(class_name, CHECK); |
1 | 650 |
break; |
651 |
} |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
652 |
case JVM_CONSTANT_NameAndType: { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
653 |
if (_need_verify) { |
34666 | 654 |
const int sig_index = cp->signature_ref_index_at(index); |
655 |
const int name_index = cp->name_ref_index_at(index); |
|
656 |
const Symbol* const name = cp->symbol_at(name_index); |
|
657 |
const Symbol* const sig = cp->symbol_at(sig_index); |
|
35218
00aa934a1a20
8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents:
35071
diff
changeset
|
658 |
guarantee_property(sig->utf8_length() != 0, |
00aa934a1a20
8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents:
35071
diff
changeset
|
659 |
"Illegal zero length constant pool entry at %d in class %s", |
00aa934a1a20
8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents:
35071
diff
changeset
|
660 |
sig_index, CHECK); |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
661 |
guarantee_property(name->utf8_length() != 0, |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
662 |
"Illegal zero length constant pool entry at %d in class %s", |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
663 |
name_index, CHECK); |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
664 |
|
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
665 |
if (sig->char_at(0) == JVM_SIGNATURE_FUNC) { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
666 |
// Format check method name and signature |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
667 |
verify_legal_method_name(name, CHECK); |
34666 | 668 |
verify_legal_method_signature(name, sig, CHECK); |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
669 |
} else { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
670 |
// Format check field name and signature |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
671 |
verify_legal_field_name(name, CHECK); |
34666 | 672 |
verify_legal_field_signature(name, sig, CHECK); |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
673 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
674 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
675 |
break; |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
676 |
} |
48826 | 677 |
case JVM_CONSTANT_Dynamic: { |
678 |
const int name_and_type_ref_index = |
|
679 |
cp->name_and_type_ref_index_at(index); |
|
680 |
// already verified to be utf8 |
|
681 |
const int name_ref_index = |
|
682 |
cp->name_ref_index_at(name_and_type_ref_index); |
|
683 |
// already verified to be utf8 |
|
684 |
const int signature_ref_index = |
|
685 |
cp->signature_ref_index_at(name_and_type_ref_index); |
|
686 |
const Symbol* const name = cp->symbol_at(name_ref_index); |
|
687 |
const Symbol* const signature = cp->symbol_at(signature_ref_index); |
|
688 |
if (_need_verify) { |
|
689 |
// CONSTANT_Dynamic's name and signature are verified above, when iterating NameAndType_info. |
|
690 |
// Need only to be sure signature is non-zero length and the right type. |
|
691 |
if (signature->utf8_length() == 0 || |
|
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
692 |
signature->char_at(0) == JVM_SIGNATURE_FUNC) { |
48826 | 693 |
throwIllegalSignature("CONSTANT_Dynamic", name, signature, CHECK); |
694 |
} |
|
695 |
} |
|
696 |
break; |
|
697 |
} |
|
9117
30d757743e56
7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
jrose
parents:
9116
diff
changeset
|
698 |
case JVM_CONSTANT_InvokeDynamic: |
1 | 699 |
case JVM_CONSTANT_Fieldref: |
700 |
case JVM_CONSTANT_Methodref: |
|
701 |
case JVM_CONSTANT_InterfaceMethodref: { |
|
34666 | 702 |
const int name_and_type_ref_index = |
703 |
cp->name_and_type_ref_index_at(index); |
|
1 | 704 |
// already verified to be utf8 |
34666 | 705 |
const int name_ref_index = |
706 |
cp->name_ref_index_at(name_and_type_ref_index); |
|
1 | 707 |
// already verified to be utf8 |
34666 | 708 |
const int signature_ref_index = |
709 |
cp->signature_ref_index_at(name_and_type_ref_index); |
|
710 |
const Symbol* const name = cp->symbol_at(name_ref_index); |
|
711 |
const Symbol* const signature = cp->symbol_at(signature_ref_index); |
|
1 | 712 |
if (tag == JVM_CONSTANT_Fieldref) { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
713 |
if (_need_verify) { |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
714 |
// Field name and signature are verified above, when iterating NameAndType_info. |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
715 |
// Need only to be sure signature is non-zero length and the right type. |
35218
00aa934a1a20
8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents:
35071
diff
changeset
|
716 |
if (signature->utf8_length() == 0 || |
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
717 |
signature->char_at(0) == JVM_SIGNATURE_FUNC) { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
718 |
throwIllegalSignature("Field", name, signature, CHECK); |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
719 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
720 |
} |
1 | 721 |
} else { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
722 |
if (_need_verify) { |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
723 |
// Method name and signature are verified above, when iterating NameAndType_info. |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
724 |
// Need only to be sure signature is non-zero length and the right type. |
35218
00aa934a1a20
8042660: vm/mlvm/anonloader/stress/byteMutation failed with: assert(index >=0 && index < _length) failed: symbol index overflow
hseigel
parents:
35071
diff
changeset
|
725 |
if (signature->utf8_length() == 0 || |
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
726 |
signature->char_at(0) != JVM_SIGNATURE_FUNC) { |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
727 |
throwIllegalSignature("Method", name, signature, CHECK); |
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
728 |
} |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
729 |
} |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
730 |
// 4509014: If a class method name begins with '<', it must be "<init>" |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
731 |
const unsigned int name_len = name->utf8_length(); |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
732 |
if (tag == JVM_CONSTANT_Methodref && |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
733 |
name_len != 0 && |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
734 |
name->char_at(0) == JVM_SIGNATURE_SPECIAL && |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
735 |
name != vmSymbols::object_initializer_name()) { |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
736 |
classfile_parse_error( |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
737 |
"Bad method name at constant pool index %u in class file %s", |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
738 |
name_ref_index, CHECK); |
1 | 739 |
} |
740 |
} |
|
741 |
break; |
|
742 |
} |
|
5882 | 743 |
case JVM_CONSTANT_MethodHandle: { |
34666 | 744 |
const int ref_index = cp->method_handle_index_at(index); |
745 |
const int ref_kind = cp->method_handle_ref_kind_at(index); |
|
5882 | 746 |
switch (ref_kind) { |
34666 | 747 |
case JVM_REF_invokeVirtual: |
748 |
case JVM_REF_invokeStatic: |
|
749 |
case JVM_REF_invokeSpecial: |
|
750 |
case JVM_REF_newInvokeSpecial: { |
|
751 |
const int name_and_type_ref_index = |
|
752 |
cp->name_and_type_ref_index_at(ref_index); |
|
753 |
const int name_ref_index = |
|
754 |
cp->name_ref_index_at(name_and_type_ref_index); |
|
755 |
const Symbol* const name = cp->symbol_at(name_ref_index); |
|
5882 | 756 |
if (ref_kind == JVM_REF_newInvokeSpecial) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
757 |
if (name != vmSymbols::object_initializer_name()) { |
5882 | 758 |
classfile_parse_error( |
759 |
"Bad constructor name at constant pool index %u in class file %s", |
|
34666 | 760 |
name_ref_index, CHECK); |
5882 | 761 |
} |
762 |
} else { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
763 |
if (name == vmSymbols::object_initializer_name()) { |
5882 | 764 |
classfile_parse_error( |
765 |
"Bad method name at constant pool index %u in class file %s", |
|
34666 | 766 |
name_ref_index, CHECK); |
5882 | 767 |
} |
768 |
} |
|
34666 | 769 |
break; |
5882 | 770 |
} |
771 |
// Other ref_kinds are already fully checked in previous pass. |
|
34666 | 772 |
} // switch(ref_kind) |
5882 | 773 |
break; |
774 |
} |
|
775 |
case JVM_CONSTANT_MethodType: { |
|
34666 | 776 |
const Symbol* const no_name = vmSymbols::type_name(); // place holder |
777 |
const Symbol* const signature = cp->method_type_signature_at(index); |
|
778 |
verify_legal_method_signature(no_name, signature, CHECK); |
|
5882 | 779 |
break; |
780 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
781 |
case JVM_CONSTANT_Utf8: { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
782 |
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
|
783 |
} |
34666 | 784 |
} // switch(tag) |
1 | 785 |
} // end of for |
786 |
} |
|
787 |
||
49480
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
788 |
Handle ClassFileParser::clear_cp_patch_at(int index) { |
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
789 |
Handle patch = cp_patch_at(index); |
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
790 |
_cp_patches->at_put(index, Handle()); |
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
791 |
assert(!has_cp_patch_at(index), ""); |
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
792 |
return patch; |
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
793 |
} |
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49364
diff
changeset
|
794 |
|
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
795 |
void ClassFileParser::patch_class(ConstantPool* cp, int class_index, Klass* k, Symbol* name) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
796 |
int name_index = _orig_cp_size + _num_patched_klasses; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
797 |
int resolved_klass_index = _first_patched_klass_resolved_index + _num_patched_klasses; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
798 |
|
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
799 |
cp->klass_at_put(class_index, name_index, resolved_klass_index, k, name); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
800 |
_num_patched_klasses ++; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
801 |
} |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
802 |
|
34666 | 803 |
void ClassFileParser::patch_constant_pool(ConstantPool* cp, |
804 |
int index, |
|
805 |
Handle patch, |
|
806 |
TRAPS) { |
|
807 |
assert(cp != NULL, "invariant"); |
|
808 |
||
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
809 |
BasicType patch_type = T_VOID; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
810 |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
811 |
switch (cp->tag_at(index).value()) { |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
812 |
|
34666 | 813 |
case JVM_CONSTANT_UnresolvedClass: { |
814 |
// Patching a class means pre-resolving it. |
|
815 |
// The name in the constant pool is ignored. |
|
816 |
if (java_lang_Class::is_instance(patch())) { |
|
817 |
guarantee_property(!java_lang_Class::is_primitive(patch()), |
|
818 |
"Illegal class patch at %d in class file %s", |
|
819 |
index, CHECK); |
|
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
820 |
Klass* k = java_lang_Class::as_Klass(patch()); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
821 |
patch_class(cp, index, k, k->name()); |
34666 | 822 |
} else { |
823 |
guarantee_property(java_lang_String::is_instance(patch()), |
|
824 |
"Illegal class patch at %d in class file %s", |
|
825 |
index, CHECK); |
|
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54595
diff
changeset
|
826 |
Symbol* const name = java_lang_String::as_symbol(patch()); |
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
827 |
patch_class(cp, index, NULL, name); |
34666 | 828 |
} |
829 |
break; |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
830 |
} |
34666 | 831 |
|
832 |
case JVM_CONSTANT_String: { |
|
833 |
// skip this patch and don't clear it. Needs the oop array for resolved |
|
834 |
// references to be created first. |
|
835 |
return; |
|
836 |
} |
|
837 |
case JVM_CONSTANT_Integer: patch_type = T_INT; goto patch_prim; |
|
838 |
case JVM_CONSTANT_Float: patch_type = T_FLOAT; goto patch_prim; |
|
839 |
case JVM_CONSTANT_Long: patch_type = T_LONG; goto patch_prim; |
|
840 |
case JVM_CONSTANT_Double: patch_type = T_DOUBLE; goto patch_prim; |
|
841 |
patch_prim: |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
842 |
{ |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
843 |
jvalue value; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
844 |
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
|
845 |
guarantee_property(value_type == patch_type, |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
846 |
"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
|
847 |
index, CHECK); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
848 |
switch (value_type) { |
34666 | 849 |
case T_INT: cp->int_at_put(index, value.i); break; |
850 |
case T_FLOAT: cp->float_at_put(index, value.f); break; |
|
851 |
case T_LONG: cp->long_at_put(index, value.j); break; |
|
852 |
case T_DOUBLE: cp->double_at_put(index, value.d); break; |
|
853 |
default: assert(false, ""); |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
854 |
} |
34666 | 855 |
} // end patch_prim label |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
856 |
break; |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
857 |
|
34666 | 858 |
default: { |
859 |
// %%% TODO: put method handles into CONSTANT_InterfaceMethodref, etc. |
|
860 |
guarantee_property(!has_cp_patch_at(index), |
|
861 |
"Illegal unexpected patch at %d in class file %s", |
|
862 |
index, CHECK); |
|
863 |
return; |
|
864 |
} |
|
865 |
} // end of switch(tag) |
|
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
866 |
|
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
867 |
// 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
|
868 |
clear_cp_patch_at(index); |
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
869 |
} |
1 | 870 |
class NameSigHash: public ResourceObj { |
871 |
public: |
|
34666 | 872 |
const Symbol* _name; // name |
873 |
const Symbol* _sig; // signature |
|
874 |
NameSigHash* _next; // Next entry in hash table |
|
1 | 875 |
}; |
876 |
||
34666 | 877 |
static const int HASH_ROW_SIZE = 256; |
878 |
||
879 |
static unsigned int hash(const Symbol* name, const Symbol* sig) { |
|
1 | 880 |
unsigned int raw_hash = 0; |
881 |
raw_hash += ((unsigned int)(uintptr_t)name) >> (LogHeapWordSize + 2); |
|
882 |
raw_hash += ((unsigned int)(uintptr_t)sig) >> LogHeapWordSize; |
|
883 |
||
884 |
return (raw_hash + (unsigned int)(uintptr_t)name) % HASH_ROW_SIZE; |
|
885 |
} |
|
886 |
||
887 |
||
34666 | 888 |
static void initialize_hashtable(NameSigHash** table) { |
1 | 889 |
memset((void*)table, 0, sizeof(NameSigHash*) * HASH_ROW_SIZE); |
890 |
} |
|
891 |
// Return false if the name/sig combination is found in table. |
|
892 |
// Return true if no duplicate is found. And name/sig is added as a new entry in table. |
|
893 |
// The old format checker uses heap sort to find duplicates. |
|
894 |
// 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
|
895 |
// of table since we don't expect Symbol*'s to move. |
34666 | 896 |
static bool put_after_lookup(const Symbol* name, const Symbol* sig, NameSigHash** table) { |
1 | 897 |
assert(name != NULL, "name in constant pool is NULL"); |
898 |
||
899 |
// First lookup for duplicates |
|
900 |
int index = hash(name, sig); |
|
901 |
NameSigHash* entry = table[index]; |
|
902 |
while (entry != NULL) { |
|
903 |
if (entry->_name == name && entry->_sig == sig) { |
|
904 |
return false; |
|
905 |
} |
|
906 |
entry = entry->_next; |
|
907 |
} |
|
908 |
||
909 |
// No duplicate is found, allocate a new entry and fill it. |
|
910 |
entry = new NameSigHash(); |
|
911 |
entry->_name = name; |
|
912 |
entry->_sig = sig; |
|
913 |
||
914 |
// Insert into hash table |
|
915 |
entry->_next = table[index]; |
|
916 |
table[index] = entry; |
|
917 |
||
918 |
return true; |
|
919 |
} |
|
920 |
||
34666 | 921 |
// Side-effects: populates the _local_interfaces field |
922 |
void ClassFileParser::parse_interfaces(const ClassFileStream* const stream, |
|
923 |
const int itfs_len, |
|
924 |
ConstantPool* const cp, |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
925 |
bool* const has_nonstatic_concrete_methods, |
34666 | 926 |
TRAPS) { |
927 |
assert(stream != NULL, "invariant"); |
|
928 |
assert(cp != NULL, "invariant"); |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
929 |
assert(has_nonstatic_concrete_methods != NULL, "invariant"); |
34666 | 930 |
|
931 |
if (itfs_len == 0) { |
|
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
932 |
_local_interfaces = Universe::the_empty_instance_klass_array(); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
933 |
} else { |
34666 | 934 |
assert(itfs_len > 0, "only called for len>0"); |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
935 |
_local_interfaces = MetadataFactory::new_array<InstanceKlass*>(_loader_data, itfs_len, NULL, CHECK); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
936 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
937 |
int index; |
34666 | 938 |
for (index = 0; index < itfs_len; index++) { |
939 |
const u2 interface_index = stream->get_u2(CHECK); |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
940 |
Klass* interf; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
941 |
check_property( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
942 |
valid_klass_reference_at(interface_index), |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
943 |
"Interface name has bad constant pool index %u in class file %s", |
34666 | 944 |
interface_index, CHECK); |
945 |
if (cp->tag_at(interface_index).is_klass()) { |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
946 |
interf = cp->resolved_klass_at(interface_index); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
947 |
} else { |
34666 | 948 |
Symbol* const unresolved_klass = cp->klass_name_at(interface_index); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
949 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
950 |
// 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
|
951 |
// But need to make sure it's not an array type. |
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
952 |
guarantee_property(unresolved_klass->char_at(0) != JVM_SIGNATURE_ARRAY, |
34666 | 953 |
"Bad interface name in class file %s", CHECK); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
954 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
955 |
// Call resolve_super so classcircularity is checked |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
956 |
interf = SystemDictionary::resolve_super_or_fail( |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
957 |
_class_name, |
34666 | 958 |
unresolved_klass, |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46262
diff
changeset
|
959 |
Handle(THREAD, _loader_data->class_loader()), |
34666 | 960 |
_protection_domain, |
961 |
false, |
|
962 |
CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
963 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
964 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
965 |
if (!interf->is_interface()) { |
34666 | 966 |
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), |
50761
cb07f4b539fc
8169559: Add class loader names to relevant VM messages
lfoltan
parents:
50735
diff
changeset
|
967 |
err_msg("class %s can not implement %s, because it is not an interface (%s)", |
50633
b8055b38b252
8204268: Improve some IncompatibleClassChangeError messages.
goetz
parents:
50113
diff
changeset
|
968 |
_class_name->as_klass_external_name(), |
50761
cb07f4b539fc
8169559: Add class loader names to relevant VM messages
lfoltan
parents:
50735
diff
changeset
|
969 |
interf->external_name(), |
cb07f4b539fc
8169559: Add class loader names to relevant VM messages
lfoltan
parents:
50735
diff
changeset
|
970 |
interf->class_in_module_of_loader())); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
971 |
} |
34666 | 972 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
973 |
if (InstanceKlass::cast(interf)->has_nonstatic_concrete_methods()) { |
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
974 |
*has_nonstatic_concrete_methods = true; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
975 |
} |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
976 |
_local_interfaces->at_put(index, InstanceKlass::cast(interf)); |
1550
be2fc37a817f
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
670
diff
changeset
|
977 |
} |
1 | 978 |
|
34666 | 979 |
if (!_need_verify || itfs_len <= 1) { |
980 |
return; |
|
14385 | 981 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
982 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
983 |
// 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
|
984 |
ResourceMark rm(THREAD); |
34666 | 985 |
NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, |
986 |
NameSigHash*, |
|
987 |
HASH_ROW_SIZE); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
988 |
initialize_hashtable(interface_names); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
989 |
bool dup = false; |
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
990 |
const Symbol* name = NULL; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
991 |
{ |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
35220
diff
changeset
|
992 |
debug_only(NoSafepointVerifier nsv;) |
34666 | 993 |
for (index = 0; index < itfs_len; index++) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
994 |
const InstanceKlass* const k = _local_interfaces->at(index); |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
995 |
name = k->name(); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
996 |
// 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
|
997 |
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
|
998 |
dup = true; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
999 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1000 |
} |
1 | 1001 |
} |
1002 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1003 |
if (dup) { |
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1004 |
classfile_parse_error("Duplicate interface name \"%s\" in class file %s", |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1005 |
name->as_C_string(), CHECK); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1006 |
} |
1 | 1007 |
} |
1008 |
} |
|
1009 |
||
34666 | 1010 |
void ClassFileParser::verify_constantvalue(const ConstantPool* const cp, |
1011 |
int constantvalue_index, |
|
1012 |
int signature_index, |
|
1013 |
TRAPS) const { |
|
1 | 1014 |
// Make sure the constant pool entry is of a type appropriate to this field |
1015 |
guarantee_property( |
|
1016 |
(constantvalue_index > 0 && |
|
34666 | 1017 |
constantvalue_index < cp->length()), |
1 | 1018 |
"Bad initial value index %u in ConstantValue attribute in class file %s", |
1019 |
constantvalue_index, CHECK); |
|
34666 | 1020 |
|
1021 |
const constantTag value_type = cp->tag_at(constantvalue_index); |
|
1022 |
switch(cp->basic_type_for_signature_at(signature_index)) { |
|
1023 |
case T_LONG: { |
|
1024 |
guarantee_property(value_type.is_long(), |
|
1025 |
"Inconsistent constant value type in class file %s", |
|
1026 |
CHECK); |
|
1027 |
break; |
|
1028 |
} |
|
1029 |
case T_FLOAT: { |
|
1030 |
guarantee_property(value_type.is_float(), |
|
1031 |
"Inconsistent constant value type in class file %s", |
|
1032 |
CHECK); |
|
1 | 1033 |
break; |
34666 | 1034 |
} |
1035 |
case T_DOUBLE: { |
|
1036 |
guarantee_property(value_type.is_double(), |
|
1037 |
"Inconsistent constant value type in class file %s", |
|
1038 |
CHECK); |
|
1039 |
break; |
|
1040 |
} |
|
1041 |
case T_BYTE: |
|
1042 |
case T_CHAR: |
|
1043 |
case T_SHORT: |
|
1044 |
case T_BOOLEAN: |
|
1045 |
case T_INT: { |
|
1046 |
guarantee_property(value_type.is_int(), |
|
1047 |
"Inconsistent constant value type in class file %s", |
|
1048 |
CHECK); |
|
1049 |
break; |
|
1050 |
} |
|
1051 |
case T_OBJECT: { |
|
1052 |
guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;") |
|
1053 |
&& value_type.is_string()), |
|
1054 |
"Bad string initial value in class file %s", |
|
1055 |
CHECK); |
|
1 | 1056 |
break; |
34666 | 1057 |
} |
1058 |
default: { |
|
1059 |
classfile_parse_error("Unable to set initial value %u in class file %s", |
|
1060 |
constantvalue_index, |
|
1061 |
CHECK); |
|
1062 |
} |
|
1063 |
} |
|
1064 |
} |
|
1065 |
||
1066 |
class AnnotationCollector : public ResourceObj{ |
|
1067 |
public: |
|
1068 |
enum Location { _in_field, _in_method, _in_class }; |
|
1069 |
enum ID { |
|
1070 |
_unknown = 0, |
|
1071 |
_method_CallerSensitive, |
|
1072 |
_method_ForceInline, |
|
1073 |
_method_DontInline, |
|
1074 |
_method_InjectedProfile, |
|
1075 |
_method_LambdaForm_Compiled, |
|
52431
b0af758a092c
8212605: Pure-Java implementation of AccessController.doPrivileged
dlong
parents:
51997
diff
changeset
|
1076 |
_method_Hidden, |
34666 | 1077 |
_method_HotSpotIntrinsicCandidate, |
1078 |
_jdk_internal_vm_annotation_Contended, |
|
1079 |
_field_Stable, |
|
35071
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
1080 |
_jdk_internal_vm_annotation_ReservedStackAccess, |
34666 | 1081 |
_annotation_LIMIT |
1082 |
}; |
|
1083 |
const Location _location; |
|
1084 |
int _annotations_present; |
|
1085 |
u2 _contended_group; |
|
1086 |
||
1087 |
AnnotationCollector(Location location) |
|
1088 |
: _location(location), _annotations_present(0) |
|
1089 |
{ |
|
1090 |
assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, ""); |
|
1091 |
} |
|
1092 |
// If this annotation name has an ID, report it (or _none). |
|
1093 |
ID annotation_index(const ClassLoaderData* loader_data, const Symbol* name); |
|
1094 |
// Set the annotation name: |
|
1095 |
void set_annotation(ID id) { |
|
1096 |
assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob"); |
|
1097 |
_annotations_present |= nth_bit((int)id); |
|
1098 |
} |
|
1099 |
||
1100 |
void remove_annotation(ID id) { |
|
1101 |
assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob"); |
|
1102 |
_annotations_present &= ~nth_bit((int)id); |
|
1103 |
} |
|
1104 |
||
1105 |
// Report if the annotation is present. |
|
1106 |
bool has_any_annotations() const { return _annotations_present != 0; } |
|
1107 |
bool has_annotation(ID id) const { return (nth_bit((int)id) & _annotations_present) != 0; } |
|
1108 |
||
1109 |
void set_contended_group(u2 group) { _contended_group = group; } |
|
1110 |
u2 contended_group() const { return _contended_group; } |
|
1111 |
||
1112 |
bool is_contended() const { return has_annotation(_jdk_internal_vm_annotation_Contended); } |
|
1113 |
||
1114 |
void set_stable(bool stable) { set_annotation(_field_Stable); } |
|
1115 |
bool is_stable() const { return has_annotation(_field_Stable); } |
|
1116 |
}; |
|
1117 |
||
1118 |
// This class also doubles as a holder for metadata cleanup. |
|
1119 |
class ClassFileParser::FieldAnnotationCollector : public AnnotationCollector { |
|
1120 |
private: |
|
1121 |
ClassLoaderData* _loader_data; |
|
1122 |
AnnotationArray* _field_annotations; |
|
1123 |
AnnotationArray* _field_type_annotations; |
|
1124 |
public: |
|
1125 |
FieldAnnotationCollector(ClassLoaderData* loader_data) : |
|
1126 |
AnnotationCollector(_in_field), |
|
1127 |
_loader_data(loader_data), |
|
1128 |
_field_annotations(NULL), |
|
1129 |
_field_type_annotations(NULL) {} |
|
1130 |
~FieldAnnotationCollector(); |
|
1131 |
void apply_to(FieldInfo* f); |
|
1132 |
AnnotationArray* field_annotations() { return _field_annotations; } |
|
1133 |
AnnotationArray* field_type_annotations() { return _field_type_annotations; } |
|
1134 |
||
1135 |
void set_field_annotations(AnnotationArray* a) { _field_annotations = a; } |
|
1136 |
void set_field_type_annotations(AnnotationArray* a) { _field_type_annotations = a; } |
|
1137 |
}; |
|
1138 |
||
1139 |
class MethodAnnotationCollector : public AnnotationCollector{ |
|
1140 |
public: |
|
1141 |
MethodAnnotationCollector() : AnnotationCollector(_in_method) { } |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46701
diff
changeset
|
1142 |
void apply_to(const methodHandle& m); |
34666 | 1143 |
}; |
1144 |
||
1145 |
class ClassFileParser::ClassAnnotationCollector : public AnnotationCollector{ |
|
1146 |
public: |
|
1147 |
ClassAnnotationCollector() : AnnotationCollector(_in_class) { } |
|
1148 |
void apply_to(InstanceKlass* ik); |
|
1149 |
}; |
|
1150 |
||
1151 |
||
1152 |
static int skip_annotation_value(const u1*, int, int); // fwd decl |
|
1153 |
||
43177 | 1154 |
// Safely increment index by val if does not pass limit |
1155 |
#define SAFE_ADD(index, limit, val) \ |
|
1156 |
if (index >= limit - val) return limit; \ |
|
1157 |
index += val; |
|
1158 |
||
34666 | 1159 |
// Skip an annotation. Return >=limit if there is any problem. |
1160 |
static int skip_annotation(const u1* buffer, int limit, int index) { |
|
1161 |
assert(buffer != NULL, "invariant"); |
|
1162 |
// annotation := atype:u2 do(nmem:u2) {member:u2 value} |
|
1163 |
// value := switch (tag:u1) { ... } |
|
43177 | 1164 |
SAFE_ADD(index, limit, 4); // skip atype and read nmem |
34666 | 1165 |
int nmem = Bytes::get_Java_u2((address)buffer + index - 2); |
1166 |
while (--nmem >= 0 && index < limit) { |
|
43177 | 1167 |
SAFE_ADD(index, limit, 2); // skip member |
34666 | 1168 |
index = skip_annotation_value(buffer, limit, index); |
1169 |
} |
|
1170 |
return index; |
|
1171 |
} |
|
1172 |
||
1173 |
// Skip an annotation value. Return >=limit if there is any problem. |
|
1174 |
static int skip_annotation_value(const u1* buffer, int limit, int index) { |
|
1175 |
assert(buffer != NULL, "invariant"); |
|
1176 |
||
1177 |
// value := switch (tag:u1) { |
|
1178 |
// case B, C, I, S, Z, D, F, J, c: con:u2; |
|
1179 |
// case e: e_class:u2 e_name:u2; |
|
1180 |
// case s: s_con:u2; |
|
1181 |
// case [: do(nval:u2) {value}; |
|
1182 |
// case @: annotation; |
|
1183 |
// case s: s_con:u2; |
|
1184 |
// } |
|
43177 | 1185 |
SAFE_ADD(index, limit, 1); // read tag |
34666 | 1186 |
const u1 tag = buffer[index - 1]; |
1187 |
switch (tag) { |
|
1188 |
case 'B': |
|
1189 |
case 'C': |
|
1190 |
case 'I': |
|
1191 |
case 'S': |
|
1192 |
case 'Z': |
|
1193 |
case 'D': |
|
1194 |
case 'F': |
|
1195 |
case 'J': |
|
1196 |
case 'c': |
|
1197 |
case 's': |
|
43177 | 1198 |
SAFE_ADD(index, limit, 2); // skip con or s_con |
1 | 1199 |
break; |
34666 | 1200 |
case 'e': |
43177 | 1201 |
SAFE_ADD(index, limit, 4); // skip e_class, e_name |
1 | 1202 |
break; |
34666 | 1203 |
case '[': |
1204 |
{ |
|
43177 | 1205 |
SAFE_ADD(index, limit, 2); // read nval |
34666 | 1206 |
int nval = Bytes::get_Java_u2((address)buffer + index - 2); |
1207 |
while (--nval >= 0 && index < limit) { |
|
1208 |
index = skip_annotation_value(buffer, limit, index); |
|
1209 |
} |
|
1210 |
} |
|
1211 |
break; |
|
1212 |
case '@': |
|
1213 |
index = skip_annotation(buffer, limit, index); |
|
1 | 1214 |
break; |
1215 |
default: |
|
34666 | 1216 |
return limit; // bad tag byte |
1217 |
} |
|
1218 |
return index; |
|
1219 |
} |
|
1220 |
||
1221 |
// Sift through annotations, looking for those significant to the VM: |
|
1222 |
static void parse_annotations(const ConstantPool* const cp, |
|
1223 |
const u1* buffer, int limit, |
|
1224 |
AnnotationCollector* coll, |
|
1225 |
ClassLoaderData* loader_data, |
|
1226 |
TRAPS) { |
|
1227 |
||
1228 |
assert(cp != NULL, "invariant"); |
|
1229 |
assert(buffer != NULL, "invariant"); |
|
1230 |
assert(coll != NULL, "invariant"); |
|
1231 |
assert(loader_data != NULL, "invariant"); |
|
1232 |
||
1233 |
// annotations := do(nann:u2) {annotation} |
|
43177 | 1234 |
int index = 2; // read nann |
1235 |
if (index >= limit) return; |
|
34666 | 1236 |
int nann = Bytes::get_Java_u2((address)buffer + index - 2); |
1237 |
enum { // initial annotation layout |
|
1238 |
atype_off = 0, // utf8 such as 'Ljava/lang/annotation/Retention;' |
|
1239 |
count_off = 2, // u2 such as 1 (one value) |
|
1240 |
member_off = 4, // utf8 such as 'value' |
|
1241 |
tag_off = 6, // u1 such as 'c' (type) or 'e' (enum) |
|
1242 |
e_tag_val = 'e', |
|
1243 |
e_type_off = 7, // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;' |
|
1244 |
e_con_off = 9, // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME' |
|
1245 |
e_size = 11, // end of 'e' annotation |
|
1246 |
c_tag_val = 'c', // payload is type |
|
1247 |
c_con_off = 7, // utf8 payload, such as 'I' |
|
1248 |
c_size = 9, // end of 'c' annotation |
|
1249 |
s_tag_val = 's', // payload is String |
|
1250 |
s_con_off = 7, // utf8 payload, such as 'Ljava/lang/String;' |
|
1251 |
s_size = 9, |
|
1252 |
min_size = 6 // smallest possible size (zero members) |
|
1253 |
}; |
|
43177 | 1254 |
// Cannot add min_size to index in case of overflow MAX_INT |
1255 |
while ((--nann) >= 0 && (index - 2 <= limit - min_size)) { |
|
34666 | 1256 |
int index0 = index; |
1257 |
index = skip_annotation(buffer, limit, index); |
|
1258 |
const u1* const abase = buffer + index0; |
|
1259 |
const int atype = Bytes::get_Java_u2((address)abase + atype_off); |
|
1260 |
const int count = Bytes::get_Java_u2((address)abase + count_off); |
|
1261 |
const Symbol* const aname = check_symbol_at(cp, atype); |
|
1262 |
if (aname == NULL) break; // invalid annotation name |
|
1263 |
const Symbol* member = NULL; |
|
1264 |
if (count >= 1) { |
|
1265 |
const int member_index = Bytes::get_Java_u2((address)abase + member_off); |
|
1266 |
member = check_symbol_at(cp, member_index); |
|
1267 |
if (member == NULL) break; // invalid member name |
|
1268 |
} |
|
1269 |
||
1270 |
// Here is where parsing particular annotations will take place. |
|
1271 |
AnnotationCollector::ID id = coll->annotation_index(loader_data, aname); |
|
1272 |
if (AnnotationCollector::_unknown == id) continue; |
|
1273 |
coll->set_annotation(id); |
|
1274 |
||
1275 |
if (AnnotationCollector::_jdk_internal_vm_annotation_Contended == id) { |
|
1276 |
// @Contended can optionally specify the contention group. |
|
1277 |
// |
|
1278 |
// Contended group defines the equivalence class over the fields: |
|
1279 |
// the fields within the same contended group are not treated distinct. |
|
1280 |
// The only exception is default group, which does not incur the |
|
1281 |
// equivalence. Naturally, contention group for classes is meaningless. |
|
1282 |
// |
|
1283 |
// While the contention group is specified as String, annotation |
|
1284 |
// values are already interned, and we might as well use the constant |
|
1285 |
// pool index as the group tag. |
|
1286 |
// |
|
1287 |
u2 group_index = 0; // default contended group |
|
1288 |
if (count == 1 |
|
1289 |
&& s_size == (index - index0) // match size |
|
1290 |
&& s_tag_val == *(abase + tag_off) |
|
1291 |
&& member == vmSymbols::value_name()) { |
|
1292 |
group_index = Bytes::get_Java_u2((address)abase + s_con_off); |
|
1293 |
if (cp->symbol_at(group_index)->utf8_length() == 0) { |
|
1294 |
group_index = 0; // default contended group |
|
1295 |
} |
|
1296 |
} |
|
1297 |
coll->set_contended_group(group_index); |
|
1298 |
} |
|
1 | 1299 |
} |
1300 |
} |
|
1301 |
||
1302 |
||
1303 |
// Parse attributes for a field. |
|
34666 | 1304 |
void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs, |
1305 |
u2 attributes_count, |
|
1 | 1306 |
bool is_static, u2 signature_index, |
34666 | 1307 |
u2* const constantvalue_index_addr, |
1308 |
bool* const is_synthetic_addr, |
|
1309 |
u2* const generic_signature_index_addr, |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
1310 |
ClassFileParser::FieldAnnotationCollector* parsed_annotations, |
1 | 1311 |
TRAPS) { |
34666 | 1312 |
assert(cfs != NULL, "invariant"); |
1313 |
assert(constantvalue_index_addr != NULL, "invariant"); |
|
1314 |
assert(is_synthetic_addr != NULL, "invariant"); |
|
1315 |
assert(generic_signature_index_addr != NULL, "invariant"); |
|
1316 |
assert(parsed_annotations != NULL, "invariant"); |
|
1317 |
assert(attributes_count > 0, "attributes_count should be greater than 0"); |
|
1318 |
||
1 | 1319 |
u2 constantvalue_index = 0; |
1320 |
u2 generic_signature_index = 0; |
|
1321 |
bool is_synthetic = false; |
|
34666 | 1322 |
const u1* runtime_visible_annotations = NULL; |
1 | 1323 |
int runtime_visible_annotations_length = 0; |
34666 | 1324 |
const u1* runtime_invisible_annotations = NULL; |
1 | 1325 |
int runtime_invisible_annotations_length = 0; |
34666 | 1326 |
const u1* runtime_visible_type_annotations = NULL; |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1327 |
int runtime_visible_type_annotations_length = 0; |
34666 | 1328 |
const u1* runtime_invisible_type_annotations = NULL; |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1329 |
int runtime_invisible_type_annotations_length = 0; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1330 |
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
|
1331 |
bool runtime_invisible_type_annotations_exists = false; |
34666 | 1332 |
const ConstantPool* const cp = _cp; |
1333 |
||
1 | 1334 |
while (attributes_count--) { |
1335 |
cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length |
|
34666 | 1336 |
const u2 attribute_name_index = cfs->get_u2_fast(); |
1337 |
const 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
|
1338 |
check_property(valid_symbol_at(attribute_name_index), |
1 | 1339 |
"Invalid field attribute index %u in class file %s", |
1340 |
attribute_name_index, |
|
1341 |
CHECK); |
|
34666 | 1342 |
|
1343 |
const Symbol* const attribute_name = cp->symbol_at(attribute_name_index); |
|
1 | 1344 |
if (is_static && attribute_name == vmSymbols::tag_constant_value()) { |
1345 |
// ignore if non-static |
|
1346 |
if (constantvalue_index != 0) { |
|
1347 |
classfile_parse_error("Duplicate ConstantValue attribute in class file %s", CHECK); |
|
1348 |
} |
|
1349 |
check_property( |
|
1350 |
attribute_length == 2, |
|
1351 |
"Invalid ConstantValue field attribute length %u in class file %s", |
|
1352 |
attribute_length, CHECK); |
|
34666 | 1353 |
|
1 | 1354 |
constantvalue_index = cfs->get_u2(CHECK); |
1355 |
if (_need_verify) { |
|
34666 | 1356 |
verify_constantvalue(cp, constantvalue_index, signature_index, CHECK); |
1 | 1357 |
} |
1358 |
} else if (attribute_name == vmSymbols::tag_synthetic()) { |
|
1359 |
if (attribute_length != 0) { |
|
1360 |
classfile_parse_error( |
|
1361 |
"Invalid Synthetic field attribute length %u in class file %s", |
|
1362 |
attribute_length, CHECK); |
|
1363 |
} |
|
1364 |
is_synthetic = true; |
|
1365 |
} else if (attribute_name == vmSymbols::tag_deprecated()) { // 4276120 |
|
1366 |
if (attribute_length != 0) { |
|
1367 |
classfile_parse_error( |
|
1368 |
"Invalid Deprecated field attribute length %u in class file %s", |
|
1369 |
attribute_length, CHECK); |
|
1370 |
} |
|
1371 |
} else if (_major_version >= JAVA_1_5_VERSION) { |
|
1372 |
if (attribute_name == vmSymbols::tag_signature()) { |
|
44243
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
1373 |
if (generic_signature_index != 0) { |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
1374 |
classfile_parse_error( |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
1375 |
"Multiple Signature attributes for field in class file %s", CHECK); |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
1376 |
} |
1 | 1377 |
if (attribute_length != 2) { |
1378 |
classfile_parse_error( |
|
1379 |
"Wrong size %u for field's Signature attribute in class file %s", |
|
1380 |
attribute_length, CHECK); |
|
1381 |
} |
|
34666 | 1382 |
generic_signature_index = parse_generic_signature_attribute(cfs, CHECK); |
1 | 1383 |
} 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
|
1384 |
if (runtime_visible_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1385 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1386 |
"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
|
1387 |
} |
1 | 1388 |
runtime_visible_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
1389 |
runtime_visible_annotations = cfs->current(); |
1 | 1390 |
assert(runtime_visible_annotations != NULL, "null visible annotations"); |
43177 | 1391 |
cfs->guarantee_more(runtime_visible_annotations_length, CHECK); |
34666 | 1392 |
parse_annotations(cp, |
1393 |
runtime_visible_annotations, |
|
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1394 |
runtime_visible_annotations_length, |
34666 | 1395 |
parsed_annotations, |
1396 |
_loader_data, |
|
1397 |
CHECK); |
|
43177 | 1398 |
cfs->skip_u1_fast(runtime_visible_annotations_length); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1399 |
} else if (attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1400 |
if (runtime_invisible_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1401 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1402 |
"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
|
1403 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1404 |
runtime_invisible_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1405 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1406 |
runtime_invisible_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
1407 |
runtime_invisible_annotations = cfs->current(); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1408 |
assert(runtime_invisible_annotations != NULL, "null invisible annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1409 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
1410 |
cfs->skip_u1(attribute_length, CHECK); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1411 |
} 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
|
1412 |
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
|
1413 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1414 |
"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
|
1415 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1416 |
runtime_visible_type_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
1417 |
runtime_visible_type_annotations = cfs->current(); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1418 |
assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1419 |
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
|
1420 |
} 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
|
1421 |
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
|
1422 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1423 |
"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
|
1424 |
} else { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1425 |
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
|
1426 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1427 |
if (PreserveAllAnnotations) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1428 |
runtime_invisible_type_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
1429 |
runtime_invisible_type_annotations = cfs->current(); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1430 |
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
|
1431 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
1432 |
cfs->skip_u1(attribute_length, CHECK); |
1 | 1433 |
} else { |
1434 |
cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes |
|
1435 |
} |
|
1436 |
} else { |
|
1437 |
cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes |
|
1438 |
} |
|
1439 |
} |
|
1440 |
||
1441 |
*constantvalue_index_addr = constantvalue_index; |
|
1442 |
*is_synthetic_addr = is_synthetic; |
|
1443 |
*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
|
1444 |
AnnotationArray* a = assemble_annotations(runtime_visible_annotations, |
1 | 1445 |
runtime_visible_annotations_length, |
1446 |
runtime_invisible_annotations, |
|
1447 |
runtime_invisible_annotations_length, |
|
1448 |
CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1449 |
parsed_annotations->set_field_annotations(a); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1450 |
a = assemble_annotations(runtime_visible_type_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1451 |
runtime_visible_type_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1452 |
runtime_invisible_type_annotations, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1453 |
runtime_invisible_type_annotations_length, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1454 |
CHECK); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1455 |
parsed_annotations->set_field_type_annotations(a); |
1 | 1456 |
return; |
1457 |
} |
|
1458 |
||
1459 |
||
1460 |
// Field allocation types. Used for computing field offsets. |
|
1461 |
||
1462 |
enum FieldAllocationType { |
|
1463 |
STATIC_OOP, // Oops |
|
1464 |
STATIC_BYTE, // Boolean, Byte, char |
|
1465 |
STATIC_SHORT, // shorts |
|
1466 |
STATIC_WORD, // ints |
|
10546 | 1467 |
STATIC_DOUBLE, // aligned long or double |
1 | 1468 |
NONSTATIC_OOP, |
1469 |
NONSTATIC_BYTE, |
|
1470 |
NONSTATIC_SHORT, |
|
1471 |
NONSTATIC_WORD, |
|
1472 |
NONSTATIC_DOUBLE, |
|
10546 | 1473 |
MAX_FIELD_ALLOCATION_TYPE, |
1474 |
BAD_ALLOCATION_TYPE = -1 |
|
1 | 1475 |
}; |
1476 |
||
10546 | 1477 |
static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = { |
1478 |
BAD_ALLOCATION_TYPE, // 0 |
|
1479 |
BAD_ALLOCATION_TYPE, // 1 |
|
1480 |
BAD_ALLOCATION_TYPE, // 2 |
|
1481 |
BAD_ALLOCATION_TYPE, // 3 |
|
13969
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1482 |
NONSTATIC_BYTE , // T_BOOLEAN = 4, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1483 |
NONSTATIC_SHORT, // T_CHAR = 5, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1484 |
NONSTATIC_WORD, // T_FLOAT = 6, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1485 |
NONSTATIC_DOUBLE, // T_DOUBLE = 7, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1486 |
NONSTATIC_BYTE, // T_BYTE = 8, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1487 |
NONSTATIC_SHORT, // T_SHORT = 9, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1488 |
NONSTATIC_WORD, // T_INT = 10, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1489 |
NONSTATIC_DOUBLE, // T_LONG = 11, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1490 |
NONSTATIC_OOP, // T_OBJECT = 12, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1491 |
NONSTATIC_OOP, // T_ARRAY = 13, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1492 |
BAD_ALLOCATION_TYPE, // T_VOID = 14, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1493 |
BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1494 |
BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1495 |
BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1496 |
BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1497 |
BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
10546 | 1498 |
BAD_ALLOCATION_TYPE, // 0 |
1499 |
BAD_ALLOCATION_TYPE, // 1 |
|
1500 |
BAD_ALLOCATION_TYPE, // 2 |
|
1501 |
BAD_ALLOCATION_TYPE, // 3 |
|
13969
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1502 |
STATIC_BYTE , // T_BOOLEAN = 4, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1503 |
STATIC_SHORT, // T_CHAR = 5, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1504 |
STATIC_WORD, // T_FLOAT = 6, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1505 |
STATIC_DOUBLE, // T_DOUBLE = 7, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1506 |
STATIC_BYTE, // T_BYTE = 8, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1507 |
STATIC_SHORT, // T_SHORT = 9, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1508 |
STATIC_WORD, // T_INT = 10, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1509 |
STATIC_DOUBLE, // T_LONG = 11, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1510 |
STATIC_OOP, // T_OBJECT = 12, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1511 |
STATIC_OOP, // T_ARRAY = 13, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1512 |
BAD_ALLOCATION_TYPE, // T_VOID = 14, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1513 |
BAD_ALLOCATION_TYPE, // T_ADDRESS = 15, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1514 |
BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1515 |
BAD_ALLOCATION_TYPE, // T_METADATA = 17, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1516 |
BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18, |
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13738
diff
changeset
|
1517 |
BAD_ALLOCATION_TYPE, // T_CONFLICT = 19, |
1 | 1518 |
}; |
1519 |
||
10546 | 1520 |
static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) { |
1521 |
assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values"); |
|
1522 |
FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)]; |
|
1523 |
assert(result != BAD_ALLOCATION_TYPE, "bad type"); |
|
1524 |
return result; |
|
1525 |
} |
|
1526 |
||
34666 | 1527 |
class ClassFileParser::FieldAllocationCount : public ResourceObj { |
10546 | 1528 |
public: |
11412
62fe312f32c5
7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type.
jiangli
parents:
10546
diff
changeset
|
1529 |
u2 count[MAX_FIELD_ALLOCATION_TYPE]; |
10546 | 1530 |
|
1531 |
FieldAllocationCount() { |
|
1532 |
for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) { |
|
1533 |
count[i] = 0; |
|
1534 |
} |
|
1535 |
} |
|
1536 |
||
1537 |
FieldAllocationType update(bool is_static, BasicType type) { |
|
1538 |
FieldAllocationType atype = basic_type_to_atype(is_static, type); |
|
38658
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
1539 |
if (atype != BAD_ALLOCATION_TYPE) { |
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
1540 |
// Make sure there is no overflow with injected fields. |
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
1541 |
assert(count[atype] < 0xFFFF, "More than 65535 fields"); |
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
1542 |
count[atype]++; |
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
1543 |
} |
10546 | 1544 |
return atype; |
1545 |
} |
|
1546 |
}; |
|
1547 |
||
34666 | 1548 |
// Side-effects: populates the _fields, _fields_annotations, |
1549 |
// _fields_type_annotations fields |
|
1550 |
void ClassFileParser::parse_fields(const ClassFileStream* const cfs, |
|
1551 |
bool is_interface, |
|
1552 |
FieldAllocationCount* const fac, |
|
1553 |
ConstantPool* cp, |
|
1554 |
const int cp_size, |
|
1555 |
u2* const java_fields_count_ptr, |
|
1556 |
TRAPS) { |
|
1557 |
||
1558 |
assert(cfs != NULL, "invariant"); |
|
1559 |
assert(fac != NULL, "invariant"); |
|
1560 |
assert(cp != NULL, "invariant"); |
|
1561 |
assert(java_fields_count_ptr != NULL, "invariant"); |
|
1562 |
||
1563 |
assert(NULL == _fields, "invariant"); |
|
1564 |
assert(NULL == _fields_annotations, "invariant"); |
|
1565 |
assert(NULL == _fields_type_annotations, "invariant"); |
|
1566 |
||
1567 |
cfs->guarantee_more(2, CHECK); // length |
|
1568 |
const u2 length = cfs->get_u2_fast(); |
|
10546 | 1569 |
*java_fields_count_ptr = length; |
1570 |
||
1571 |
int num_injected = 0; |
|
34666 | 1572 |
const InjectedField* const injected = JavaClasses::get_injected(_class_name, |
1573 |
&num_injected); |
|
1574 |
const int total_fields = length + num_injected; |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1575 |
|
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1576 |
// 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
|
1577 |
// [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
|
1578 |
// 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
|
1579 |
// 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
|
1580 |
// 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
|
1581 |
// 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
|
1582 |
// other fields data. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1583 |
// |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1584 |
// 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
|
1585 |
// 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
|
1586 |
// ... |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1587 |
// 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
|
1588 |
// [generic signature index] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1589 |
// [generic signature index] |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1590 |
// ... |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1591 |
// |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1592 |
// 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
|
1593 |
// 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
|
1594 |
// 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
|
1595 |
// 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
|
1596 |
ResourceMark rm(THREAD); |
34666 | 1597 |
u2* const fa = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, |
1598 |
u2, |
|
1599 |
total_fields * (FieldInfo::field_slots + 1)); |
|
1 | 1600 |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1601 |
// 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
|
1602 |
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
|
1603 |
int num_generic_signature = 0; |
1 | 1604 |
for (int n = 0; n < length; n++) { |
34666 | 1605 |
// access_flags, name_index, descriptor_index, attributes_count |
1606 |
cfs->guarantee_more(8, CHECK); |
|
1 | 1607 |
|
1608 |
AccessFlags access_flags; |
|
34666 | 1609 |
const jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS; |
1610 |
verify_legal_field_modifiers(flags, is_interface, CHECK); |
|
1 | 1611 |
access_flags.set_flags(flags); |
1612 |
||
34666 | 1613 |
const 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
|
1614 |
check_property(valid_symbol_at(name_index), |
1 | 1615 |
"Invalid constant pool index %u for field name in class file %s", |
34666 | 1616 |
name_index, CHECK); |
1617 |
const Symbol* const name = cp->symbol_at(name_index); |
|
1618 |
verify_legal_field_name(name, CHECK); |
|
1619 |
||
1620 |
const 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
|
1621 |
check_property(valid_symbol_at(signature_index), |
1 | 1622 |
"Invalid constant pool index %u for field signature in class file %s", |
34666 | 1623 |
signature_index, CHECK); |
1624 |
const Symbol* const sig = cp->symbol_at(signature_index); |
|
1625 |
verify_legal_field_signature(name, sig, CHECK); |
|
1 | 1626 |
|
1627 |
u2 constantvalue_index = 0; |
|
1628 |
bool is_synthetic = false; |
|
1629 |
u2 generic_signature_index = 0; |
|
34666 | 1630 |
const 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
|
1631 |
FieldAnnotationCollector parsed_annotations(_loader_data); |
1 | 1632 |
|
34666 | 1633 |
const u2 attributes_count = cfs->get_u2_fast(); |
1 | 1634 |
if (attributes_count > 0) { |
34666 | 1635 |
parse_field_attributes(cfs, |
1636 |
attributes_count, |
|
1637 |
is_static, |
|
1638 |
signature_index, |
|
1639 |
&constantvalue_index, |
|
1640 |
&is_synthetic, |
|
1641 |
&generic_signature_index, |
|
1642 |
&parsed_annotations, |
|
1643 |
CHECK); |
|
1644 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1645 |
if (parsed_annotations.field_annotations() != NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1646 |
if (_fields_annotations == NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1647 |
_fields_annotations = MetadataFactory::new_array<AnnotationArray*>( |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1648 |
_loader_data, length, NULL, |
34666 | 1649 |
CHECK); |
1 | 1650 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1651 |
_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
|
1652 |
parsed_annotations.set_field_annotations(NULL); |
1 | 1653 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1654 |
if (parsed_annotations.field_type_annotations() != NULL) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1655 |
if (_fields_type_annotations == NULL) { |
34666 | 1656 |
_fields_type_annotations = |
1657 |
MetadataFactory::new_array<AnnotationArray*>(_loader_data, |
|
1658 |
length, |
|
1659 |
NULL, |
|
1660 |
CHECK); |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1661 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1662 |
_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
|
1663 |
parsed_annotations.set_field_type_annotations(NULL); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
1664 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1665 |
|
1 | 1666 |
if (is_synthetic) { |
1667 |
access_flags.set_is_synthetic(); |
|
1668 |
} |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1669 |
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
|
1670 |
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
|
1671 |
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
|
1672 |
generic_signature_slot ++; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1673 |
num_generic_signature ++; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1674 |
} |
1 | 1675 |
} |
1676 |
||
34666 | 1677 |
FieldInfo* const field = FieldInfo::from_field_array(fa, n); |
10546 | 1678 |
field->initialize(access_flags.as_short(), |
1679 |
name_index, |
|
1680 |
signature_index, |
|
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1681 |
constantvalue_index); |
34666 | 1682 |
const BasicType type = cp->basic_type_for_signature_at(signature_index); |
1 | 1683 |
|
1684 |
// Remember how many oops we encountered and compute allocation type |
|
34666 | 1685 |
const FieldAllocationType atype = fac->update(is_static, type); |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1686 |
field->set_allocation_type(atype); |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1687 |
|
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1688 |
// 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
|
1689 |
if (parsed_annotations.has_any_annotations()) |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1690 |
parsed_annotations.apply_to(field); |
10546 | 1691 |
} |
1692 |
||
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1693 |
int index = length; |
10546 | 1694 |
if (num_injected != 0) { |
1695 |
for (int n = 0; n < num_injected; n++) { |
|
1696 |
// Check for duplicates |
|
1697 |
if (injected[n].may_be_java) { |
|
34666 | 1698 |
const Symbol* const name = injected[n].name(); |
1699 |
const Symbol* const signature = injected[n].signature(); |
|
10546 | 1700 |
bool duplicate = false; |
1701 |
for (int i = 0; i < length; i++) { |
|
34666 | 1702 |
const FieldInfo* const f = FieldInfo::from_field_array(fa, i); |
1703 |
if (name == cp->symbol_at(f->name_index()) && |
|
1704 |
signature == cp->symbol_at(f->signature_index())) { |
|
10546 | 1705 |
// Symbol is desclared in Java so skip this one |
1706 |
duplicate = true; |
|
1707 |
break; |
|
1708 |
} |
|
1709 |
} |
|
1710 |
if (duplicate) { |
|
1711 |
// These will be removed from the field array at the end |
|
1712 |
continue; |
|
1713 |
} |
|
1714 |
} |
|
1715 |
||
1716 |
// Injected field |
|
34666 | 1717 |
FieldInfo* const field = FieldInfo::from_field_array(fa, index); |
10546 | 1718 |
field->initialize(JVM_ACC_FIELD_INTERNAL, |
1719 |
injected[n].name_index, |
|
1720 |
injected[n].signature_index, |
|
1721 |
0); |
|
1722 |
||
34666 | 1723 |
const BasicType type = FieldType::basic_type(injected[n].signature()); |
10546 | 1724 |
|
1725 |
// Remember how many oops we encountered and compute allocation type |
|
34666 | 1726 |
const FieldAllocationType atype = fac->update(false, type); |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
1727 |
field->set_allocation_type(atype); |
10546 | 1728 |
index++; |
1729 |
} |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1730 |
} |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1731 |
|
34666 | 1732 |
assert(NULL == _fields, "invariant"); |
1733 |
||
1734 |
_fields = |
|
1735 |
MetadataFactory::new_array<u2>(_loader_data, |
|
1736 |
index * FieldInfo::field_slots + num_generic_signature, |
|
1737 |
CHECK); |
|
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1738 |
// 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
|
1739 |
// 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
|
1740 |
// 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
|
1741 |
// for generic signature indexes are discarded. |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1742 |
{ |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1743 |
int i = 0; |
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1744 |
for (; i < index * FieldInfo::field_slots; i++) { |
34666 | 1745 |
_fields->at_put(i, fa[i]); |
10546 | 1746 |
} |
12772
d317e5e08194
7168280: Eliminate the generic signature index slot from field array for field without generic signature.
jiangli
parents:
12587
diff
changeset
|
1747 |
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
|
1748 |
j < generic_signature_slot; j++) { |
34666 | 1749 |
_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
|
1750 |
} |
34666 | 1751 |
assert(_fields->length() == i, ""); |
1 | 1752 |
} |
1753 |
||
1754 |
if (_need_verify && length > 1) { |
|
1755 |
// Check duplicated fields |
|
1756 |
ResourceMark rm(THREAD); |
|
1757 |
NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
1758 |
THREAD, NameSigHash*, HASH_ROW_SIZE); |
|
1759 |
initialize_hashtable(names_and_sigs); |
|
1760 |
bool dup = false; |
|
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1761 |
const Symbol* name = NULL; |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1762 |
const Symbol* sig = NULL; |
1 | 1763 |
{ |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
35220
diff
changeset
|
1764 |
debug_only(NoSafepointVerifier nsv;) |
34666 | 1765 |
for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) { |
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1766 |
name = fs.name(); |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1767 |
sig = fs.signature(); |
1 | 1768 |
// If no duplicates, add name/signature in hashtable names_and_sigs. |
1769 |
if (!put_after_lookup(name, sig, names_and_sigs)) { |
|
1770 |
dup = true; |
|
1771 |
break; |
|
1772 |
} |
|
1773 |
} |
|
1774 |
} |
|
1775 |
if (dup) { |
|
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1776 |
classfile_parse_error("Duplicate field name \"%s\" with signature \"%s\" in class file %s", |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
1777 |
name->as_C_string(), sig->as_klass_external_name(), CHECK); |
1 | 1778 |
} |
1779 |
} |
|
1780 |
} |
|
1781 |
||
1782 |
||
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1783 |
const ClassFileParser::unsafe_u2* ClassFileParser::parse_exception_table(const ClassFileStream* const cfs, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1784 |
u4 code_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1785 |
u4 exception_table_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1786 |
TRAPS) { |
34666 | 1787 |
assert(cfs != NULL, "invariant"); |
1788 |
||
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1789 |
const unsafe_u2* const exception_table_start = cfs->current(); |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1790 |
assert(exception_table_start != NULL, "null exception table"); |
34666 | 1791 |
|
1792 |
cfs->guarantee_more(8 * exception_table_length, CHECK_NULL); // start_pc, |
|
1793 |
// end_pc, |
|
1794 |
// handler_pc, |
|
1795 |
// catch_type_index |
|
1796 |
||
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1797 |
// 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
|
1798 |
if (_need_verify) { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1799 |
for (unsigned int i = 0; i < exception_table_length; i++) { |
34666 | 1800 |
const u2 start_pc = cfs->get_u2_fast(); |
1801 |
const u2 end_pc = cfs->get_u2_fast(); |
|
1802 |
const u2 handler_pc = cfs->get_u2_fast(); |
|
1803 |
const u2 catch_type_index = cfs->get_u2_fast(); |
|
1 | 1804 |
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
|
1805 |
"Illegal exception table range in class file %s", |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1806 |
CHECK_NULL); |
1 | 1807 |
guarantee_property(handler_pc < code_length, |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1808 |
"Illegal exception table handler in class file %s", |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1809 |
CHECK_NULL); |
1 | 1810 |
if (catch_type_index != 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1811 |
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
|
1812 |
"Catch type in exception table has bad constant type in class file %s", CHECK_NULL); |
1 | 1813 |
} |
1814 |
} |
|
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1815 |
} else { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1816 |
cfs->skip_u2_fast(exception_table_length * 4); |
1 | 1817 |
} |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
1818 |
return exception_table_start; |
1 | 1819 |
} |
1820 |
||
34666 | 1821 |
void ClassFileParser::parse_linenumber_table(u4 code_attribute_length, |
1822 |
u4 code_length, |
|
1823 |
CompressedLineNumberWriteStream**const write_stream, |
|
1824 |
TRAPS) { |
|
1825 |
||
1826 |
const ClassFileStream* const cfs = _stream; |
|
1 | 1827 |
unsigned int num_entries = cfs->get_u2(CHECK); |
1828 |
||
1829 |
// Each entry is a u2 start_pc, and a u2 line_number |
|
34666 | 1830 |
const unsigned int length_in_bytes = num_entries * (sizeof(u2) * 2); |
1 | 1831 |
|
1832 |
// Verify line number attribute and table length |
|
1833 |
check_property( |
|
1834 |
code_attribute_length == sizeof(u2) + length_in_bytes, |
|
1835 |
"LineNumberTable attribute has wrong length in class file %s", CHECK); |
|
1836 |
||
1837 |
cfs->guarantee_more(length_in_bytes, CHECK); |
|
1838 |
||
1839 |
if ((*write_stream) == NULL) { |
|
1840 |
if (length_in_bytes > fixed_buffer_size) { |
|
1841 |
(*write_stream) = new CompressedLineNumberWriteStream(length_in_bytes); |
|
1842 |
} else { |
|
1843 |
(*write_stream) = new CompressedLineNumberWriteStream( |
|
34666 | 1844 |
_linenumbertable_buffer, fixed_buffer_size); |
1 | 1845 |
} |
1846 |
} |
|
1847 |
||
1848 |
while (num_entries-- > 0) { |
|
34666 | 1849 |
const u2 bci = cfs->get_u2_fast(); // start_pc |
1850 |
const u2 line = cfs->get_u2_fast(); // line_number |
|
1 | 1851 |
guarantee_property(bci < code_length, |
1852 |
"Invalid pc in LineNumberTable in class file %s", CHECK); |
|
1853 |
(*write_stream)->write_pair(bci, line); |
|
1854 |
} |
|
1855 |
} |
|
1856 |
||
1857 |
||
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1858 |
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
|
1859 |
public: |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1860 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1861 |
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
|
1862 |
/* |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1863 |
* 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
|
1864 |
* 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
|
1865 |
* && 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
|
1866 |
*/ |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1867 |
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
|
1868 |
e0.length == e1.length && |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1869 |
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
|
1870 |
e0.slot == e1.slot); |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1871 |
} |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1872 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1873 |
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
|
1874 |
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
|
1875 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1876 |
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
|
1877 |
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
|
1878 |
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
|
1879 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1880 |
return raw_hash; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1881 |
} |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1882 |
}; |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1883 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
1884 |
|
1 | 1885 |
// Class file LocalVariableTable elements. |
49364
601146c66cad
8173070: Remove ValueObj class for allocation subclassing for runtime code
coleenp
parents:
49359
diff
changeset
|
1886 |
class Classfile_LVT_Element { |
1 | 1887 |
public: |
1888 |
u2 start_bci; |
|
1889 |
u2 length; |
|
1890 |
u2 name_cp_index; |
|
1891 |
u2 descriptor_cp_index; |
|
1892 |
u2 slot; |
|
1893 |
}; |
|
1894 |
||
34666 | 1895 |
static void copy_lvt_element(const Classfile_LVT_Element* const src, |
1896 |
LocalVariableTableElement* const lvt) { |
|
1 | 1897 |
lvt->start_bci = Bytes::get_Java_u2((u1*) &src->start_bci); |
1898 |
lvt->length = Bytes::get_Java_u2((u1*) &src->length); |
|
1899 |
lvt->name_cp_index = Bytes::get_Java_u2((u1*) &src->name_cp_index); |
|
1900 |
lvt->descriptor_cp_index = Bytes::get_Java_u2((u1*) &src->descriptor_cp_index); |
|
1901 |
lvt->signature_cp_index = 0; |
|
1902 |
lvt->slot = Bytes::get_Java_u2((u1*) &src->slot); |
|
1903 |
} |
|
1904 |
||
1905 |
// Function is used to parse both attributes: |
|
34666 | 1906 |
// LocalVariableTable (LVT) and LocalVariableTypeTable (LVTT) |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1907 |
const ClassFileParser::unsafe_u2* ClassFileParser::parse_localvariable_table(const ClassFileStream* cfs, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1908 |
u4 code_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1909 |
u2 max_locals, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1910 |
u4 code_attribute_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1911 |
u2* const localvariable_table_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1912 |
bool isLVTT, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1913 |
TRAPS) { |
34666 | 1914 |
const char* const tbl_name = (isLVTT) ? "LocalVariableTypeTable" : "LocalVariableTable"; |
1 | 1915 |
*localvariable_table_length = cfs->get_u2(CHECK_NULL); |
34666 | 1916 |
const unsigned int size = |
1917 |
(*localvariable_table_length) * sizeof(Classfile_LVT_Element) / sizeof(u2); |
|
1918 |
||
1919 |
const ConstantPool* const cp = _cp; |
|
1920 |
||
1 | 1921 |
// Verify local variable table attribute has right length |
1922 |
if (_need_verify) { |
|
1923 |
guarantee_property(code_attribute_length == (sizeof(*localvariable_table_length) + size * sizeof(u2)), |
|
1924 |
"%s has wrong length in class file %s", tbl_name, CHECK_NULL); |
|
1925 |
} |
|
34666 | 1926 |
|
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
1927 |
const unsafe_u2* const localvariable_table_start = cfs->current(); |
1 | 1928 |
assert(localvariable_table_start != NULL, "null local variable table"); |
1929 |
if (!_need_verify) { |
|
1930 |
cfs->skip_u2_fast(size); |
|
1931 |
} else { |
|
1932 |
cfs->guarantee_more(size * 2, CHECK_NULL); |
|
1933 |
for(int i = 0; i < (*localvariable_table_length); i++) { |
|
34666 | 1934 |
const u2 start_pc = cfs->get_u2_fast(); |
1935 |
const u2 length = cfs->get_u2_fast(); |
|
1936 |
const u2 name_index = cfs->get_u2_fast(); |
|
1937 |
const u2 descriptor_index = cfs->get_u2_fast(); |
|
1938 |
const u2 index = cfs->get_u2_fast(); |
|
1 | 1939 |
// Assign to a u4 to avoid overflow |
34666 | 1940 |
const u4 end_pc = (u4)start_pc + (u4)length; |
1 | 1941 |
|
1942 |
if (start_pc >= code_length) { |
|
1943 |
classfile_parse_error( |
|
1944 |
"Invalid start_pc %u in %s in class file %s", |
|
1945 |
start_pc, tbl_name, CHECK_NULL); |
|
1946 |
} |
|
1947 |
if (end_pc > code_length) { |
|
1948 |
classfile_parse_error( |
|
1949 |
"Invalid length %u in %s in class file %s", |
|
1950 |
length, tbl_name, CHECK_NULL); |
|
1951 |
} |
|
34666 | 1952 |
const int cp_size = cp->length(); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1953 |
guarantee_property(valid_symbol_at(name_index), |
1 | 1954 |
"Name index %u in %s has bad constant type in class file %s", |
1955 |
name_index, tbl_name, CHECK_NULL); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
1956 |
guarantee_property(valid_symbol_at(descriptor_index), |
1 | 1957 |
"Signature index %u in %s has bad constant type in class file %s", |
1958 |
descriptor_index, tbl_name, CHECK_NULL); |
|
1959 |
||
34666 | 1960 |
const Symbol* const name = cp->symbol_at(name_index); |
1961 |
const Symbol* const sig = cp->symbol_at(descriptor_index); |
|
1 | 1962 |
verify_legal_field_name(name, CHECK_NULL); |
1963 |
u2 extra_slot = 0; |
|
1964 |
if (!isLVTT) { |
|
1965 |
verify_legal_field_signature(name, sig, CHECK_NULL); |
|
1966 |
||
1967 |
// 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
|
1968 |
if (sig == vmSymbols::type_signature(T_DOUBLE) || |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
1969 |
sig == vmSymbols::type_signature(T_LONG)) { |
1 | 1970 |
extra_slot = 1; |
1971 |
} |
|
1972 |
} |
|
1973 |
guarantee_property((index + extra_slot) < max_locals, |
|
1974 |
"Invalid index %u in %s in class file %s", |
|
1975 |
index, tbl_name, CHECK_NULL); |
|
1976 |
} |
|
1977 |
} |
|
1978 |
return localvariable_table_start; |
|
1979 |
} |
|
1980 |
||
34666 | 1981 |
static const u1* parse_stackmap_table(const ClassFileStream* const cfs, |
1982 |
u4 code_attribute_length, |
|
1983 |
bool need_verify, |
|
1984 |
TRAPS) { |
|
1985 |
assert(cfs != NULL, "invariant"); |
|
1986 |
||
1987 |
if (0 == code_attribute_length) { |
|
1 | 1988 |
return NULL; |
34666 | 1989 |
} |
1990 |
||
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
1991 |
const u1* const stackmap_table_start = cfs->current(); |
1 | 1992 |
assert(stackmap_table_start != NULL, "null stackmap table"); |
1993 |
||
1994 |
// check code_attribute_length first |
|
34666 | 1995 |
cfs->skip_u1(code_attribute_length, CHECK_NULL); |
1996 |
||
1997 |
if (!need_verify && !DumpSharedSpaces) { |
|
1 | 1998 |
return NULL; |
1999 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2000 |
return stackmap_table_start; |
1 | 2001 |
} |
2002 |
||
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2003 |
const ClassFileParser::unsafe_u2* ClassFileParser::parse_checked_exceptions(const ClassFileStream* const cfs, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2004 |
u2* const checked_exceptions_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2005 |
u4 method_attribute_length, |
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2006 |
TRAPS) { |
34666 | 2007 |
assert(cfs != NULL, "invariant"); |
2008 |
assert(checked_exceptions_length != NULL, "invariant"); |
|
2009 |
||
1 | 2010 |
cfs->guarantee_more(2, CHECK_NULL); // checked_exceptions_length |
2011 |
*checked_exceptions_length = cfs->get_u2_fast(); |
|
34666 | 2012 |
const unsigned int size = |
2013 |
(*checked_exceptions_length) * sizeof(CheckedExceptionElement) / sizeof(u2); |
|
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2014 |
const unsafe_u2* const checked_exceptions_start = cfs->current(); |
1 | 2015 |
assert(checked_exceptions_start != NULL, "null checked exceptions"); |
2016 |
if (!_need_verify) { |
|
2017 |
cfs->skip_u2_fast(size); |
|
2018 |
} else { |
|
2019 |
// Verify each value in the checked exception table |
|
2020 |
u2 checked_exception; |
|
34666 | 2021 |
const u2 len = *checked_exceptions_length; |
1 | 2022 |
cfs->guarantee_more(2 * len, CHECK_NULL); |
2023 |
for (int i = 0; i < len; i++) { |
|
2024 |
checked_exception = cfs->get_u2_fast(); |
|
2025 |
check_property( |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2026 |
valid_klass_reference_at(checked_exception), |
1 | 2027 |
"Exception name has bad type at constant pool %u in class file %s", |
2028 |
checked_exception, CHECK_NULL); |
|
2029 |
} |
|
2030 |
} |
|
2031 |
// check exceptions attribute length |
|
2032 |
if (_need_verify) { |
|
2033 |
guarantee_property(method_attribute_length == (sizeof(*checked_exceptions_length) + |
|
2034 |
sizeof(u2) * size), |
|
2035 |
"Exceptions attribute has wrong length in class file %s", CHECK_NULL); |
|
2036 |
} |
|
2037 |
return checked_exceptions_start; |
|
2038 |
} |
|
2039 |
||
34666 | 2040 |
void ClassFileParser::throwIllegalSignature(const char* type, |
2041 |
const Symbol* name, |
|
2042 |
const Symbol* sig, |
|
2043 |
TRAPS) const { |
|
2044 |
assert(name != NULL, "invariant"); |
|
2045 |
assert(sig != NULL, "invariant"); |
|
2046 |
||
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
2047 |
ResourceMark rm(THREAD); |
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
2048 |
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
|
2049 |
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
|
2050 |
"%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
|
2051 |
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
|
2052 |
} |
1 | 2053 |
|
34666 | 2054 |
AnnotationCollector::ID |
2055 |
AnnotationCollector::annotation_index(const ClassLoaderData* loader_data, |
|
2056 |
const Symbol* name) { |
|
2057 |
const vmSymbols::SID sid = vmSymbols::find_sid(name); |
|
15244
83447fffce1e
8006758: LinkResolver assertion (caused by @Contended changes)
kmo
parents:
15221
diff
changeset
|
2058 |
// 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
|
2059 |
const bool privileged = loader_data->is_the_null_class_loader_data() || |
36508 | 2060 |
loader_data->is_platform_class_loader_data() || |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
2061 |
loader_data->is_unsafe_anonymous(); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2062 |
switch (sid) { |
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37242
diff
changeset
|
2063 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(reflect_CallerSensitive_signature): { |
34666 | 2064 |
if (_location != _in_method) break; // only allow for methods |
2065 |
if (!privileged) break; // only allow in privileged code |
|
2066 |
return _method_CallerSensitive; |
|
2067 |
} |
|
35135 | 2068 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_ForceInline_signature): { |
34666 | 2069 |
if (_location != _in_method) break; // only allow for methods |
2070 |
if (!privileged) break; // only allow in privileged code |
|
2071 |
return _method_ForceInline; |
|
2072 |
} |
|
35135 | 2073 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_DontInline_signature): { |
34666 | 2074 |
if (_location != _in_method) break; // only allow for methods |
2075 |
if (!privileged) break; // only allow in privileged code |
|
2076 |
return _method_DontInline; |
|
2077 |
} |
|
2078 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_InjectedProfile_signature): { |
|
2079 |
if (_location != _in_method) break; // only allow for methods |
|
2080 |
if (!privileged) break; // only allow in privileged code |
|
2081 |
return _method_InjectedProfile; |
|
2082 |
} |
|
2083 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): { |
|
2084 |
if (_location != _in_method) break; // only allow for methods |
|
2085 |
if (!privileged) break; // only allow in privileged code |
|
2086 |
return _method_LambdaForm_Compiled; |
|
2087 |
} |
|
53435
ea254e9fc587
8213234: Move LambdaForm.Hidden to jdk.internal.vm.annotation
vlivanov
parents:
53338
diff
changeset
|
2088 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Hidden_signature): { |
52431
b0af758a092c
8212605: Pure-Java implementation of AccessController.doPrivileged
dlong
parents:
51997
diff
changeset
|
2089 |
if (_location != _in_method) break; // only allow for methods |
b0af758a092c
8212605: Pure-Java implementation of AccessController.doPrivileged
dlong
parents:
51997
diff
changeset
|
2090 |
if (!privileged) break; // only allow in privileged code |
b0af758a092c
8212605: Pure-Java implementation of AccessController.doPrivileged
dlong
parents:
51997
diff
changeset
|
2091 |
return _method_Hidden; |
34666 | 2092 |
} |
2093 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_HotSpotIntrinsicCandidate_signature): { |
|
2094 |
if (_location != _in_method) break; // only allow for methods |
|
2095 |
if (!privileged) break; // only allow in privileged code |
|
2096 |
return _method_HotSpotIntrinsicCandidate; |
|
2097 |
} |
|
35135 | 2098 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Stable_signature): { |
34666 | 2099 |
if (_location != _in_field) break; // only allow for fields |
2100 |
if (!privileged) break; // only allow in privileged code |
|
2101 |
return _field_Stable; |
|
2102 |
} |
|
2103 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Contended_signature): { |
|
2104 |
if (_location != _in_field && _location != _in_class) { |
|
2105 |
break; // only allow for fields and classes |
|
2106 |
} |
|
2107 |
if (!EnableContended || (RestrictContended && !privileged)) { |
|
2108 |
break; // honor privileges |
|
2109 |
} |
|
2110 |
return _jdk_internal_vm_annotation_Contended; |
|
2111 |
} |
|
35071
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2112 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_ReservedStackAccess_signature): { |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2113 |
if (_location != _in_method) break; // only allow for methods |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2114 |
if (RestrictReservedStack && !privileged) break; // honor privileges |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2115 |
return _jdk_internal_vm_annotation_ReservedStackAccess; |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2116 |
} |
34666 | 2117 |
default: { |
2118 |
break; |
|
2119 |
} |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2120 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2121 |
return AnnotationCollector::_unknown; |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2122 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2123 |
|
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2124 |
void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) { |
15193
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
2125 |
if (is_contended()) |
8e6b5694267f
8003985: Support @Contended Annotation - JEP 142
jwilhelm
parents:
15185
diff
changeset
|
2126 |
f->set_contended_group(contended_group()); |
19770
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
2127 |
if (is_stable()) |
7cb9f982ea81
8001107: @Stable annotation for constant folding of lazily evaluated variables
vlivanov
parents:
19681
diff
changeset
|
2128 |
f->set_stable(true); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2129 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2130 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2131 |
ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2132 |
// 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
|
2133 |
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
|
2134 |
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
|
2135 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2136 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46701
diff
changeset
|
2137 |
void MethodAnnotationCollector::apply_to(const methodHandle& m) { |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
2138 |
if (has_annotation(_method_CallerSensitive)) |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
15935
diff
changeset
|
2139 |
m->set_caller_sensitive(true); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2140 |
if (has_annotation(_method_ForceInline)) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2141 |
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
|
2142 |
if (has_annotation(_method_DontInline)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
2143 |
m->set_dont_inline(true); |
31228
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
2144 |
if (has_annotation(_method_InjectedProfile)) |
8e427370cdd1
8074551: GWT can be marked non-compilable due to deopt count pollution
vlivanov
parents:
30764
diff
changeset
|
2145 |
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
|
2146 |
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
|
2147 |
m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm); |
52431
b0af758a092c
8212605: Pure-Java implementation of AccessController.doPrivileged
dlong
parents:
51997
diff
changeset
|
2148 |
if (has_annotation(_method_Hidden)) |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13296
diff
changeset
|
2149 |
m->set_hidden(true); |
31587
e48945b7849c
8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents:
31402
diff
changeset
|
2150 |
if (has_annotation(_method_HotSpotIntrinsicCandidate) && !m->is_synthetic()) |
e48945b7849c
8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents:
31402
diff
changeset
|
2151 |
m->set_intrinsic_candidate(true); |
35071
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2152 |
if (has_annotation(_jdk_internal_vm_annotation_ReservedStackAccess)) |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
34666
diff
changeset
|
2153 |
m->set_has_reserved_stack_access(true); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2154 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2155 |
|
34666 | 2156 |
void ClassFileParser::ClassAnnotationCollector::apply_to(InstanceKlass* ik) { |
2157 |
assert(ik != NULL, "invariant"); |
|
2158 |
ik->set_is_contended(is_contended()); |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2159 |
} |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2160 |
|
1 | 2161 |
#define MAX_ARGS_SIZE 255 |
2162 |
#define MAX_CODE_SIZE 65535 |
|
2163 |
#define INITIAL_MAX_LVT_NUMBER 256 |
|
2164 |
||
15601 | 2165 |
/* Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
2166 |
* |
|
2167 |
* Rules for LVT's and LVTT's are: |
|
2168 |
* - There can be any number of LVT's and LVTT's. |
|
2169 |
* - If there are n LVT's, it is the same as if there was just |
|
2170 |
* one LVT containing all the entries from the n LVT's. |
|
2171 |
* - There may be no more than one LVT entry per local variable. |
|
2172 |
* Two LVT entries are 'equal' if these fields are the same: |
|
2173 |
* start_pc, length, name, slot |
|
2174 |
* - There may be no more than one LVTT entry per each LVT entry. |
|
2175 |
* Each LVTT entry has to match some LVT entry. |
|
2176 |
* - HotSpot internal LVT keeps natural ordering of class file LVT entries. |
|
2177 |
*/ |
|
34666 | 2178 |
void ClassFileParser::copy_localvariable_table(const ConstMethod* cm, |
15601 | 2179 |
int lvt_cnt, |
34666 | 2180 |
u2* const localvariable_table_length, |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2181 |
const unsafe_u2** const localvariable_table_start, |
15601 | 2182 |
int lvtt_cnt, |
34666 | 2183 |
u2* const localvariable_type_table_length, |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2184 |
const unsafe_u2** const localvariable_type_table_start, |
15601 | 2185 |
TRAPS) { |
2186 |
||
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
2187 |
ResourceMark rm(THREAD); |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
2188 |
|
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
2189 |
typedef ResourceHashtable<LocalVariableTableElement, LocalVariableTableElement*, |
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
2190 |
&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
|
2191 |
|
34666 | 2192 |
LVT_HashTable* const table = new LVT_HashTable(); |
15601 | 2193 |
|
2194 |
// To fill LocalVariableTable in |
|
34666 | 2195 |
const Classfile_LVT_Element* cf_lvt; |
15601 | 2196 |
LocalVariableTableElement* lvt = cm->localvariable_table_start(); |
2197 |
||
2198 |
for (int tbl_no = 0; tbl_no < lvt_cnt; tbl_no++) { |
|
2199 |
cf_lvt = (Classfile_LVT_Element *) localvariable_table_start[tbl_no]; |
|
2200 |
for (int idx = 0; idx < localvariable_table_length[tbl_no]; idx++, lvt++) { |
|
2201 |
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
|
2202 |
// 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
|
2203 |
if (table->put(*lvt, lvt) == false |
15601 | 2204 |
&& _need_verify |
2205 |
&& _major_version >= JAVA_1_5_VERSION) { |
|
2206 |
classfile_parse_error("Duplicated LocalVariableTable attribute " |
|
2207 |
"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
|
2208 |
_cp->symbol_at(lvt->name_cp_index)->as_utf8(), |
15601 | 2209 |
CHECK); |
2210 |
} |
|
2211 |
} |
|
2212 |
} |
|
2213 |
||
2214 |
// To merge LocalVariableTable and LocalVariableTypeTable |
|
34666 | 2215 |
const Classfile_LVT_Element* cf_lvtt; |
15601 | 2216 |
LocalVariableTableElement lvtt_elem; |
2217 |
||
2218 |
for (int tbl_no = 0; tbl_no < lvtt_cnt; tbl_no++) { |
|
2219 |
cf_lvtt = (Classfile_LVT_Element *) localvariable_type_table_start[tbl_no]; |
|
2220 |
for (int idx = 0; idx < localvariable_type_table_length[tbl_no]; idx++) { |
|
2221 |
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
|
2222 |
LocalVariableTableElement** entry = table->get(lvtt_elem); |
15601 | 2223 |
if (entry == NULL) { |
2224 |
if (_need_verify) { |
|
2225 |
classfile_parse_error("LVTT entry for '%s' in class file %s " |
|
2226 |
"does not match any LVT entry", |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2227 |
_cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
15601 | 2228 |
CHECK); |
2229 |
} |
|
28817
09a44329d68d
8049632: JDK 1.8.0 b132 :Linux x64 : Crash in ClassFileParser::copy_localvariable_table(..)
coleenp
parents:
28027
diff
changeset
|
2230 |
} else if ((*entry)->signature_cp_index != 0 && _need_verify) { |
15601 | 2231 |
classfile_parse_error("Duplicated LocalVariableTypeTable attribute " |
2232 |
"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
|
2233 |
_cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(), |
15601 | 2234 |
CHECK); |
2235 |
} else { |
|
2236 |
// 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
|
2237 |
(*entry)->signature_cp_index = lvtt_elem.descriptor_cp_index; |
15601 | 2238 |
} |
2239 |
} |
|
2240 |
} |
|
2241 |
} |
|
2242 |
||
2243 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2244 |
void ClassFileParser::copy_method_annotations(ConstMethod* cm, |
34666 | 2245 |
const u1* runtime_visible_annotations, |
15601 | 2246 |
int runtime_visible_annotations_length, |
34666 | 2247 |
const u1* runtime_invisible_annotations, |
15601 | 2248 |
int runtime_invisible_annotations_length, |
34666 | 2249 |
const u1* runtime_visible_parameter_annotations, |
15601 | 2250 |
int runtime_visible_parameter_annotations_length, |
34666 | 2251 |
const u1* runtime_invisible_parameter_annotations, |
15601 | 2252 |
int runtime_invisible_parameter_annotations_length, |
34666 | 2253 |
const u1* runtime_visible_type_annotations, |
15601 | 2254 |
int runtime_visible_type_annotations_length, |
34666 | 2255 |
const u1* runtime_invisible_type_annotations, |
15601 | 2256 |
int runtime_invisible_type_annotations_length, |
34666 | 2257 |
const u1* annotation_default, |
15601 | 2258 |
int annotation_default_length, |
2259 |
TRAPS) { |
|
2260 |
||
2261 |
AnnotationArray* a; |
|
2262 |
||
2263 |
if (runtime_visible_annotations_length + |
|
2264 |
runtime_invisible_annotations_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2265 |
a = assemble_annotations(runtime_visible_annotations, |
15601 | 2266 |
runtime_visible_annotations_length, |
2267 |
runtime_invisible_annotations, |
|
2268 |
runtime_invisible_annotations_length, |
|
2269 |
CHECK); |
|
2270 |
cm->set_method_annotations(a); |
|
2271 |
} |
|
2272 |
||
2273 |
if (runtime_visible_parameter_annotations_length + |
|
2274 |
runtime_invisible_parameter_annotations_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2275 |
a = assemble_annotations(runtime_visible_parameter_annotations, |
15601 | 2276 |
runtime_visible_parameter_annotations_length, |
2277 |
runtime_invisible_parameter_annotations, |
|
2278 |
runtime_invisible_parameter_annotations_length, |
|
2279 |
CHECK); |
|
2280 |
cm->set_parameter_annotations(a); |
|
2281 |
} |
|
2282 |
||
2283 |
if (annotation_default_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2284 |
a = assemble_annotations(annotation_default, |
15601 | 2285 |
annotation_default_length, |
2286 |
NULL, |
|
2287 |
0, |
|
2288 |
CHECK); |
|
2289 |
cm->set_default_annotations(a); |
|
2290 |
} |
|
2291 |
||
2292 |
if (runtime_visible_type_annotations_length + |
|
2293 |
runtime_invisible_type_annotations_length > 0) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2294 |
a = assemble_annotations(runtime_visible_type_annotations, |
15601 | 2295 |
runtime_visible_type_annotations_length, |
2296 |
runtime_invisible_type_annotations, |
|
2297 |
runtime_invisible_type_annotations_length, |
|
2298 |
CHECK); |
|
2299 |
cm->set_type_annotations(a); |
|
2300 |
} |
|
2301 |
} |
|
2302 |
||
2303 |
||
1 | 2304 |
// 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
|
2305 |
// 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
|
2306 |
// Method* to save footprint, so we only know the size of the resulting Method* when the |
1 | 2307 |
// entire method attribute is parsed. |
2308 |
// |
|
2309 |
// The promoted_flags parameter is used to pass relevant access_flags |
|
2310 |
// from the method back up to the containing klass. These flag values |
|
2311 |
// are added to klass's access_flags. |
|
2312 |
||
34666 | 2313 |
Method* ClassFileParser::parse_method(const ClassFileStream* const cfs, |
2314 |
bool is_interface, |
|
2315 |
const ConstantPool* cp, |
|
2316 |
AccessFlags* const promoted_flags, |
|
2317 |
TRAPS) { |
|
2318 |
assert(cfs != NULL, "invariant"); |
|
2319 |
assert(cp != NULL, "invariant"); |
|
2320 |
assert(promoted_flags != NULL, "invariant"); |
|
2321 |
||
1 | 2322 |
ResourceMark rm(THREAD); |
34666 | 2323 |
// Parse fixed parts: |
2324 |
// access_flags, name_index, descriptor_index, attributes_count |
|
2325 |
cfs->guarantee_more(8, CHECK_NULL); |
|
1 | 2326 |
|
2327 |
int flags = cfs->get_u2_fast(); |
|
34666 | 2328 |
const u2 name_index = cfs->get_u2_fast(); |
2329 |
const int cp_size = cp->length(); |
|
1 | 2330 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2331 |
valid_symbol_at(name_index), |
1 | 2332 |
"Illegal constant pool index %u for method name in class file %s", |
34666 | 2333 |
name_index, CHECK_NULL); |
2334 |
const Symbol* const name = cp->symbol_at(name_index); |
|
2335 |
verify_legal_method_name(name, CHECK_NULL); |
|
2336 |
||
2337 |
const u2 signature_index = cfs->get_u2_fast(); |
|
1 | 2338 |
guarantee_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2339 |
valid_symbol_at(signature_index), |
1 | 2340 |
"Illegal constant pool index %u for method signature in class file %s", |
34666 | 2341 |
signature_index, CHECK_NULL); |
2342 |
const Symbol* const signature = cp->symbol_at(signature_index); |
|
2343 |
||
1 | 2344 |
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
|
2345 |
// 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
|
2346 |
// (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
|
2347 |
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
|
2348 |
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
|
2349 |
} 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
|
2350 |
flags &= JVM_ACC_STATIC | JVM_ACC_STRICT; |
32824
3b686e54dece
8135208: VM permits illegal <clinit> access_flags, versions 51-52
hseigel
parents:
31867
diff
changeset
|
2351 |
} else { |
34666 | 2352 |
classfile_parse_error("Method <clinit> is not static in class file %s", CHECK_NULL); |
8653
8797d788a4f1
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
8296
diff
changeset
|
2353 |
} |
1 | 2354 |
} else { |
34666 | 2355 |
verify_legal_method_modifiers(flags, is_interface, name, CHECK_NULL); |
1 | 2356 |
} |
2357 |
||
33207
edc4431940b2
8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents:
33105
diff
changeset
|
2358 |
if (name == vmSymbols::object_initializer_name() && is_interface) { |
34666 | 2359 |
classfile_parse_error("Interface cannot have a method named <init>, class file %s", CHECK_NULL); |
33207
edc4431940b2
8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents:
33105
diff
changeset
|
2360 |
} |
edc4431940b2
8139069: JVM should throw ClassFormatError for <init> methods in interfaces
hseigel
parents:
33105
diff
changeset
|
2361 |
|
1 | 2362 |
int args_size = -1; // only used when _need_verify is true |
2363 |
if (_need_verify) { |
|
2364 |
args_size = ((flags & JVM_ACC_STATIC) ? 0 : 1) + |
|
34666 | 2365 |
verify_legal_method_signature(name, signature, CHECK_NULL); |
1 | 2366 |
if (args_size > MAX_ARGS_SIZE) { |
34666 | 2367 |
classfile_parse_error("Too many arguments in method signature in class file %s", CHECK_NULL); |
1 | 2368 |
} |
2369 |
} |
|
2370 |
||
34666 | 2371 |
AccessFlags access_flags(flags & JVM_RECOGNIZED_METHOD_MODIFIERS); |
1 | 2372 |
|
2373 |
// Default values for code and exceptions attribute elements |
|
2374 |
u2 max_stack = 0; |
|
2375 |
u2 max_locals = 0; |
|
2376 |
u4 code_length = 0; |
|
34666 | 2377 |
const u1* code_start = 0; |
1 | 2378 |
u2 exception_table_length = 0; |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2379 |
const unsafe_u2* exception_table_start = NULL; // (potentially unaligned) pointer to array of u2 elements |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2380 |
Array<int>* exception_handlers = Universe::the_empty_int_array(); |
1 | 2381 |
u2 checked_exceptions_length = 0; |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2382 |
const unsafe_u2* checked_exceptions_start = NULL; // (potentially unaligned) pointer to array of u2 elements |
1 | 2383 |
CompressedLineNumberWriteStream* linenumber_table = NULL; |
2384 |
int linenumber_table_length = 0; |
|
2385 |
int total_lvt_length = 0; |
|
2386 |
u2 lvt_cnt = 0; |
|
2387 |
u2 lvtt_cnt = 0; |
|
2388 |
bool lvt_allocated = false; |
|
2389 |
u2 max_lvt_cnt = INITIAL_MAX_LVT_NUMBER; |
|
2390 |
u2 max_lvtt_cnt = INITIAL_MAX_LVT_NUMBER; |
|
31851
ec2f9350c499
8079825: Uninitialised variable in hotspot/src/share/vm & cpu/x86/vm (runtime)
ccheung
parents:
31778
diff
changeset
|
2391 |
u2* localvariable_table_length = NULL; |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2392 |
const unsafe_u2** localvariable_table_start = NULL; // (potentially unaligned) pointer to array of LVT attributes |
31851
ec2f9350c499
8079825: Uninitialised variable in hotspot/src/share/vm & cpu/x86/vm (runtime)
ccheung
parents:
31778
diff
changeset
|
2393 |
u2* localvariable_type_table_length = NULL; |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2394 |
const unsafe_u2** localvariable_type_table_start = NULL; // (potentially unaligned) pointer to LVTT attributes |
27612
7201412afbd0
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents:
27402
diff
changeset
|
2395 |
int method_parameters_length = -1; |
34666 | 2396 |
const u1* method_parameters_data = NULL; |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2397 |
bool method_parameters_seen = false; |
1 | 2398 |
bool parsed_code_attribute = false; |
2399 |
bool parsed_checked_exceptions_attribute = false; |
|
2400 |
bool parsed_stackmap_attribute = false; |
|
2401 |
// stackmap attribute - JDK1.5 |
|
34666 | 2402 |
const u1* stackmap_data = NULL; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2403 |
int stackmap_data_length = 0; |
1 | 2404 |
u2 generic_signature_index = 0; |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2405 |
MethodAnnotationCollector parsed_annotations; |
34666 | 2406 |
const u1* runtime_visible_annotations = NULL; |
1 | 2407 |
int runtime_visible_annotations_length = 0; |
34666 | 2408 |
const u1* runtime_invisible_annotations = NULL; |
1 | 2409 |
int runtime_invisible_annotations_length = 0; |
34666 | 2410 |
const u1* runtime_visible_parameter_annotations = NULL; |
1 | 2411 |
int runtime_visible_parameter_annotations_length = 0; |
34666 | 2412 |
const u1* runtime_invisible_parameter_annotations = NULL; |
1 | 2413 |
int runtime_invisible_parameter_annotations_length = 0; |
34666 | 2414 |
const u1* runtime_visible_type_annotations = NULL; |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2415 |
int runtime_visible_type_annotations_length = 0; |
34666 | 2416 |
const u1* runtime_invisible_type_annotations = NULL; |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2417 |
int runtime_invisible_type_annotations_length = 0; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2418 |
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
|
2419 |
bool runtime_invisible_type_annotations_exists = false; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2420 |
bool runtime_invisible_parameter_annotations_exists = false; |
34666 | 2421 |
const u1* annotation_default = NULL; |
1 | 2422 |
int annotation_default_length = 0; |
2423 |
||
2424 |
// Parse code and exceptions attribute |
|
2425 |
u2 method_attributes_count = cfs->get_u2_fast(); |
|
2426 |
while (method_attributes_count--) { |
|
34666 | 2427 |
cfs->guarantee_more(6, CHECK_NULL); // method_attribute_name_index, method_attribute_length |
2428 |
const u2 method_attribute_name_index = cfs->get_u2_fast(); |
|
2429 |
const u4 method_attribute_length = cfs->get_u4_fast(); |
|
1 | 2430 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2431 |
valid_symbol_at(method_attribute_name_index), |
1 | 2432 |
"Invalid method attribute name index %u in class file %s", |
34666 | 2433 |
method_attribute_name_index, CHECK_NULL); |
2434 |
||
2435 |
const Symbol* const method_attribute_name = cp->symbol_at(method_attribute_name_index); |
|
1 | 2436 |
if (method_attribute_name == vmSymbols::tag_code()) { |
2437 |
// Parse Code attribute |
|
2438 |
if (_need_verify) { |
|
14385 | 2439 |
guarantee_property( |
2440 |
!access_flags.is_native() && !access_flags.is_abstract(), |
|
1 | 2441 |
"Code attribute in native or abstract methods in class file %s", |
34666 | 2442 |
CHECK_NULL); |
1 | 2443 |
} |
2444 |
if (parsed_code_attribute) { |
|
34666 | 2445 |
classfile_parse_error("Multiple Code attributes in class file %s", |
2446 |
CHECK_NULL); |
|
1 | 2447 |
} |
2448 |
parsed_code_attribute = true; |
|
2449 |
||
2450 |
// Stack size, locals size, and code size |
|
58817 | 2451 |
cfs->guarantee_more(8, CHECK_NULL); |
2452 |
max_stack = cfs->get_u2_fast(); |
|
2453 |
max_locals = cfs->get_u2_fast(); |
|
2454 |
code_length = cfs->get_u4_fast(); |
|
1 | 2455 |
if (_need_verify) { |
2456 |
guarantee_property(args_size <= max_locals, |
|
34666 | 2457 |
"Arguments can't fit into locals in class file %s", |
2458 |
CHECK_NULL); |
|
1 | 2459 |
guarantee_property(code_length > 0 && code_length <= MAX_CODE_SIZE, |
2460 |
"Invalid method Code length %u in class file %s", |
|
34666 | 2461 |
code_length, CHECK_NULL); |
1 | 2462 |
} |
2463 |
// Code pointer |
|
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2464 |
code_start = cfs->current(); |
1 | 2465 |
assert(code_start != NULL, "null code start"); |
34666 | 2466 |
cfs->guarantee_more(code_length, CHECK_NULL); |
1 | 2467 |
cfs->skip_u1_fast(code_length); |
2468 |
||
2469 |
// Exception handler table |
|
34666 | 2470 |
cfs->guarantee_more(2, CHECK_NULL); // exception_table_length |
1 | 2471 |
exception_table_length = cfs->get_u2_fast(); |
2472 |
if (exception_table_length > 0) { |
|
34666 | 2473 |
exception_table_start = parse_exception_table(cfs, |
2474 |
code_length, |
|
2475 |
exception_table_length, |
|
2476 |
CHECK_NULL); |
|
1 | 2477 |
} |
2478 |
||
2479 |
// Parse additional attributes in code attribute |
|
34666 | 2480 |
cfs->guarantee_more(2, CHECK_NULL); // code_attributes_count |
1 | 2481 |
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
|
2482 |
|
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2483 |
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
|
2484 |
|
58817 | 2485 |
calculated_attribute_length = |
2486 |
sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length); |
|
339
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2487 |
calculated_attribute_length += |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2488 |
code_length + |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2489 |
sizeof(exception_table_length) + |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2490 |
sizeof(code_attributes_count) + |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2491 |
exception_table_length * |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2492 |
( sizeof(u2) + // start_pc |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2493 |
sizeof(u2) + // end_pc |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2494 |
sizeof(u2) + // handler_pc |
2d9c1e9e9f98
6615981: JVM class file parser incorrectly rejects class files with version < 45.2
kamg
parents:
1
diff
changeset
|
2495 |
sizeof(u2) ); // catch_type_index |
1 | 2496 |
|
2497 |
while (code_attributes_count--) { |
|
34666 | 2498 |
cfs->guarantee_more(6, CHECK_NULL); // code_attribute_name_index, code_attribute_length |
2499 |
const u2 code_attribute_name_index = cfs->get_u2_fast(); |
|
2500 |
const u4 code_attribute_length = cfs->get_u4_fast(); |
|
1 | 2501 |
calculated_attribute_length += code_attribute_length + |
2502 |
sizeof(code_attribute_name_index) + |
|
2503 |
sizeof(code_attribute_length); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2504 |
check_property(valid_symbol_at(code_attribute_name_index), |
1 | 2505 |
"Invalid code attribute name index %u in class file %s", |
2506 |
code_attribute_name_index, |
|
34666 | 2507 |
CHECK_NULL); |
1 | 2508 |
if (LoadLineNumberTables && |
34666 | 2509 |
cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) { |
1 | 2510 |
// Parse and compress line number table |
34666 | 2511 |
parse_linenumber_table(code_attribute_length, |
2512 |
code_length, |
|
2513 |
&linenumber_table, |
|
2514 |
CHECK_NULL); |
|
1 | 2515 |
|
2516 |
} else if (LoadLocalVariableTables && |
|
34666 | 2517 |
cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) { |
1 | 2518 |
// Parse local variable table |
2519 |
if (!lvt_allocated) { |
|
2520 |
localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2521 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2522 |
localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2523 |
THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER); |
1 | 2524 |
localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
2525 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2526 |
localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2527 |
THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER); |
1 | 2528 |
lvt_allocated = true; |
2529 |
} |
|
2530 |
if (lvt_cnt == max_lvt_cnt) { |
|
2531 |
max_lvt_cnt <<= 1; |
|
20668 | 2532 |
localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt); |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2533 |
localvariable_table_start = REALLOC_RESOURCE_ARRAY(const unsafe_u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt); |
1 | 2534 |
} |
2535 |
localvariable_table_start[lvt_cnt] = |
|
34666 | 2536 |
parse_localvariable_table(cfs, |
2537 |
code_length, |
|
1 | 2538 |
max_locals, |
2539 |
code_attribute_length, |
|
2540 |
&localvariable_table_length[lvt_cnt], |
|
2541 |
false, // is not LVTT |
|
34666 | 2542 |
CHECK_NULL); |
1 | 2543 |
total_lvt_length += localvariable_table_length[lvt_cnt]; |
2544 |
lvt_cnt++; |
|
2545 |
} else if (LoadLocalVariableTypeTables && |
|
2546 |
_major_version >= JAVA_1_5_VERSION && |
|
34666 | 2547 |
cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) { |
1 | 2548 |
if (!lvt_allocated) { |
2549 |
localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2550 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2551 |
localvariable_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2552 |
THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER); |
1 | 2553 |
localvariable_type_table_length = NEW_RESOURCE_ARRAY_IN_THREAD( |
2554 |
THREAD, u2, INITIAL_MAX_LVT_NUMBER); |
|
2555 |
localvariable_type_table_start = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2556 |
THREAD, const unsafe_u2*, INITIAL_MAX_LVT_NUMBER); |
1 | 2557 |
lvt_allocated = true; |
2558 |
} |
|
2559 |
// Parse local variable type table |
|
2560 |
if (lvtt_cnt == max_lvtt_cnt) { |
|
2561 |
max_lvtt_cnt <<= 1; |
|
20668 | 2562 |
localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt); |
46513
c61eea516a0a
8181377: Capture underlying type for unsafe/unaligned pointers in ClassFileParser
mikael
parents:
46504
diff
changeset
|
2563 |
localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(const unsafe_u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt); |
1 | 2564 |
} |
2565 |
localvariable_type_table_start[lvtt_cnt] = |
|
34666 | 2566 |
parse_localvariable_table(cfs, |
2567 |
code_length, |
|
1 | 2568 |
max_locals, |
2569 |
code_attribute_length, |
|
2570 |
&localvariable_type_table_length[lvtt_cnt], |
|
2571 |
true, // is LVTT |
|
34666 | 2572 |
CHECK_NULL); |
1 | 2573 |
lvtt_cnt++; |
16445
cb44d5b3ad89
8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents:
15935
diff
changeset
|
2574 |
} else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION && |
34666 | 2575 |
cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) { |
1 | 2576 |
// Stack map is only needed by the new verifier in JDK1.5. |
2577 |
if (parsed_stackmap_attribute) { |
|
34666 | 2578 |
classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_NULL); |
1 | 2579 |
} |
34666 | 2580 |
stackmap_data = parse_stackmap_table(cfs, code_attribute_length, _need_verify, CHECK_NULL); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2581 |
stackmap_data_length = code_attribute_length; |
1 | 2582 |
parsed_stackmap_attribute = true; |
2583 |
} else { |
|
2584 |
// Skip unknown attributes |
|
34666 | 2585 |
cfs->skip_u1(code_attribute_length, CHECK_NULL); |
1 | 2586 |
} |
2587 |
} |
|
2588 |
// check method attribute length |
|
2589 |
if (_need_verify) { |
|
2590 |
guarantee_property(method_attribute_length == calculated_attribute_length, |
|
34666 | 2591 |
"Code segment has wrong length in class file %s", |
2592 |
CHECK_NULL); |
|
1 | 2593 |
} |
2594 |
} else if (method_attribute_name == vmSymbols::tag_exceptions()) { |
|
2595 |
// Parse Exceptions attribute |
|
2596 |
if (parsed_checked_exceptions_attribute) { |
|
34666 | 2597 |
classfile_parse_error("Multiple Exceptions attributes in class file %s", |
2598 |
CHECK_NULL); |
|
1 | 2599 |
} |
2600 |
parsed_checked_exceptions_attribute = true; |
|
2601 |
checked_exceptions_start = |
|
34666 | 2602 |
parse_checked_exceptions(cfs, |
2603 |
&checked_exceptions_length, |
|
1 | 2604 |
method_attribute_length, |
34666 | 2605 |
CHECK_NULL); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2606 |
} else if (method_attribute_name == vmSymbols::tag_method_parameters()) { |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2607 |
// reject multiple method parameters |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2608 |
if (method_parameters_seen) { |
34666 | 2609 |
classfile_parse_error("Multiple MethodParameters attributes in class file %s", |
2610 |
CHECK_NULL); |
|
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2611 |
} |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2612 |
method_parameters_seen = true; |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2613 |
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
|
2614 |
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
|
2615 |
if (method_attribute_length != real_length) { |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2616 |
classfile_parse_error( |
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2617 |
"Invalid MethodParameters method attribute length %u in class file", |
34666 | 2618 |
method_attribute_length, CHECK_NULL); |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2619 |
} |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2620 |
method_parameters_data = cfs->current(); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2621 |
cfs->skip_u2_fast(method_parameters_length); |
17080
9151a26f5888
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
17024
diff
changeset
|
2622 |
cfs->skip_u2_fast(method_parameters_length); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2623 |
// ignore this attribute if it cannot be reflected |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2624 |
if (!SystemDictionary::Parameter_klass_loaded()) |
27612
7201412afbd0
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
emc
parents:
27402
diff
changeset
|
2625 |
method_parameters_length = -1; |
1 | 2626 |
} else if (method_attribute_name == vmSymbols::tag_synthetic()) { |
2627 |
if (method_attribute_length != 0) { |
|
2628 |
classfile_parse_error( |
|
2629 |
"Invalid Synthetic method attribute length %u in class file %s", |
|
34666 | 2630 |
method_attribute_length, CHECK_NULL); |
1 | 2631 |
} |
2632 |
// Should we check that there hasn't already been a synthetic attribute? |
|
2633 |
access_flags.set_is_synthetic(); |
|
2634 |
} else if (method_attribute_name == vmSymbols::tag_deprecated()) { // 4276120 |
|
2635 |
if (method_attribute_length != 0) { |
|
2636 |
classfile_parse_error( |
|
2637 |
"Invalid Deprecated method attribute length %u in class file %s", |
|
34666 | 2638 |
method_attribute_length, CHECK_NULL); |
1 | 2639 |
} |
2640 |
} else if (_major_version >= JAVA_1_5_VERSION) { |
|
2641 |
if (method_attribute_name == vmSymbols::tag_signature()) { |
|
44243
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
2642 |
if (generic_signature_index != 0) { |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
2643 |
classfile_parse_error( |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
2644 |
"Multiple Signature attributes for method in class file %s", |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
2645 |
CHECK_NULL); |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
2646 |
} |
1 | 2647 |
if (method_attribute_length != 2) { |
2648 |
classfile_parse_error( |
|
2649 |
"Invalid Signature attribute length %u in class file %s", |
|
34666 | 2650 |
method_attribute_length, CHECK_NULL); |
1 | 2651 |
} |
34666 | 2652 |
generic_signature_index = parse_generic_signature_attribute(cfs, CHECK_NULL); |
1 | 2653 |
} 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
|
2654 |
if (runtime_visible_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2655 |
classfile_parse_error( |
34666 | 2656 |
"Multiple RuntimeVisibleAnnotations attributes for method in class file %s", |
2657 |
CHECK_NULL); |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2658 |
} |
1 | 2659 |
runtime_visible_annotations_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2660 |
runtime_visible_annotations = cfs->current(); |
1 | 2661 |
assert(runtime_visible_annotations != NULL, "null visible annotations"); |
43177 | 2662 |
cfs->guarantee_more(runtime_visible_annotations_length, CHECK_NULL); |
34666 | 2663 |
parse_annotations(cp, |
2664 |
runtime_visible_annotations, |
|
2665 |
runtime_visible_annotations_length, |
|
2666 |
&parsed_annotations, |
|
2667 |
_loader_data, |
|
2668 |
CHECK_NULL); |
|
43177 | 2669 |
cfs->skip_u1_fast(runtime_visible_annotations_length); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2670 |
} 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
|
2671 |
if (runtime_invisible_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2672 |
classfile_parse_error( |
34666 | 2673 |
"Multiple RuntimeInvisibleAnnotations attributes for method in class file %s", |
2674 |
CHECK_NULL); |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2675 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2676 |
runtime_invisible_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2677 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2678 |
runtime_invisible_annotations_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2679 |
runtime_invisible_annotations = cfs->current(); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2680 |
assert(runtime_invisible_annotations != NULL, "null invisible annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2681 |
} |
34666 | 2682 |
cfs->skip_u1(method_attribute_length, CHECK_NULL); |
1 | 2683 |
} 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
|
2684 |
if (runtime_visible_parameter_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2685 |
classfile_parse_error( |
34666 | 2686 |
"Multiple RuntimeVisibleParameterAnnotations attributes for method in class file %s", |
2687 |
CHECK_NULL); |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2688 |
} |
1 | 2689 |
runtime_visible_parameter_annotations_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2690 |
runtime_visible_parameter_annotations = cfs->current(); |
1 | 2691 |
assert(runtime_visible_parameter_annotations != NULL, "null visible parameter annotations"); |
34666 | 2692 |
cfs->skip_u1(runtime_visible_parameter_annotations_length, CHECK_NULL); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2693 |
} 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
|
2694 |
if (runtime_invisible_parameter_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2695 |
classfile_parse_error( |
34666 | 2696 |
"Multiple RuntimeInvisibleParameterAnnotations attributes for method in class file %s", |
2697 |
CHECK_NULL); |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2698 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2699 |
runtime_invisible_parameter_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2700 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2701 |
runtime_invisible_parameter_annotations_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2702 |
runtime_invisible_parameter_annotations = cfs->current(); |
34666 | 2703 |
assert(runtime_invisible_parameter_annotations != NULL, |
2704 |
"null invisible parameter annotations"); |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2705 |
} |
34666 | 2706 |
cfs->skip_u1(method_attribute_length, CHECK_NULL); |
1 | 2707 |
} 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
|
2708 |
if (annotation_default != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2709 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2710 |
"Multiple AnnotationDefault attributes for method in class file %s", |
34666 | 2711 |
CHECK_NULL); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
2712 |
} |
1 | 2713 |
annotation_default_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2714 |
annotation_default = cfs->current(); |
1 | 2715 |
assert(annotation_default != NULL, "null annotation default"); |
34666 | 2716 |
cfs->skip_u1(annotation_default_length, CHECK_NULL); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2717 |
} 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
|
2718 |
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
|
2719 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2720 |
"Multiple RuntimeVisibleTypeAnnotations attributes for method in class file %s", |
34666 | 2721 |
CHECK_NULL); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2722 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2723 |
runtime_visible_type_annotations_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2724 |
runtime_visible_type_annotations = cfs->current(); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2725 |
assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2726 |
// No need for the VM to parse Type annotations |
34666 | 2727 |
cfs->skip_u1(runtime_visible_type_annotations_length, CHECK_NULL); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2728 |
} 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
|
2729 |
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
|
2730 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2731 |
"Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s", |
34666 | 2732 |
CHECK_NULL); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2733 |
} else { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2734 |
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
|
2735 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2736 |
if (PreserveAllAnnotations) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2737 |
runtime_invisible_type_annotations_length = method_attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2738 |
runtime_invisible_type_annotations = cfs->current(); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
2739 |
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
|
2740 |
} |
34666 | 2741 |
cfs->skip_u1(method_attribute_length, CHECK_NULL); |
1 | 2742 |
} else { |
2743 |
// Skip unknown attributes |
|
34666 | 2744 |
cfs->skip_u1(method_attribute_length, CHECK_NULL); |
1 | 2745 |
} |
2746 |
} else { |
|
2747 |
// Skip unknown attributes |
|
34666 | 2748 |
cfs->skip_u1(method_attribute_length, CHECK_NULL); |
1 | 2749 |
} |
2750 |
} |
|
2751 |
||
2752 |
if (linenumber_table != NULL) { |
|
2753 |
linenumber_table->write_terminator(); |
|
2754 |
linenumber_table_length = linenumber_table->position(); |
|
2755 |
} |
|
2756 |
||
2757 |
// Make sure there's at least one Code attribute in non-native/non-abstract method |
|
2758 |
if (_need_verify) { |
|
34666 | 2759 |
guarantee_property(access_flags.is_native() || |
2760 |
access_flags.is_abstract() || |
|
2761 |
parsed_code_attribute, |
|
2762 |
"Absent Code attribute in method that is not native or abstract in class file %s", |
|
2763 |
CHECK_NULL); |
|
1 | 2764 |
} |
2765 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2766 |
// All sizing information for a Method* is finally available, now create it |
15601 | 2767 |
InlineTableSizes sizes( |
2768 |
total_lvt_length, |
|
2769 |
linenumber_table_length, |
|
2770 |
exception_table_length, |
|
2771 |
checked_exceptions_length, |
|
2772 |
method_parameters_length, |
|
2773 |
generic_signature_index, |
|
2774 |
runtime_visible_annotations_length + |
|
2775 |
runtime_invisible_annotations_length, |
|
2776 |
runtime_visible_parameter_annotations_length + |
|
2777 |
runtime_invisible_parameter_annotations_length, |
|
2778 |
runtime_visible_type_annotations_length + |
|
2779 |
runtime_invisible_type_annotations_length, |
|
2780 |
annotation_default_length, |
|
2781 |
0); |
|
2782 |
||
34666 | 2783 |
Method* const m = Method::allocate(_loader_data, |
2784 |
code_length, |
|
2785 |
access_flags, |
|
2786 |
&sizes, |
|
2787 |
ConstMethod::NORMAL, |
|
2788 |
CHECK_NULL); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2789 |
|
35898
ddc274f0052f
8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents:
35495
diff
changeset
|
2790 |
ClassLoadingService::add_class_method_size(m->size()*wordSize); |
1 | 2791 |
|
2792 |
// 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
|
2793 |
m->set_constants(_cp); |
1 | 2794 |
m->set_name_index(name_index); |
2795 |
m->set_signature_index(signature_index); |
|
37480 | 2796 |
|
34666 | 2797 |
ResultTypeFinder rtf(cp->symbol_at(signature_index)); |
37480 | 2798 |
m->constMethod()->set_result_type(rtf.type()); |
1 | 2799 |
|
2800 |
if (args_size >= 0) { |
|
2801 |
m->set_size_of_parameters(args_size); |
|
2802 |
} else { |
|
2803 |
m->compute_size_of_parameters(THREAD); |
|
2804 |
} |
|
2805 |
#ifdef ASSERT |
|
2806 |
if (args_size >= 0) { |
|
2807 |
m->compute_size_of_parameters(THREAD); |
|
2808 |
assert(args_size == m->size_of_parameters(), ""); |
|
2809 |
} |
|
2810 |
#endif |
|
2811 |
||
2812 |
// Fill in code attribute information |
|
2813 |
m->set_max_stack(max_stack); |
|
2814 |
m->set_max_locals(max_locals); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2815 |
if (stackmap_data != NULL) { |
34666 | 2816 |
m->constMethod()->copy_stackmap_data(_loader_data, |
2817 |
(u1*)stackmap_data, |
|
2818 |
stackmap_data_length, |
|
2819 |
CHECK_NULL); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2820 |
} |
1 | 2821 |
|
2822 |
// Copy byte codes |
|
34666 | 2823 |
m->set_code((u1*)code_start); |
1 | 2824 |
|
2825 |
// Copy line number table |
|
2826 |
if (linenumber_table != NULL) { |
|
2827 |
memcpy(m->compressed_linenumber_table(), |
|
34666 | 2828 |
linenumber_table->buffer(), |
2829 |
linenumber_table_length); |
|
1 | 2830 |
} |
2831 |
||
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2832 |
// Copy exception table |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2833 |
if (exception_table_length > 0) { |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2834 |
Copy::conjoint_swap_if_needed<Endian::JAVA>(exception_table_start, |
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2835 |
m->exception_table_start(), |
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2836 |
exception_table_length * sizeof(ExceptionTableElement), |
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2837 |
sizeof(u2)); |
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2838 |
} |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12772
diff
changeset
|
2839 |
|
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2840 |
// Copy method parameters |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2841 |
if (method_parameters_length > 0) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2842 |
MethodParametersElement* elem = m->constMethod()->method_parameters_start(); |
15464
1f2cca0aa501
8006949: Update hotspot for MethodParameters format change
emc
parents:
15244
diff
changeset
|
2843 |
for (int i = 0; i < method_parameters_length; i++) { |
34666 | 2844 |
elem[i].name_cp_index = Bytes::get_Java_u2((address)method_parameters_data); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2845 |
method_parameters_data += 2; |
34666 | 2846 |
elem[i].flags = Bytes::get_Java_u2((address)method_parameters_data); |
17080
9151a26f5888
8007154: Remove support for u4 MethodParameter flags fields
emc
parents:
17024
diff
changeset
|
2847 |
method_parameters_data += 2; |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2848 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2849 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
2850 |
|
1 | 2851 |
// Copy checked exceptions |
2852 |
if (checked_exceptions_length > 0) { |
|
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2853 |
Copy::conjoint_swap_if_needed<Endian::JAVA>(checked_exceptions_start, |
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2854 |
m->checked_exceptions_start(), |
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2855 |
checked_exceptions_length * sizeof(CheckedExceptionElement), |
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
2856 |
sizeof(u2)); |
1 | 2857 |
} |
2858 |
||
15601 | 2859 |
// Copy class file LVT's/LVTT's into the HotSpot internal LVT. |
1 | 2860 |
if (total_lvt_length > 0) { |
2861 |
promoted_flags->set_has_localvariable_table(); |
|
34666 | 2862 |
copy_localvariable_table(m->constMethod(), |
2863 |
lvt_cnt, |
|
15601 | 2864 |
localvariable_table_length, |
2865 |
localvariable_table_start, |
|
2866 |
lvtt_cnt, |
|
2867 |
localvariable_type_table_length, |
|
34666 | 2868 |
localvariable_type_table_start, |
2869 |
CHECK_NULL); |
|
1 | 2870 |
} |
2871 |
||
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
2872 |
if (parsed_annotations.has_any_annotations()) |
59056
15936b142f86
8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents:
58817
diff
changeset
|
2873 |
parsed_annotations.apply_to(methodHandle(THREAD, m)); |
15601 | 2874 |
|
2875 |
// Copy annotations |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2876 |
copy_method_annotations(m->constMethod(), |
15601 | 2877 |
runtime_visible_annotations, |
2878 |
runtime_visible_annotations_length, |
|
2879 |
runtime_invisible_annotations, |
|
2880 |
runtime_invisible_annotations_length, |
|
2881 |
runtime_visible_parameter_annotations, |
|
2882 |
runtime_visible_parameter_annotations_length, |
|
2883 |
runtime_invisible_parameter_annotations, |
|
2884 |
runtime_invisible_parameter_annotations_length, |
|
2885 |
runtime_visible_type_annotations, |
|
2886 |
runtime_visible_type_annotations_length, |
|
2887 |
runtime_invisible_type_annotations, |
|
2888 |
runtime_invisible_type_annotations_length, |
|
2889 |
annotation_default, |
|
2890 |
annotation_default_length, |
|
2891 |
CHECK_NULL); |
|
1 | 2892 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2893 |
if (name == vmSymbols::finalize_method_name() && |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2894 |
signature == vmSymbols::void_method_signature()) { |
1 | 2895 |
if (m->is_empty_method()) { |
2896 |
_has_empty_finalizer = true; |
|
2897 |
} else { |
|
2898 |
_has_finalizer = true; |
|
2899 |
} |
|
2900 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2901 |
if (name == vmSymbols::object_initializer_name() && |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
2902 |
signature == vmSymbols::void_method_signature() && |
1 | 2903 |
m->is_vanilla_constructor()) { |
2904 |
_has_vanilla_constructor = true; |
|
2905 |
} |
|
2906 |
||
15601 | 2907 |
NOT_PRODUCT(m->verify()); |
1 | 2908 |
return m; |
2909 |
} |
|
2910 |
||
2911 |
||
2912 |
// The promoted_flags parameter is used to pass relevant access_flags |
|
2913 |
// from the methods back up to the containing klass. These flag values |
|
2914 |
// are added to klass's access_flags. |
|
34666 | 2915 |
// Side-effects: populates the _methods field in the parser |
2916 |
void ClassFileParser::parse_methods(const ClassFileStream* const cfs, |
|
2917 |
bool is_interface, |
|
2918 |
AccessFlags* promoted_flags, |
|
2919 |
bool* has_final_method, |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
2920 |
bool* declares_nonstatic_concrete_methods, |
34666 | 2921 |
TRAPS) { |
2922 |
assert(cfs != NULL, "invariant"); |
|
2923 |
assert(promoted_flags != NULL, "invariant"); |
|
2924 |
assert(has_final_method != NULL, "invariant"); |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
2925 |
assert(declares_nonstatic_concrete_methods != NULL, "invariant"); |
34666 | 2926 |
|
2927 |
assert(NULL == _methods, "invariant"); |
|
2928 |
||
2929 |
cfs->guarantee_more(2, CHECK); // length |
|
2930 |
const u2 length = cfs->get_u2_fast(); |
|
1 | 2931 |
if (length == 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
2932 |
_methods = Universe::the_empty_method_array(); |
1 | 2933 |
} else { |
34666 | 2934 |
_methods = MetadataFactory::new_array<Method*>(_loader_data, |
2935 |
length, |
|
2936 |
NULL, |
|
2937 |
CHECK); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2938 |
|
1 | 2939 |
for (int index = 0; index < length; index++) { |
34666 | 2940 |
Method* method = parse_method(cfs, |
2941 |
is_interface, |
|
2942 |
_cp, |
|
2943 |
promoted_flags, |
|
2944 |
CHECK); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2945 |
|
1 | 2946 |
if (method->is_final()) { |
2947 |
*has_final_method = true; |
|
2948 |
} |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
2949 |
// declares_nonstatic_concrete_methods: declares concrete instance methods, any access flags |
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2950 |
// used for interface initialization, and default method inheritance analysis |
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
2951 |
if (is_interface && !(*declares_nonstatic_concrete_methods) |
27402
5c4675ddc00c
8043275: Fix interface initialization for default methods.
acorn
parents:
27023
diff
changeset
|
2952 |
&& !method->is_abstract() && !method->is_static()) { |
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
2953 |
*declares_nonstatic_concrete_methods = true; |
14385 | 2954 |
} |
34666 | 2955 |
_methods->at_put(index, method); |
1 | 2956 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
2957 |
|
1 | 2958 |
if (_need_verify && length > 1) { |
2959 |
// Check duplicated methods |
|
2960 |
ResourceMark rm(THREAD); |
|
2961 |
NameSigHash** names_and_sigs = NEW_RESOURCE_ARRAY_IN_THREAD( |
|
2962 |
THREAD, NameSigHash*, HASH_ROW_SIZE); |
|
2963 |
initialize_hashtable(names_and_sigs); |
|
2964 |
bool dup = false; |
|
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2965 |
const Symbol* name = NULL; |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2966 |
const Symbol* sig = NULL; |
1 | 2967 |
{ |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
35220
diff
changeset
|
2968 |
debug_only(NoSafepointVerifier nsv;) |
1 | 2969 |
for (int i = 0; i < length; i++) { |
34666 | 2970 |
const Method* const m = _methods->at(i); |
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2971 |
name = m->name(); |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2972 |
sig = m->signature(); |
1 | 2973 |
// If no duplicates, add name/signature in hashtable names_and_sigs. |
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2974 |
if (!put_after_lookup(name, sig, names_and_sigs)) { |
1 | 2975 |
dup = true; |
2976 |
break; |
|
2977 |
} |
|
2978 |
} |
|
2979 |
} |
|
2980 |
if (dup) { |
|
46301
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2981 |
classfile_parse_error("Duplicate method name \"%s\" with signature \"%s\" in class file %s", |
57f01b1bd33c
8171194: Exception "Duplicate field name&signature in class file" should report the name and signature of the field
shshahma
parents:
46289
diff
changeset
|
2982 |
name->as_C_string(), sig->as_klass_external_name(), CHECK); |
1 | 2983 |
} |
2984 |
} |
|
2985 |
} |
|
2986 |
} |
|
2987 |
||
34666 | 2988 |
static const intArray* sort_methods(Array<Method*>* methods) { |
2989 |
const int length = methods->length(); |
|
9172
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
2990 |
// If JVMTI original method ordering or sharing is enabled we have to |
1 | 2991 |
// remember the original class file ordering. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2992 |
// We temporarily use the vtable_index field in the Method* to store the |
1 | 2993 |
// 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
|
2994 |
// Put the method ordering in the shared archive. |
58447
319173c62caa
8231606: _method_ordering is not set during CDS dynamic dump time
ccheung
parents:
58221
diff
changeset
|
2995 |
if (JvmtiExport::can_maintain_original_method_order() || Arguments::is_dumping_archive()) { |
1 | 2996 |
for (int index = 0; index < length; index++) { |
34666 | 2997 |
Method* const m = methods->at(index); |
1 | 2998 |
assert(!m->valid_vtable_index(), "vtable index should not be set"); |
2999 |
m->set_vtable_index(index); |
|
3000 |
} |
|
3001 |
} |
|
3002 |
// 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
|
3003 |
// Note that the ordering is not alphabetical, see Symbol::fast_compare |
15601 | 3004 |
Method::sort_methods(methods); |
1 | 3005 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3006 |
intArray* method_ordering = NULL; |
9172
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
9117
diff
changeset
|
3007 |
// 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
|
3008 |
// array remembering the original ordering |
58447
319173c62caa
8231606: _method_ordering is not set during CDS dynamic dump time
ccheung
parents:
58221
diff
changeset
|
3009 |
if (JvmtiExport::can_maintain_original_method_order() || Arguments::is_dumping_archive()) { |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36508
diff
changeset
|
3010 |
method_ordering = new intArray(length, length, -1); |
1 | 3011 |
for (int index = 0; index < length; index++) { |
34666 | 3012 |
Method* const m = methods->at(index); |
3013 |
const int old_index = m->vtable_index(); |
|
1 | 3014 |
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
|
3015 |
method_ordering->at_put(index, old_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3016 |
m->set_vtable_index(Method::invalid_vtable_index); |
1 | 3017 |
} |
3018 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3019 |
return method_ordering; |
1 | 3020 |
} |
3021 |
||
25507 | 3022 |
// Parse generic_signature attribute for methods and fields |
34666 | 3023 |
u2 ClassFileParser::parse_generic_signature_attribute(const ClassFileStream* const cfs, |
3024 |
TRAPS) { |
|
3025 |
assert(cfs != NULL, "invariant"); |
|
3026 |
||
25507 | 3027 |
cfs->guarantee_more(2, CHECK_0); // generic_signature_index |
34666 | 3028 |
const u2 generic_signature_index = cfs->get_u2_fast(); |
25507 | 3029 |
check_property( |
3030 |
valid_symbol_at(generic_signature_index), |
|
3031 |
"Invalid Signature attribute at constant pool index %u in class file %s", |
|
3032 |
generic_signature_index, CHECK_0); |
|
3033 |
return generic_signature_index; |
|
3034 |
} |
|
1 | 3035 |
|
34666 | 3036 |
void ClassFileParser::parse_classfile_sourcefile_attribute(const ClassFileStream* const cfs, |
3037 |
TRAPS) { |
|
3038 |
||
3039 |
assert(cfs != NULL, "invariant"); |
|
3040 |
||
1 | 3041 |
cfs->guarantee_more(2, CHECK); // sourcefile_index |
34666 | 3042 |
const u2 sourcefile_index = cfs->get_u2_fast(); |
1 | 3043 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3044 |
valid_symbol_at(sourcefile_index), |
1 | 3045 |
"Invalid SourceFile attribute at constant pool index %u in class file %s", |
3046 |
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
|
3047 |
set_class_sourcefile_index(sourcefile_index); |
1 | 3048 |
} |
3049 |
||
34666 | 3050 |
void ClassFileParser::parse_classfile_source_debug_extension_attribute(const ClassFileStream* const cfs, |
3051 |
int length, |
|
3052 |
TRAPS) { |
|
3053 |
assert(cfs != NULL, "invariant"); |
|
3054 |
||
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
3055 |
const u1* const sde_buffer = cfs->current(); |
1 | 3056 |
assert(sde_buffer != NULL, "null sde buffer"); |
3057 |
||
3058 |
// Don't bother storing it if there is no way to retrieve it |
|
3059 |
if (JvmtiExport::can_get_source_debug_extension()) { |
|
13295 | 3060 |
assert((length+1) > length, "Overflow checking"); |
34666 | 3061 |
u1* const sde = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, u1, length+1); |
13295 | 3062 |
for (int i = 0; i < length; i++) { |
3063 |
sde[i] = sde_buffer[i]; |
|
3064 |
} |
|
3065 |
sde[length] = '\0'; |
|
34666 | 3066 |
set_class_sde_buffer((const char*)sde, length); |
1 | 3067 |
} |
3068 |
// Got utf8 string, set stream position forward |
|
3069 |
cfs->skip_u1(length, CHECK); |
|
3070 |
} |
|
3071 |
||
3072 |
||
3073 |
// Inner classes can be static, private or protected (classic VM does this) |
|
34666 | 3074 |
#define RECOGNIZED_INNER_CLASS_MODIFIERS ( JVM_RECOGNIZED_CLASS_MODIFIERS | \ |
3075 |
JVM_ACC_PRIVATE | \ |
|
3076 |
JVM_ACC_PROTECTED | \ |
|
3077 |
JVM_ACC_STATIC \ |
|
3078 |
) |
|
1 | 3079 |
|
3080 |
// Return number of classes in the inner classes attribute table |
|
34666 | 3081 |
u2 ClassFileParser::parse_classfile_inner_classes_attribute(const ClassFileStream* const cfs, |
3082 |
const u1* const 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
|
3083 |
bool parsed_enclosingmethod_attribute, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3084 |
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
|
3085 |
u2 enclosing_method_method_index, |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3086 |
TRAPS) { |
34666 | 3087 |
const u1* const current_mark = cfs->current(); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3088 |
u2 length = 0; |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3089 |
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
|
3090 |
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
|
3091 |
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
|
3092 |
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
|
3093 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3094 |
|
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3095 |
// 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
|
3096 |
// method data: |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3097 |
// [inner_class_info_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3098 |
// outer_class_info_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3099 |
// inner_name_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3100 |
// inner_class_access_flags, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3101 |
// ... |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3102 |
// enclosing_method_class_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3103 |
// enclosing_method_method_index] |
34666 | 3104 |
const int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0); |
3105 |
Array<u2>* const inner_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3106 |
_inner_classes = inner_classes; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3107 |
|
1 | 3108 |
int index = 0; |
3109 |
cfs->guarantee_more(8 * length, CHECK_0); // 4-tuples of u2 |
|
3110 |
for (int n = 0; n < length; n++) { |
|
3111 |
// Inner class index |
|
34666 | 3112 |
const u2 inner_class_info_index = cfs->get_u2_fast(); |
1 | 3113 |
check_property( |
31776
70dd826a47b5
8130183: InnerClasses: VM permits wrong inner_class_info_index value of zero
hseigel
parents:
31402
diff
changeset
|
3114 |
valid_klass_reference_at(inner_class_info_index), |
1 | 3115 |
"inner_class_info_index %u has bad constant type in class file %s", |
3116 |
inner_class_info_index, CHECK_0); |
|
3117 |
// Outer class index |
|
34666 | 3118 |
const u2 outer_class_info_index = cfs->get_u2_fast(); |
1 | 3119 |
check_property( |
3120 |
outer_class_info_index == 0 || |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3121 |
valid_klass_reference_at(outer_class_info_index), |
1 | 3122 |
"outer_class_info_index %u has bad constant type in class file %s", |
3123 |
outer_class_info_index, CHECK_0); |
|
3124 |
// Inner class name |
|
34666 | 3125 |
const u2 inner_name_index = cfs->get_u2_fast(); |
1 | 3126 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3127 |
inner_name_index == 0 || valid_symbol_at(inner_name_index), |
1 | 3128 |
"inner_name_index %u has bad constant type in class file %s", |
3129 |
inner_name_index, CHECK_0); |
|
3130 |
if (_need_verify) { |
|
3131 |
guarantee_property(inner_class_info_index != outer_class_info_index, |
|
3132 |
"Class is both outer and inner class in class file %s", CHECK_0); |
|
3133 |
} |
|
3134 |
// Access flags |
|
43977
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3135 |
jint flags; |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3136 |
// JVM_ACC_MODULE is defined in JDK-9 and later. |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3137 |
if (_major_version >= JAVA_9_VERSION) { |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3138 |
flags = cfs->get_u2_fast() & (RECOGNIZED_INNER_CLASS_MODIFIERS | JVM_ACC_MODULE); |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3139 |
} else { |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3140 |
flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS; |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
3141 |
} |
1 | 3142 |
if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { |
3143 |
// Set abstract bit for old class files for backward compatibility |
|
3144 |
flags |= JVM_ACC_ABSTRACT; |
|
3145 |
} |
|
3146 |
verify_legal_class_modifiers(flags, CHECK_0); |
|
34666 | 3147 |
AccessFlags inner_access_flags(flags); |
1 | 3148 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3149 |
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
|
3150 |
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
|
3151 |
inner_classes->at_put(index++, inner_name_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3152 |
inner_classes->at_put(index++, inner_access_flags.as_short()); |
1 | 3153 |
} |
3154 |
||
3155 |
// 4347400: make sure there's no duplicate entry in the classes array |
|
3156 |
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
|
3157 |
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
|
3158 |
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
|
3159 |
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
|
3160 |
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
|
3161 |
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
|
3162 |
inner_classes->at(i+3) != inner_classes->at(j+3)), |
1 | 3163 |
"Duplicate entry in InnerClasses in class file %s", |
3164 |
CHECK_0); |
|
3165 |
} |
|
3166 |
} |
|
3167 |
} |
|
3168 |
||
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3169 |
// 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
|
3170 |
if (parsed_enclosingmethod_attribute) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3171 |
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
|
3172 |
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
|
3173 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3174 |
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
|
3175 |
|
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3176 |
// 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
|
3177 |
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
|
3178 |
|
1 | 3179 |
return length; |
3180 |
} |
|
3181 |
||
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3182 |
u2 ClassFileParser::parse_classfile_nest_members_attribute(const ClassFileStream* const cfs, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3183 |
const u1* const nest_members_attribute_start, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3184 |
TRAPS) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3185 |
const u1* const current_mark = cfs->current(); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3186 |
u2 length = 0; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3187 |
if (nest_members_attribute_start != NULL) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3188 |
cfs->set_current(nest_members_attribute_start); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3189 |
cfs->guarantee_more(2, CHECK_0); // length |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3190 |
length = cfs->get_u2_fast(); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3191 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3192 |
const int size = length; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3193 |
Array<u2>* const nest_members = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3194 |
_nest_members = nest_members; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3195 |
|
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3196 |
int index = 0; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3197 |
cfs->guarantee_more(2 * length, CHECK_0); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3198 |
for (int n = 0; n < length; n++) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3199 |
const u2 class_info_index = cfs->get_u2_fast(); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3200 |
check_property( |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3201 |
valid_klass_reference_at(class_info_index), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3202 |
"Nest member class_info_index %u has bad constant type in class file %s", |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3203 |
class_info_index, CHECK_0); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3204 |
nest_members->at_put(index++, class_info_index); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3205 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3206 |
assert(index == size, "wrong size"); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3207 |
|
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3208 |
// Restore buffer's current position. |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3209 |
cfs->set_current(current_mark); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3210 |
|
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3211 |
return length; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3212 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3213 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3214 |
void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) { |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3215 |
set_class_synthetic_flag(true); |
1 | 3216 |
} |
3217 |
||
34666 | 3218 |
void ClassFileParser::parse_classfile_signature_attribute(const ClassFileStream* const cfs, TRAPS) { |
3219 |
assert(cfs != NULL, "invariant"); |
|
3220 |
||
3221 |
const u2 signature_index = cfs->get_u2(CHECK); |
|
1 | 3222 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3223 |
valid_symbol_at(signature_index), |
1 | 3224 |
"Invalid constant pool index %u in Signature attribute in class file %s", |
3225 |
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
|
3226 |
set_class_generic_signature_index(signature_index); |
1 | 3227 |
} |
3228 |
||
34666 | 3229 |
void ClassFileParser::parse_classfile_bootstrap_methods_attribute(const ClassFileStream* const cfs, |
3230 |
ConstantPool* cp, |
|
3231 |
u4 attribute_byte_length, |
|
3232 |
TRAPS) { |
|
3233 |
assert(cfs != NULL, "invariant"); |
|
3234 |
assert(cp != NULL, "invariant"); |
|
3235 |
||
3236 |
const u1* const current_start = cfs->current(); |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3237 |
|
25506 | 3238 |
guarantee_property(attribute_byte_length >= sizeof(u2), |
3239 |
"Invalid BootstrapMethods attribute length %u in class file %s", |
|
3240 |
attribute_byte_length, |
|
3241 |
CHECK); |
|
3242 |
||
3243 |
cfs->guarantee_more(attribute_byte_length, CHECK); |
|
3244 |
||
34666 | 3245 |
const int attribute_array_length = 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
|
3246 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3247 |
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
|
3248 |
"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
|
3249 |
CHECK); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3250 |
|
23840 | 3251 |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3252 |
// 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
|
3253 |
// represending bootstrap specifiers: |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3254 |
// length*{bootstrap_method_index, argument_count*{argument_index}} |
34666 | 3255 |
const int operand_count = (attribute_byte_length - sizeof(u2)) / sizeof(u2); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3256 |
// 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
|
3257 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3258 |
// 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
|
3259 |
// The array begins with a series of short[2] pairs, one for each tuple. |
34666 | 3260 |
const int index_size = (attribute_array_length * 2); |
3261 |
||
3262 |
Array<u2>* const operands = |
|
3263 |
MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3264 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3265 |
// 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
|
3266 |
// pool if there is an error. |
34666 | 3267 |
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
|
3268 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3269 |
int operand_fill_index = index_size; |
34666 | 3270 |
const 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
|
3271 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3272 |
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
|
3273 |
// 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
|
3274 |
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
|
3275 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3276 |
// 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
|
3277 |
cfs->guarantee_more(sizeof(u2) * 2, CHECK); // bsm, argc |
34666 | 3278 |
const u2 bootstrap_method_index = cfs->get_u2_fast(); |
3279 |
const u2 argument_count = 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
|
3280 |
check_property( |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3281 |
valid_cp_range(bootstrap_method_index, cp_size) && |
34666 | 3282 |
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
|
3283 |
"bootstrap_method_index %u has bad constant type in class file %s", |
7709 | 3284 |
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
|
3285 |
CHECK); |
27023 | 3286 |
|
3287 |
guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(), |
|
3288 |
"Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s", |
|
3289 |
CHECK); |
|
3290 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3291 |
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
|
3292 |
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
|
3293 |
|
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3294 |
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
|
3295 |
for (int j = 0; j < argument_count; j++) { |
34666 | 3296 |
const 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
|
3297 |
check_property( |
7709 | 3298 |
valid_cp_range(argument_index, cp_size) && |
34666 | 3299 |
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
|
3300 |
"argument_index %u has bad constant type in class file %s", |
7709 | 3301 |
argument_index, |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3302 |
CHECK); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3303 |
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
|
3304 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3305 |
} |
34666 | 3306 |
guarantee_property(current_start + attribute_byte_length == cfs->current(), |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3307 |
"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
|
3308 |
CHECK); |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3309 |
} |
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3310 |
|
34666 | 3311 |
void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cfs, |
3312 |
ConstantPool* cp, |
|
3313 |
ClassFileParser::ClassAnnotationCollector* parsed_annotations, |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3314 |
TRAPS) { |
34666 | 3315 |
assert(cfs != NULL, "invariant"); |
3316 |
assert(cp != NULL, "invariant"); |
|
3317 |
assert(parsed_annotations != NULL, "invariant"); |
|
3318 |
||
1 | 3319 |
// 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
|
3320 |
_inner_classes = Universe::the_empty_short_array(); |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3321 |
// Set nest members attribute to default sentinel |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3322 |
_nest_members = Universe::the_empty_short_array(); |
1 | 3323 |
cfs->guarantee_more(2, CHECK); // attributes_count |
3324 |
u2 attributes_count = cfs->get_u2_fast(); |
|
3325 |
bool parsed_sourcefile_attribute = false; |
|
3326 |
bool parsed_innerclasses_attribute = false; |
|
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3327 |
bool parsed_nest_members_attribute = false; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3328 |
bool parsed_nest_host_attribute = false; |
1 | 3329 |
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
|
3330 |
bool parsed_bootstrap_methods_attribute = false; |
34666 | 3331 |
const u1* runtime_visible_annotations = NULL; |
1 | 3332 |
int runtime_visible_annotations_length = 0; |
34666 | 3333 |
const u1* runtime_invisible_annotations = NULL; |
1 | 3334 |
int runtime_invisible_annotations_length = 0; |
34666 | 3335 |
const u1* runtime_visible_type_annotations = NULL; |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3336 |
int runtime_visible_type_annotations_length = 0; |
34666 | 3337 |
const u1* runtime_invisible_type_annotations = NULL; |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3338 |
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
|
3339 |
bool runtime_invisible_type_annotations_exists = false; |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3340 |
bool runtime_invisible_annotations_exists = false; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3341 |
bool parsed_source_debug_ext_annotations_exist = false; |
34666 | 3342 |
const u1* inner_classes_attribute_start = NULL; |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3343 |
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
|
3344 |
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
|
3345 |
u2 enclosing_method_method_index = 0; |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3346 |
const u1* nest_members_attribute_start = NULL; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3347 |
u4 nest_members_attribute_length = 0; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3348 |
|
1 | 3349 |
// Iterate over attributes |
3350 |
while (attributes_count--) { |
|
3351 |
cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length |
|
34666 | 3352 |
const u2 attribute_name_index = cfs->get_u2_fast(); |
3353 |
const u4 attribute_length = cfs->get_u4_fast(); |
|
1 | 3354 |
check_property( |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3355 |
valid_symbol_at(attribute_name_index), |
1 | 3356 |
"Attribute name has bad constant pool index %u in class file %s", |
3357 |
attribute_name_index, CHECK); |
|
34666 | 3358 |
const Symbol* const tag = cp->symbol_at(attribute_name_index); |
1 | 3359 |
if (tag == vmSymbols::tag_source_file()) { |
3360 |
// Check for SourceFile tag |
|
3361 |
if (_need_verify) { |
|
3362 |
guarantee_property(attribute_length == 2, "Wrong SourceFile attribute length in class file %s", CHECK); |
|
3363 |
} |
|
3364 |
if (parsed_sourcefile_attribute) { |
|
3365 |
classfile_parse_error("Multiple SourceFile attributes in class file %s", CHECK); |
|
3366 |
} else { |
|
3367 |
parsed_sourcefile_attribute = true; |
|
3368 |
} |
|
34666 | 3369 |
parse_classfile_sourcefile_attribute(cfs, CHECK); |
1 | 3370 |
} else if (tag == vmSymbols::tag_source_debug_extension()) { |
3371 |
// Check for SourceDebugExtension tag |
|
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3372 |
if (parsed_source_debug_ext_annotations_exist) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3373 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3374 |
"Multiple SourceDebugExtension attributes in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3375 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3376 |
parsed_source_debug_ext_annotations_exist = true; |
34666 | 3377 |
parse_classfile_source_debug_extension_attribute(cfs, (int)attribute_length, CHECK); |
1 | 3378 |
} else if (tag == vmSymbols::tag_inner_classes()) { |
3379 |
// Check for InnerClasses tag |
|
3380 |
if (parsed_innerclasses_attribute) { |
|
3381 |
classfile_parse_error("Multiple InnerClasses attributes in class file %s", CHECK); |
|
3382 |
} else { |
|
3383 |
parsed_innerclasses_attribute = true; |
|
3384 |
} |
|
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
3385 |
inner_classes_attribute_start = cfs->current(); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3386 |
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
|
3387 |
cfs->skip_u1(inner_classes_attribute_length, CHECK); |
1 | 3388 |
} else if (tag == vmSymbols::tag_synthetic()) { |
3389 |
// Check for Synthetic tag |
|
3390 |
// Shouldn't we check that the synthetic flags wasn't already set? - not required in spec |
|
3391 |
if (attribute_length != 0) { |
|
3392 |
classfile_parse_error( |
|
3393 |
"Invalid Synthetic classfile attribute length %u in class file %s", |
|
3394 |
attribute_length, CHECK); |
|
3395 |
} |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3396 |
parse_classfile_synthetic_attribute(CHECK); |
1 | 3397 |
} else if (tag == vmSymbols::tag_deprecated()) { |
3398 |
// Check for Deprecatd tag - 4276120 |
|
3399 |
if (attribute_length != 0) { |
|
3400 |
classfile_parse_error( |
|
3401 |
"Invalid Deprecated classfile attribute length %u in class file %s", |
|
3402 |
attribute_length, CHECK); |
|
3403 |
} |
|
3404 |
} else if (_major_version >= JAVA_1_5_VERSION) { |
|
3405 |
if (tag == vmSymbols::tag_signature()) { |
|
44243
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
3406 |
if (_generic_signature_index != 0) { |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
3407 |
classfile_parse_error( |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
3408 |
"Multiple Signature attributes in class file %s", CHECK); |
bd6ac32eb679
8176147: JVM should throw CFE for duplicate Signature attributes
hseigel
parents:
44239
diff
changeset
|
3409 |
} |
1 | 3410 |
if (attribute_length != 2) { |
3411 |
classfile_parse_error( |
|
3412 |
"Wrong Signature attribute length %u in class file %s", |
|
3413 |
attribute_length, CHECK); |
|
3414 |
} |
|
34666 | 3415 |
parse_classfile_signature_attribute(cfs, CHECK); |
1 | 3416 |
} else if (tag == vmSymbols::tag_runtime_visible_annotations()) { |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3417 |
if (runtime_visible_annotations != NULL) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3418 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3419 |
"Multiple RuntimeVisibleAnnotations attributes in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3420 |
} |
1 | 3421 |
runtime_visible_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
3422 |
runtime_visible_annotations = cfs->current(); |
1 | 3423 |
assert(runtime_visible_annotations != NULL, "null visible annotations"); |
43177 | 3424 |
cfs->guarantee_more(runtime_visible_annotations_length, CHECK); |
34666 | 3425 |
parse_annotations(cp, |
3426 |
runtime_visible_annotations, |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3427 |
runtime_visible_annotations_length, |
34666 | 3428 |
parsed_annotations, |
3429 |
_loader_data, |
|
3430 |
CHECK); |
|
43177 | 3431 |
cfs->skip_u1_fast(runtime_visible_annotations_length); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3432 |
} else if (tag == vmSymbols::tag_runtime_invisible_annotations()) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3433 |
if (runtime_invisible_annotations_exists) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3434 |
classfile_parse_error( |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3435 |
"Multiple RuntimeInvisibleAnnotations attributes in class file %s", CHECK); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3436 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3437 |
runtime_invisible_annotations_exists = true; |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3438 |
if (PreserveAllAnnotations) { |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3439 |
runtime_invisible_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
3440 |
runtime_invisible_annotations = cfs->current(); |
24432
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3441 |
assert(runtime_invisible_annotations != NULL, "null invisible annotations"); |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3442 |
} |
482afb00f089
8040292: Annotation attributes must not appear more than once
hseigel
parents:
24322
diff
changeset
|
3443 |
cfs->skip_u1(attribute_length, CHECK); |
1 | 3444 |
} else if (tag == vmSymbols::tag_enclosing_method()) { |
3445 |
if (parsed_enclosingmethod_attribute) { |
|
3446 |
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
|
3447 |
} else { |
1 | 3448 |
parsed_enclosingmethod_attribute = true; |
3449 |
} |
|
25054
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
3450 |
guarantee_property(attribute_length == 4, |
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
3451 |
"Wrong EnclosingMethod attribute length %u in class file %s", |
8a12137a8422
8044738: Check attribute_length of EnclosingMethod attribute
hseigel
parents:
24828
diff
changeset
|
3452 |
attribute_length, CHECK); |
1 | 3453 |
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
|
3454 |
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
|
3455 |
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
|
3456 |
if (enclosing_method_class_index == 0) { |
1 | 3457 |
classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK); |
3458 |
} |
|
3459 |
// 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
|
3460 |
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
|
3461 |
"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
|
3462 |
if (enclosing_method_method_index != 0 && |
34666 | 3463 |
(!cp->is_within_bounds(enclosing_method_method_index) || |
3464 |
!cp->tag_at(enclosing_method_method_index).is_name_and_type())) { |
|
1 | 3465 |
classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK); |
3466 |
} |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3467 |
} 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
|
3468 |
_major_version >= Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { |
38658
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
3469 |
if (parsed_bootstrap_methods_attribute) { |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3470 |
classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK); |
38658
34f9c45625d8
8140594: Various minor code improvements (compiler)
goetz
parents:
38177
diff
changeset
|
3471 |
} |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3472 |
parsed_bootstrap_methods_attribute = true; |
34666 | 3473 |
parse_classfile_bootstrap_methods_attribute(cfs, cp, attribute_length, CHECK); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3474 |
} 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
|
3475 |
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
|
3476 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3477 |
"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
|
3478 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3479 |
runtime_visible_type_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
3480 |
runtime_visible_type_annotations = cfs->current(); |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3481 |
assert(runtime_visible_type_annotations != NULL, "null visible type annotations"); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3482 |
// No need for the VM to parse Type annotations |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14590
diff
changeset
|
3483 |
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
|
3484 |
} 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
|
3485 |
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
|
3486 |
classfile_parse_error( |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3487 |
"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
|
3488 |
} else { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3489 |
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
|
3490 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3491 |
if (PreserveAllAnnotations) { |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3492 |
runtime_invisible_type_annotations_length = attribute_length; |
46504
38048d4d20e7
8180032: Unaligned pointer dereference in ClassFileParser
mikael
parents:
46502
diff
changeset
|
3493 |
runtime_invisible_type_annotations = cfs->current(); |
19954
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3494 |
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
|
3495 |
} |
1642109d1a2c
8023167: JVM allows duplicate Runtime[In]VisibleTypeAnnotations attributes in ClassFile/field_info/method_info structures
hseigel
parents:
19681
diff
changeset
|
3496 |
cfs->skip_u1(attribute_length, CHECK); |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3497 |
} else if (_major_version >= JAVA_11_VERSION) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3498 |
if (tag == vmSymbols::tag_nest_members()) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3499 |
// Check for NestMembers tag |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3500 |
if (parsed_nest_members_attribute) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3501 |
classfile_parse_error("Multiple NestMembers attributes in class file %s", CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3502 |
} else { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3503 |
parsed_nest_members_attribute = true; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3504 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3505 |
if (parsed_nest_host_attribute) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3506 |
classfile_parse_error("Conflicting NestHost and NestMembers attributes in class file %s", CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3507 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3508 |
nest_members_attribute_start = cfs->current(); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3509 |
nest_members_attribute_length = attribute_length; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3510 |
cfs->skip_u1(nest_members_attribute_length, CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3511 |
} else if (tag == vmSymbols::tag_nest_host()) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3512 |
if (parsed_nest_host_attribute) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3513 |
classfile_parse_error("Multiple NestHost attributes in class file %s", CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3514 |
} else { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3515 |
parsed_nest_host_attribute = true; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3516 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3517 |
if (parsed_nest_members_attribute) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3518 |
classfile_parse_error("Conflicting NestMembers and NestHost attributes in class file %s", CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3519 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3520 |
if (_need_verify) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3521 |
guarantee_property(attribute_length == 2, "Wrong NestHost attribute length in class file %s", CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3522 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3523 |
cfs->guarantee_more(2, CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3524 |
u2 class_info_index = cfs->get_u2_fast(); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3525 |
check_property( |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3526 |
valid_klass_reference_at(class_info_index), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3527 |
"Nest-host class_info_index %u has bad constant type in class file %s", |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3528 |
class_info_index, CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3529 |
_nest_host = class_info_index; |
51297
9d49099287b1
8207944: java.lang.ClassFormatError: Extra bytes at the end of class file test" possibly violation of JVMS 4.7.1
hseigel
parents:
50816
diff
changeset
|
3530 |
} else { |
9d49099287b1
8207944: java.lang.ClassFormatError: Extra bytes at the end of class file test" possibly violation of JVMS 4.7.1
hseigel
parents:
50816
diff
changeset
|
3531 |
// Unknown attribute |
9d49099287b1
8207944: java.lang.ClassFormatError: Extra bytes at the end of class file test" possibly violation of JVMS 4.7.1
hseigel
parents:
50816
diff
changeset
|
3532 |
cfs->skip_u1(attribute_length, CHECK); |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3533 |
} |
1 | 3534 |
} else { |
3535 |
// Unknown attribute |
|
3536 |
cfs->skip_u1(attribute_length, CHECK); |
|
3537 |
} |
|
3538 |
} else { |
|
3539 |
// Unknown attribute |
|
3540 |
cfs->skip_u1(attribute_length, CHECK); |
|
3541 |
} |
|
3542 |
} |
|
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3543 |
_class_annotations = assemble_annotations(runtime_visible_annotations, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3544 |
runtime_visible_annotations_length, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3545 |
runtime_invisible_annotations, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3546 |
runtime_invisible_annotations_length, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3547 |
CHECK); |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3548 |
_class_type_annotations = assemble_annotations(runtime_visible_type_annotations, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3549 |
runtime_visible_type_annotations_length, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3550 |
runtime_invisible_type_annotations, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3551 |
runtime_invisible_type_annotations_length, |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3552 |
CHECK); |
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3553 |
|
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3554 |
if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) { |
34666 | 3555 |
const u2 num_of_classes = parse_classfile_inner_classes_attribute( |
3556 |
cfs, |
|
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3557 |
inner_classes_attribute_start, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3558 |
parsed_innerclasses_attribute, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3559 |
enclosing_method_class_index, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3560 |
enclosing_method_method_index, |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3561 |
CHECK); |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3562 |
if (parsed_innerclasses_attribute && _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
|
3563 |
guarantee_property( |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3564 |
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
|
3565 |
"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
|
3566 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3567 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11423
diff
changeset
|
3568 |
|
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3569 |
if (parsed_nest_members_attribute) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3570 |
const u2 num_of_classes = parse_classfile_nest_members_attribute( |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3571 |
cfs, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3572 |
nest_members_attribute_start, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3573 |
CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3574 |
if (_need_verify) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3575 |
guarantee_property( |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3576 |
nest_members_attribute_length == sizeof(num_of_classes) + sizeof(u2) * num_of_classes, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3577 |
"Wrong NestMembers attribute length in class file %s", CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3578 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3579 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3580 |
|
7436
dbc43da3d512
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
7397
diff
changeset
|
3581 |
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
|
3582 |
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
|
3583 |
"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
|
3584 |
} |
1 | 3585 |
} |
3586 |
||
34666 | 3587 |
void ClassFileParser::apply_parsed_class_attributes(InstanceKlass* k) { |
3588 |
assert(k != NULL, "invariant"); |
|
3589 |
||
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3590 |
if (_synthetic_flag) |
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3591 |
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
|
3592 |
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
|
3593 |
k->set_source_file_name_index(_sourcefile_index); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3594 |
} |
19326
14cb6cf26a96
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
18940
diff
changeset
|
3595 |
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
|
3596 |
k->set_generic_signature_index(_generic_signature_index); |
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3597 |
} |
13295 | 3598 |
if (_sde_buffer != NULL) { |
3599 |
k->set_source_debug_extension(_sde_buffer, _sde_length); |
|
3600 |
} |
|
13291
9de3b1387cb8
6711908: JVM needs direct access to some annotations
jrose
parents:
12772
diff
changeset
|
3601 |
} |
1 | 3602 |
|
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3603 |
// Create the Annotations object that will |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3604 |
// hold the annotations array for the Klass. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3605 |
void ClassFileParser::create_combined_annotations(TRAPS) { |
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3606 |
if (_class_annotations == NULL && |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3607 |
_class_type_annotations == NULL && |
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3608 |
_fields_annotations == NULL && |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3609 |
_fields_type_annotations == NULL) { |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3610 |
// Don't create the Annotations object unnecessarily. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3611 |
return; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3612 |
} |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3613 |
|
34666 | 3614 |
Annotations* const annotations = Annotations::allocate(_loader_data, CHECK); |
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3615 |
annotations->set_class_annotations(_class_annotations); |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3616 |
annotations->set_class_type_annotations(_class_type_annotations); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3617 |
annotations->set_fields_annotations(_fields_annotations); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3618 |
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
|
3619 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3620 |
// 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
|
3621 |
// assigned to InstanceKlass being constructed. |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3622 |
_combined_annotations = annotations; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3623 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3624 |
// 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
|
3625 |
// _combined_annotations so these fields can now be cleared. |
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3626 |
_class_annotations = NULL; |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
3627 |
_class_type_annotations = NULL; |
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3628 |
_fields_annotations = NULL; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3629 |
_fields_type_annotations = NULL; |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3630 |
} |
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3631 |
|
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3632 |
// 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
|
3633 |
void ClassFileParser::apply_parsed_class_metadata( |
34666 | 3634 |
InstanceKlass* this_klass, |
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3635 |
int java_fields_count, TRAPS) { |
34666 | 3636 |
assert(this_klass != NULL, "invariant"); |
3637 |
||
3638 |
_cp->set_pool_holder(this_klass); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3639 |
this_klass->set_constants(_cp); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3640 |
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
|
3641 |
this_klass->set_methods(_methods); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3642 |
this_klass->set_inner_classes(_inner_classes); |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3643 |
this_klass->set_nest_members(_nest_members); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
3644 |
this_klass->set_nest_host_index(_nest_host); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3645 |
this_klass->set_local_interfaces(_local_interfaces); |
28027
c63d0bb0101c
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
stefank
parents:
27685
diff
changeset
|
3646 |
this_klass->set_annotations(_combined_annotations); |
49948
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
3647 |
// Delay the setting of _transitive_interfaces until after initialize_supers() in |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
3648 |
// fill_instance_klass(). It is because the _transitive_interfaces may be shared with |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
3649 |
// its _super. If an OOM occurs while loading the current klass, its _super field |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
3650 |
// may not have been set. When GC tries to free the klass, the _transitive_interfaces |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
3651 |
// may be deallocated mistakenly in InstanceKlass::deallocate_interfaces(). Subsequent |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
3652 |
// dereferences to the deallocated _transitive_interfaces will result in a crash. |
15935
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 |
// 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
|
3655 |
clear_class_metadata(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3656 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3657 |
|
34666 | 3658 |
AnnotationArray* ClassFileParser::assemble_annotations(const u1* const runtime_visible_annotations, |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13738
diff
changeset
|
3659 |
int runtime_visible_annotations_length, |
34666 | 3660 |
const u1* const runtime_invisible_annotations, |
3661 |
int runtime_invisible_annotations_length, |
|
3662 |
TRAPS) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3663 |
AnnotationArray* annotations = NULL; |
1 | 3664 |
if (runtime_visible_annotations != NULL || |
3665 |
runtime_invisible_annotations != NULL) { |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3666 |
annotations = MetadataFactory::new_array<u1>(_loader_data, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3667 |
runtime_visible_annotations_length + |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3668 |
runtime_invisible_annotations_length, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3669 |
CHECK_(annotations)); |
1 | 3670 |
if (runtime_visible_annotations != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3671 |
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
|
3672 |
annotations->at_put(i, runtime_visible_annotations[i]); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3673 |
} |
1 | 3674 |
} |
3675 |
if (runtime_invisible_annotations != NULL) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3676 |
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
|
3677 |
int append = runtime_visible_annotations_length+i; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3678 |
annotations->at_put(append, runtime_invisible_annotations[i]); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
3679 |
} |
1 | 3680 |
} |
3681 |
} |
|
3682 |
return annotations; |
|
3683 |
} |
|
3684 |
||
34666 | 3685 |
const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp, |
3686 |
const int super_class_index, |
|
3687 |
const bool need_verify, |
|
3688 |
TRAPS) { |
|
3689 |
assert(cp != NULL, "invariant"); |
|
3690 |
const InstanceKlass* super_klass = NULL; |
|
3691 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3692 |
if (super_class_index == 0) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3693 |
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
|
3694 |
"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
|
3695 |
super_class_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3696 |
CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3697 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3698 |
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
|
3699 |
"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
|
3700 |
super_class_index, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3701 |
CHECK_NULL); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3702 |
// 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
|
3703 |
// 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
|
3704 |
bool is_array = false; |
34666 | 3705 |
if (cp->tag_at(super_class_index).is_klass()) { |
3706 |
super_klass = InstanceKlass::cast(cp->resolved_klass_at(super_class_index)); |
|
3707 |
if (need_verify) |
|
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
3708 |
is_array = super_klass->is_array_klass(); |
34666 | 3709 |
} else if (need_verify) { |
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
3710 |
is_array = (cp->klass_name_at(super_class_index)->char_at(0) == JVM_SIGNATURE_ARRAY); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3711 |
} |
34666 | 3712 |
if (need_verify) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3713 |
guarantee_property(!is_array, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3714 |
"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
|
3715 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3716 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3717 |
return super_klass; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3718 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3719 |
|
34666 | 3720 |
static unsigned int compute_oop_map_count(const InstanceKlass* super, |
3721 |
unsigned int nonstatic_oop_map_count, |
|
3722 |
int first_nonstatic_oop_offset) { |
|
3723 |
||
3724 |
unsigned int map_count = |
|
3725 |
NULL == super ? 0 : super->nonstatic_oop_map_count(); |
|
3726 |
if (nonstatic_oop_map_count > 0) { |
|
3727 |
// We have oops to add to map |
|
3728 |
if (map_count == 0) { |
|
3729 |
map_count = nonstatic_oop_map_count; |
|
3730 |
} |
|
3731 |
else { |
|
3732 |
// Check whether we should add a new map block or whether the last one can |
|
3733 |
// be extended |
|
3734 |
const OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps(); |
|
3735 |
const OopMapBlock* const last_map = first_map + map_count - 1; |
|
3736 |
||
3737 |
const int next_offset = last_map->offset() + last_map->count() * heapOopSize; |
|
3738 |
if (next_offset == first_nonstatic_oop_offset) { |
|
3739 |
// There is no gap bettwen superklass's last oop field and first |
|
3740 |
// local oop field, merge maps. |
|
3741 |
nonstatic_oop_map_count -= 1; |
|
3742 |
} |
|
3743 |
else { |
|
3744 |
// Superklass didn't end with a oop field, add extra maps |
|
3745 |
assert(next_offset < first_nonstatic_oop_offset, "just checking"); |
|
3746 |
} |
|
3747 |
map_count += nonstatic_oop_map_count; |
|
3748 |
} |
|
3749 |
} |
|
3750 |
return map_count; |
|
3751 |
} |
|
3752 |
||
3753 |
#ifndef PRODUCT |
|
3754 |
static void print_field_layout(const Symbol* name, |
|
3755 |
Array<u2>* fields, |
|
59056
15936b142f86
8233913: Remove implicit conversion from Method* to methodHandle
coleenp
parents:
58817
diff
changeset
|
3756 |
ConstantPool* cp, |
34666 | 3757 |
int instance_size, |
3758 |
int instance_fields_start, |
|
3759 |
int instance_fields_end, |
|
3760 |
int static_fields_end) { |
|
3761 |
||
3762 |
assert(name != NULL, "invariant"); |
|
3763 |
||
3764 |
tty->print("%s: field layout\n", name->as_klass_external_name()); |
|
3765 |
tty->print(" @%3d %s\n", instance_fields_start, "--- instance fields start ---"); |
|
3766 |
for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { |
|
3767 |
if (!fs.access_flags().is_static()) { |
|
3768 |
tty->print(" @%3d \"%s\" %s\n", |
|
3769 |
fs.offset(), |
|
3770 |
fs.name()->as_klass_external_name(), |
|
3771 |
fs.signature()->as_klass_external_name()); |
|
3772 |
} |
|
3773 |
} |
|
3774 |
tty->print(" @%3d %s\n", instance_fields_end, "--- instance fields end ---"); |
|
3775 |
tty->print(" @%3d %s\n", instance_size * wordSize, "--- instance ends ---"); |
|
3776 |
tty->print(" @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---"); |
|
3777 |
for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) { |
|
3778 |
if (fs.access_flags().is_static()) { |
|
3779 |
tty->print(" @%3d \"%s\" %s\n", |
|
3780 |
fs.offset(), |
|
3781 |
fs.name()->as_klass_external_name(), |
|
3782 |
fs.signature()->as_klass_external_name()); |
|
3783 |
} |
|
3784 |
} |
|
3785 |
tty->print(" @%3d %s\n", static_fields_end, "--- static fields end ---"); |
|
3786 |
tty->print("\n"); |
|
3787 |
} |
|
3788 |
#endif |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3789 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3790 |
// Values needed for oopmap and InstanceKlass creation |
34666 | 3791 |
class ClassFileParser::FieldLayoutInfo : public ResourceObj { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3792 |
public: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3793 |
int* nonstatic_oop_offsets; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3794 |
unsigned int* nonstatic_oop_counts; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3795 |
unsigned int nonstatic_oop_map_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3796 |
unsigned int total_oop_map_count; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3797 |
int instance_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3798 |
int nonstatic_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3799 |
int static_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3800 |
bool has_nonstatic_fields; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3801 |
}; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3802 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3803 |
// Layout fields and fill in FieldLayoutInfo. Could use more refactoring! |
34666 | 3804 |
void ClassFileParser::layout_fields(ConstantPool* cp, |
3805 |
const FieldAllocationCount* fac, |
|
3806 |
const ClassAnnotationCollector* parsed_annotations, |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3807 |
FieldLayoutInfo* info, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3808 |
TRAPS) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3809 |
|
34666 | 3810 |
assert(cp != NULL, "invariant"); |
3811 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3812 |
// Field size and offset computation |
34666 | 3813 |
int nonstatic_field_size = _super_klass == NULL ? 0 : |
3814 |
_super_klass->nonstatic_field_size(); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3815 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3816 |
// Count the contended fields by type. |
17612 | 3817 |
// |
3818 |
// We ignore static fields, because @Contended is not supported for them. |
|
3819 |
// 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
|
3820 |
int nonstatic_contended_count = 0; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3821 |
FieldAllocationCount fac_contended; |
34666 | 3822 |
for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3823 |
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3824 |
if (fs.is_contended()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3825 |
fac_contended.count[atype]++; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3826 |
if (!fs.access_flags().is_static()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3827 |
nonstatic_contended_count++; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3828 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3829 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3830 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3831 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3832 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3833 |
// Calculate the starting byte offsets |
34666 | 3834 |
int next_static_oop_offset = InstanceMirrorKlass::offset_of_static_fields(); |
3835 |
int next_static_double_offset = next_static_oop_offset + |
|
3836 |
((fac->count[STATIC_OOP]) * heapOopSize); |
|
49359
59f6547e151f
8199264: Remove universe.inline.hpp to simplify include dependencies
stefank
parents:
49348
diff
changeset
|
3837 |
if (fac->count[STATIC_DOUBLE]) { |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
3838 |
next_static_double_offset = align_up(next_static_double_offset, BytesPerLong); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3839 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3840 |
|
34666 | 3841 |
int next_static_word_offset = next_static_double_offset + |
3842 |
((fac->count[STATIC_DOUBLE]) * BytesPerLong); |
|
3843 |
int next_static_short_offset = next_static_word_offset + |
|
3844 |
((fac->count[STATIC_WORD]) * BytesPerInt); |
|
3845 |
int next_static_byte_offset = next_static_short_offset + |
|
3846 |
((fac->count[STATIC_SHORT]) * BytesPerShort); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3847 |
|
17612 | 3848 |
int nonstatic_fields_start = instanceOopDesc::base_offset_in_bytes() + |
3849 |
nonstatic_field_size * heapOopSize; |
|
3850 |
||
34666 | 3851 |
int next_nonstatic_field_offset = nonstatic_fields_start; |
3852 |
||
3853 |
const bool is_contended_class = parsed_annotations->is_contended(); |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3854 |
|
17612 | 3855 |
// Class is contended, pad before all the fields |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3856 |
if (is_contended_class) { |
17612 | 3857 |
next_nonstatic_field_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3858 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3859 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3860 |
// Compute the non-contended fields count. |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3861 |
// 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
|
3862 |
// 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
|
3863 |
// exempt from that. |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3864 |
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
|
3865 |
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
|
3866 |
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
|
3867 |
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
|
3868 |
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
|
3869 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3870 |
// Total non-static fields count, including every contended field |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3871 |
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
|
3872 |
fac->count[NONSTATIC_SHORT] + fac->count[NONSTATIC_BYTE] + |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3873 |
fac->count[NONSTATIC_OOP]; |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3874 |
|
34666 | 3875 |
const bool super_has_nonstatic_fields = |
3876 |
(_super_klass != NULL && _super_klass->has_nonstatic_fields()); |
|
3877 |
const bool has_nonstatic_fields = |
|
3878 |
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
|
3879 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3880 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3881 |
// Prepare list of oops for oop map generation. |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3882 |
// |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3883 |
// "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
|
3884 |
// 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
|
3885 |
// 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
|
3886 |
// 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
|
3887 |
// distinct regions. |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3888 |
// |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3889 |
// 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
|
3890 |
// 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
|
3891 |
unsigned int nonstatic_oop_map_count = 0; |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3892 |
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
|
3893 |
|
34666 | 3894 |
int* nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD( |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3895 |
THREAD, int, max_nonstatic_oop_maps); |
34666 | 3896 |
unsigned int* const nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD( |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
3897 |
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
|
3898 |
|
34666 | 3899 |
int first_nonstatic_oop_offset = 0; // will be set for first oop field |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3900 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3901 |
bool compact_fields = CompactFields; |
34666 | 3902 |
int allocation_style = FieldsAllocationStyle; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3903 |
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
|
3904 |
assert(false, "0 <= FieldsAllocationStyle <= 2"); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3905 |
allocation_style = 1; // Optimistic |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3906 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3907 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3908 |
// 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
|
3909 |
// (see in JavaClasses::compute_hard_coded_offsets()). |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3910 |
// Use default fields allocation order for them. |
34666 | 3911 |
if( (allocation_style != 0 || compact_fields ) && _loader_data->class_loader() == NULL && |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3912 |
(_class_name == vmSymbols::java_lang_AssertionStatusDirectives() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3913 |
_class_name == vmSymbols::java_lang_Class() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3914 |
_class_name == vmSymbols::java_lang_ClassLoader() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3915 |
_class_name == vmSymbols::java_lang_ref_Reference() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3916 |
_class_name == vmSymbols::java_lang_ref_SoftReference() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3917 |
_class_name == vmSymbols::java_lang_StackTraceElement() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3918 |
_class_name == vmSymbols::java_lang_String() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3919 |
_class_name == vmSymbols::java_lang_Throwable() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3920 |
_class_name == vmSymbols::java_lang_Boolean() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3921 |
_class_name == vmSymbols::java_lang_Character() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3922 |
_class_name == vmSymbols::java_lang_Float() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3923 |
_class_name == vmSymbols::java_lang_Double() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3924 |
_class_name == vmSymbols::java_lang_Byte() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3925 |
_class_name == vmSymbols::java_lang_Short() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3926 |
_class_name == vmSymbols::java_lang_Integer() || |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3927 |
_class_name == vmSymbols::java_lang_Long())) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3928 |
allocation_style = 0; // Allocate oops first |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3929 |
compact_fields = false; // Don't compact fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3930 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3931 |
|
34666 | 3932 |
int next_nonstatic_oop_offset = 0; |
3933 |
int next_nonstatic_double_offset = 0; |
|
3934 |
||
17612 | 3935 |
// 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
|
3936 |
if( allocation_style == 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3937 |
// 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
|
3938 |
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
|
3939 |
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
|
3940 |
(nonstatic_oop_count * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3941 |
} else if( allocation_style == 1 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3942 |
// 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
|
3943 |
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
|
3944 |
} else if( allocation_style == 2 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3945 |
// Fields allocation: oops fields in super and sub classes are together. |
34666 | 3946 |
if( nonstatic_field_size > 0 && _super_klass != NULL && |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3947 |
_super_klass->nonstatic_oop_map_size() > 0 ) { |
34666 | 3948 |
const unsigned int map_count = _super_klass->nonstatic_oop_map_count(); |
3949 |
const OopMapBlock* const first_map = _super_klass->start_of_nonstatic_oop_maps(); |
|
3950 |
const OopMapBlock* const last_map = first_map + map_count - 1; |
|
3951 |
const int next_offset = last_map->offset() + (last_map->count() * heapOopSize); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3952 |
if (next_offset == next_nonstatic_field_offset) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3953 |
allocation_style = 0; // allocate oops first |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3954 |
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
|
3955 |
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
|
3956 |
(nonstatic_oop_count * heapOopSize); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3957 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3958 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3959 |
if( allocation_style == 2 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3960 |
allocation_style = 1; // allocate oops last |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3961 |
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
|
3962 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3963 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3964 |
ShouldNotReachHere(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3965 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3966 |
|
34666 | 3967 |
int nonstatic_oop_space_count = 0; |
3968 |
int nonstatic_word_space_count = 0; |
|
3969 |
int nonstatic_short_space_count = 0; |
|
3970 |
int nonstatic_byte_space_count = 0; |
|
3971 |
int nonstatic_oop_space_offset = 0; |
|
3972 |
int nonstatic_word_space_offset = 0; |
|
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33230
diff
changeset
|
3973 |
int nonstatic_short_space_offset = 0; |
34666 | 3974 |
int nonstatic_byte_space_offset = 0; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3975 |
|
17612 | 3976 |
// Try to squeeze some of the fields into the gaps due to |
3977 |
// long/double alignment. |
|
34666 | 3978 |
if (nonstatic_double_count > 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3979 |
int offset = next_nonstatic_double_offset; |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
3980 |
next_nonstatic_double_offset = align_up(offset, BytesPerLong); |
34666 | 3981 |
if (compact_fields && offset != next_nonstatic_double_offset) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3982 |
// 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
|
3983 |
int length = next_nonstatic_double_offset - offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3984 |
assert(length == BytesPerInt, ""); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3985 |
nonstatic_word_space_offset = offset; |
34666 | 3986 |
if (nonstatic_word_count > 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3987 |
nonstatic_word_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3988 |
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
|
3989 |
length -= BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3990 |
offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3991 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3992 |
nonstatic_short_space_offset = offset; |
34666 | 3993 |
while (length >= BytesPerShort && nonstatic_short_count > 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3994 |
nonstatic_short_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3995 |
nonstatic_short_space_count += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3996 |
length -= BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3997 |
offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3998 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
3999 |
nonstatic_byte_space_offset = offset; |
34666 | 4000 |
while (length > 0 && nonstatic_byte_count > 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4001 |
nonstatic_byte_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4002 |
nonstatic_byte_space_count += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4003 |
length -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4004 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4005 |
// 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
|
4006 |
nonstatic_oop_space_offset = offset; |
34666 | 4007 |
if (length >= heapOopSize && nonstatic_oop_count > 0 && |
4008 |
allocation_style != 0) { // when oop fields not first |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4009 |
nonstatic_oop_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4010 |
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
|
4011 |
length -= heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4012 |
offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4013 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4014 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4015 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4016 |
|
34666 | 4017 |
int next_nonstatic_word_offset = next_nonstatic_double_offset + |
4018 |
(nonstatic_double_count * BytesPerLong); |
|
4019 |
int next_nonstatic_short_offset = next_nonstatic_word_offset + |
|
4020 |
(nonstatic_word_count * BytesPerInt); |
|
4021 |
int next_nonstatic_byte_offset = next_nonstatic_short_offset + |
|
4022 |
(nonstatic_short_count * BytesPerShort); |
|
4023 |
int next_nonstatic_padded_offset = next_nonstatic_byte_offset + |
|
4024 |
nonstatic_byte_count; |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4025 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4026 |
// 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
|
4027 |
if( allocation_style == 1 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4028 |
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
|
4029 |
if( nonstatic_oop_count > 0 ) { |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4030 |
next_nonstatic_oop_offset = align_up(next_nonstatic_oop_offset, heapOopSize); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4031 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4032 |
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
|
4033 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4034 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4035 |
// 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
|
4036 |
// 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
|
4037 |
// oop fields are located before non-oop fields (static and non-static). |
34666 | 4038 |
for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4039 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4040 |
// skip already laid out fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4041 |
if (fs.is_offset_set()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4042 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4043 |
// contended instance fields are handled below |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4044 |
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
|
4045 |
|
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33230
diff
changeset
|
4046 |
int real_offset = 0; |
34666 | 4047 |
const FieldAllocationType atype = (const FieldAllocationType) fs.allocation_type(); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4048 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4049 |
// pack the rest of the fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4050 |
switch (atype) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4051 |
case STATIC_OOP: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4052 |
real_offset = next_static_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4053 |
next_static_oop_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4054 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4055 |
case STATIC_BYTE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4056 |
real_offset = next_static_byte_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4057 |
next_static_byte_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4058 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4059 |
case STATIC_SHORT: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4060 |
real_offset = next_static_short_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4061 |
next_static_short_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4062 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4063 |
case STATIC_WORD: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4064 |
real_offset = next_static_word_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4065 |
next_static_word_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4066 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4067 |
case STATIC_DOUBLE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4068 |
real_offset = next_static_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4069 |
next_static_double_offset += BytesPerLong; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4070 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4071 |
case NONSTATIC_OOP: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4072 |
if( nonstatic_oop_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4073 |
real_offset = nonstatic_oop_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4074 |
nonstatic_oop_space_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4075 |
nonstatic_oop_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4076 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4077 |
real_offset = next_nonstatic_oop_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4078 |
next_nonstatic_oop_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4079 |
} |
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4080 |
|
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4081 |
// 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
|
4082 |
if( nonstatic_oop_map_count > 0 && |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4083 |
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
|
4084 |
real_offset - |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4085 |
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
|
4086 |
heapOopSize ) { |
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4087 |
// 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
|
4088 |
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
|
4089 |
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
|
4090 |
} else { |
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4091 |
// 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
|
4092 |
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
|
4093 |
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
|
4094 |
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
|
4095 |
nonstatic_oop_map_count += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4096 |
if( first_nonstatic_oop_offset == 0 ) { // Undefined |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4097 |
first_nonstatic_oop_offset = real_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4098 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4099 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4100 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4101 |
case NONSTATIC_BYTE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4102 |
if( nonstatic_byte_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4103 |
real_offset = nonstatic_byte_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4104 |
nonstatic_byte_space_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4105 |
nonstatic_byte_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4106 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4107 |
real_offset = next_nonstatic_byte_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4108 |
next_nonstatic_byte_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4109 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4110 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4111 |
case NONSTATIC_SHORT: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4112 |
if( nonstatic_short_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4113 |
real_offset = nonstatic_short_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4114 |
nonstatic_short_space_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4115 |
nonstatic_short_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4116 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4117 |
real_offset = next_nonstatic_short_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4118 |
next_nonstatic_short_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4119 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4120 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4121 |
case NONSTATIC_WORD: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4122 |
if( nonstatic_word_space_count > 0 ) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4123 |
real_offset = nonstatic_word_space_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4124 |
nonstatic_word_space_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4125 |
nonstatic_word_space_count -= 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4126 |
} else { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4127 |
real_offset = next_nonstatic_word_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4128 |
next_nonstatic_word_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4129 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4130 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4131 |
case NONSTATIC_DOUBLE: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4132 |
real_offset = next_nonstatic_double_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4133 |
next_nonstatic_double_offset += BytesPerLong; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4134 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4135 |
default: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4136 |
ShouldNotReachHere(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4137 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4138 |
fs.set_offset(real_offset); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4139 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4140 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4141 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4142 |
// Handle the contended cases. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4143 |
// |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4144 |
// 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
|
4145 |
// 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
|
4146 |
// the fields with full-width padding. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4147 |
// |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4148 |
// 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
|
4149 |
// for each field. |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4150 |
if (nonstatic_contended_count > 0) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4151 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4152 |
// 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
|
4153 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4154 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4155 |
// collect all contended groups |
38177 | 4156 |
ResourceBitMap bm(cp->size()); |
34666 | 4157 |
for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4158 |
// skip already laid out fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4159 |
if (fs.is_offset_set()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4160 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4161 |
if (fs.is_contended()) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4162 |
bm.set_bit(fs.contended_group()); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4163 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4164 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4165 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4166 |
int current_group = -1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4167 |
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
|
4168 |
|
34666 | 4169 |
for (AllFieldStream fs(_fields, cp); !fs.done(); fs.next()) { |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4170 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4171 |
// skip already laid out fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4172 |
if (fs.is_offset_set()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4173 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4174 |
// 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
|
4175 |
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
|
4176 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4177 |
// handle statics below |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4178 |
if (fs.access_flags().is_static()) continue; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4179 |
|
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33230
diff
changeset
|
4180 |
int real_offset = 0; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4181 |
FieldAllocationType atype = (FieldAllocationType) fs.allocation_type(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4182 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4183 |
switch (atype) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4184 |
case NONSTATIC_BYTE: |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4185 |
next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, 1); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4186 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4187 |
next_nonstatic_padded_offset += 1; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4188 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4189 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4190 |
case NONSTATIC_SHORT: |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4191 |
next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, BytesPerShort); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4192 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4193 |
next_nonstatic_padded_offset += BytesPerShort; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4194 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4195 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4196 |
case NONSTATIC_WORD: |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4197 |
next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, BytesPerInt); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4198 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4199 |
next_nonstatic_padded_offset += BytesPerInt; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4200 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4201 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4202 |
case NONSTATIC_DOUBLE: |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4203 |
next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, BytesPerLong); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4204 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4205 |
next_nonstatic_padded_offset += BytesPerLong; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4206 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4207 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4208 |
case NONSTATIC_OOP: |
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4209 |
next_nonstatic_padded_offset = align_up(next_nonstatic_padded_offset, heapOopSize); |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4210 |
real_offset = next_nonstatic_padded_offset; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4211 |
next_nonstatic_padded_offset += heapOopSize; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4212 |
|
27616
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4213 |
// 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
|
4214 |
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
|
4215 |
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
|
4216 |
real_offset - |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4217 |
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
|
4218 |
heapOopSize ) { |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4219 |
// 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
|
4220 |
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
|
4221 |
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
|
4222 |
} else { |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4223 |
// 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
|
4224 |
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
|
4225 |
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
|
4226 |
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
|
4227 |
nonstatic_oop_map_count += 1; |
6a63de6a8276
8015272: Make @Contended within the same group to use the same oop map
shade
parents:
27612
diff
changeset
|
4228 |
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
|
4229 |
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
|
4230 |
} |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4231 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4232 |
break; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4233 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4234 |
default: |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4235 |
ShouldNotReachHere(); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4236 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4237 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4238 |
if (fs.contended_group() == 0) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4239 |
// 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
|
4240 |
// 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
|
4241 |
// 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
|
4242 |
// equivalence, and so requires intra-padding. |
17612 | 4243 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4244 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4245 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4246 |
fs.set_offset(real_offset); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4247 |
} // for |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4248 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4249 |
// Start laying out the next group. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4250 |
// 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
|
4251 |
// 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
|
4252 |
// subclass fields and/or adjacent object. |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4253 |
// 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
|
4254 |
if (current_group != 0) { |
17612 | 4255 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4256 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4257 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4258 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4259 |
// handle static fields |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4260 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4261 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4262 |
// 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
|
4263 |
// 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
|
4264 |
// and/or adjacent object. |
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4265 |
if (is_contended_class) { |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4266 |
next_nonstatic_padded_offset += ContendedPaddingWidth; |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4267 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4268 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4269 |
int notaligned_nonstatic_fields_end = next_nonstatic_padded_offset; |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4270 |
|
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4271 |
int nonstatic_fields_end = align_up(notaligned_nonstatic_fields_end, heapOopSize); |
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4272 |
int instance_end = align_up(notaligned_nonstatic_fields_end, wordSize); |
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4273 |
int static_fields_end = align_up(next_static_byte_offset, wordSize); |
17612 | 4274 |
|
4275 |
int static_field_size = (static_fields_end - |
|
4276 |
InstanceMirrorKlass::offset_of_static_fields()) / wordSize; |
|
4277 |
nonstatic_field_size = nonstatic_field_size + |
|
4278 |
(nonstatic_fields_end - nonstatic_fields_start) / heapOopSize; |
|
4279 |
||
4280 |
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
|
4281 |
|
46619
a3919f5e8d2b
8178499: Remove _ptr_ and _size_ infixes from align functions
stefank
parents:
46513
diff
changeset
|
4282 |
assert(instance_size == align_object_size(align_up( |
17601
0db4dfbb42ca
8012939: @Contended doesn't work correctly with inheritance
shade
parents:
17374
diff
changeset
|
4283 |
(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
|
4284 |
wordSize) / wordSize), "consistent layout helper value"); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4285 |
|
17831
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4286 |
// 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
|
4287 |
// 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
|
4288 |
// 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
|
4289 |
// assert without actually having the fields. |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4290 |
assert((notaligned_nonstatic_fields_end == nonstatic_fields_start) || |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4291 |
is_contended_class || |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4292 |
(nonstatic_fields_count > 0), "double-check nonstatic start/end"); |
d8112d90739f
8015270: @Contended: fix multiple issues in the layout code
shade
parents:
17826
diff
changeset
|
4293 |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4294 |
// 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
|
4295 |
const unsigned int total_oop_map_count = |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4296 |
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
|
4297 |
first_nonstatic_oop_offset); |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4298 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4299 |
#ifndef PRODUCT |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4300 |
if (PrintFieldLayout) { |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4301 |
print_field_layout(_class_name, |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4302 |
_fields, |
34666 | 4303 |
cp, |
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4304 |
instance_size, |
17612 | 4305 |
nonstatic_fields_start, |
4306 |
nonstatic_fields_end, |
|
4307 |
static_fields_end); |
|
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4308 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4309 |
|
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4310 |
#endif |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4311 |
// Pass back information needed for InstanceKlass creation |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4312 |
info->nonstatic_oop_offsets = nonstatic_oop_offsets; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4313 |
info->nonstatic_oop_counts = nonstatic_oop_counts; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4314 |
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
|
4315 |
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
|
4316 |
info->instance_size = instance_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4317 |
info->static_field_size = static_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4318 |
info->nonstatic_field_size = nonstatic_field_size; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4319 |
info->has_nonstatic_fields = has_nonstatic_fields; |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4320 |
} |
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4321 |
|
34666 | 4322 |
static void fill_oop_maps(const InstanceKlass* k, |
4323 |
unsigned int nonstatic_oop_map_count, |
|
4324 |
const int* nonstatic_oop_offsets, |
|
4325 |
const unsigned int* nonstatic_oop_counts) { |
|
4326 |
||
4327 |
assert(k != NULL, "invariant"); |
|
4328 |
||
1 | 4329 |
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
|
4330 |
const InstanceKlass* const super = k->superklass(); |
3694
942b7bc7f28c
6845368: large objects cause a crash or unexpected exception
jcoomes
parents:
3693
diff
changeset
|
4331 |
const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0; |
3693 | 4332 |
if (super_count > 0) { |
4333 |
// Copy maps from superklass |
|
1 | 4334 |
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
|
4335 |
for (unsigned int i = 0; i < super_count; ++i) { |
1 | 4336 |
*this_oop_map++ = *super_oop_map++; |
4337 |
} |
|
4338 |
} |
|
3693 | 4339 |
|
1 | 4340 |
if (nonstatic_oop_map_count > 0) { |
3693 | 4341 |
if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) { |
4342 |
// The counts differ because there is no gap between superklass's last oop |
|
4343 |
// field and the first local oop field. Extend the last oop map copied |
|
1 | 4344 |
// from the superklass instead of creating new one. |
4345 |
nonstatic_oop_map_count--; |
|
4346 |
nonstatic_oop_offsets++; |
|
4347 |
this_oop_map--; |
|
3693 | 4348 |
this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++); |
1 | 4349 |
this_oop_map++; |
4350 |
} |
|
3693 | 4351 |
|
1 | 4352 |
// Add new map blocks, fill them |
4353 |
while (nonstatic_oop_map_count-- > 0) { |
|
4354 |
this_oop_map->set_offset(*nonstatic_oop_offsets++); |
|
3693 | 4355 |
this_oop_map->set_count(*nonstatic_oop_counts++); |
1 | 4356 |
this_oop_map++; |
4357 |
} |
|
3693 | 4358 |
assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() == |
4359 |
this_oop_map, "sanity"); |
|
1 | 4360 |
} |
4361 |
} |
|
4362 |
||
4363 |
||
34666 | 4364 |
void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) { |
4365 |
assert(ik != NULL, "invariant"); |
|
4366 |
||
4367 |
const Klass* const super = ik->super(); |
|
1 | 4368 |
|
4369 |
// Check if this klass has an empty finalize method (i.e. one with return bytecode only), |
|
4370 |
// in which case we don't have to register objects as finalizable |
|
4371 |
if (!_has_empty_finalizer) { |
|
4372 |
if (_has_finalizer || |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4373 |
(super != NULL && super->has_finalizer())) { |
34666 | 4374 |
ik->set_has_finalizer(); |
1 | 4375 |
} |
4376 |
} |
|
4377 |
||
4378 |
#ifdef ASSERT |
|
4379 |
bool f = false; |
|
34666 | 4380 |
const Method* const m = ik->lookup_method(vmSymbols::finalize_method_name(), |
4381 |
vmSymbols::void_method_signature()); |
|
1 | 4382 |
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
|
4383 |
f = true; |
1 | 4384 |
} |
24828
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4385 |
|
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4386 |
// 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
|
4387 |
// 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
|
4388 |
// will not work as expected we shouldn't abort vm in this case |
34666 | 4389 |
if (!ik->has_redefined_this_or_super()) { |
4390 |
assert(ik->has_finalizer() == f, "inconsistent has_finalizer"); |
|
24828
dd5406c950a1
6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
dsamersoff
parents:
24454
diff
changeset
|
4391 |
} |
1 | 4392 |
#endif |
4393 |
||
4394 |
// Check if this klass supports the java.lang.Cloneable interface |
|
4571 | 4395 |
if (SystemDictionary::Cloneable_klass_loaded()) { |
34666 | 4396 |
if (ik->is_subtype_of(SystemDictionary::Cloneable_klass())) { |
4397 |
ik->set_is_cloneable(); |
|
1 | 4398 |
} |
4399 |
} |
|
4400 |
||
4401 |
// Check if this klass has a vanilla default constructor |
|
4402 |
if (super == NULL) { |
|
4403 |
// java.lang.Object has empty default constructor |
|
34666 | 4404 |
ik->set_has_vanilla_constructor(); |
1 | 4405 |
} else { |
14488 | 4406 |
if (super->has_vanilla_constructor() && |
1 | 4407 |
_has_vanilla_constructor) { |
34666 | 4408 |
ik->set_has_vanilla_constructor(); |
1 | 4409 |
} |
4410 |
#ifdef ASSERT |
|
4411 |
bool v = false; |
|
14488 | 4412 |
if (super->has_vanilla_constructor()) { |
34666 | 4413 |
const Method* const constructor = |
4414 |
ik->find_method(vmSymbols::object_initializer_name(), |
|
4415 |
vmSymbols::void_method_signature()); |
|
1 | 4416 |
if (constructor != NULL && constructor->is_vanilla_constructor()) { |
4417 |
v = true; |
|
4418 |
} |
|
4419 |
} |
|
34666 | 4420 |
assert(v == ik->has_vanilla_constructor(), "inconsistent has_vanilla_constructor"); |
1 | 4421 |
#endif |
4422 |
} |
|
4423 |
||
4424 |
// 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
|
4425 |
// See documentation of InstanceKlass::can_be_fastpath_allocated(). |
34666 | 4426 |
assert(ik->size_helper() > 0, "layout_helper is initialized"); |
4427 |
if ((!RegisterFinalizersAtInit && ik->has_finalizer()) |
|
4428 |
|| ik->is_abstract() || ik->is_interface() |
|
4429 |
|| (ik->name() == vmSymbols::java_lang_Class() && ik->class_loader() == NULL) |
|
4430 |
|| ik->size_helper() >= FastAllocateSizeLimit) { |
|
1 | 4431 |
// Forbid fast-path allocation. |
34666 | 4432 |
const jint lh = Klass::instance_layout_helper(ik->size_helper(), true); |
4433 |
ik->set_layout_helper(lh); |
|
1 | 4434 |
} |
4435 |
} |
|
4436 |
||
15935
50da9e5eb858
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
15932
diff
changeset
|
4437 |
// 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
|
4438 |
|
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4439 |
static void append_interfaces(GrowableArray<InstanceKlass*>* result, |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4440 |
const Array<InstanceKlass*>* const ifs) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4441 |
// iterate over new interfaces |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4442 |
for (int i = 0; i < ifs->length(); i++) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4443 |
InstanceKlass* const e = ifs->at(i); |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4444 |
assert(e->is_klass() && e->is_interface(), "just checking"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4445 |
// add new interface |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4446 |
result->append_if_missing(e); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4447 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4448 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4449 |
|
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4450 |
static Array<InstanceKlass*>* compute_transitive_interfaces(const InstanceKlass* super, |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4451 |
Array<InstanceKlass*>* local_ifs, |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4452 |
ClassLoaderData* loader_data, |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4453 |
TRAPS) { |
34666 | 4454 |
assert(local_ifs != NULL, "invariant"); |
4455 |
assert(loader_data != NULL, "invariant"); |
|
4456 |
||
1 | 4457 |
// Compute maximum size for transitive interfaces |
4458 |
int max_transitive_size = 0; |
|
4459 |
int super_size = 0; |
|
4460 |
// Add superclass transitive interfaces size |
|
34666 | 4461 |
if (super != NULL) { |
1 | 4462 |
super_size = super->transitive_interfaces()->length(); |
4463 |
max_transitive_size += super_size; |
|
4464 |
} |
|
4465 |
// Add local interfaces' super interfaces |
|
34666 | 4466 |
const int local_size = local_ifs->length(); |
1 | 4467 |
for (int i = 0; i < local_size; i++) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4468 |
InstanceKlass* const l = local_ifs->at(i); |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4469 |
max_transitive_size += l->transitive_interfaces()->length(); |
1 | 4470 |
} |
4471 |
// Finally add local interfaces |
|
4472 |
max_transitive_size += local_size; |
|
4473 |
// Construct array |
|
4474 |
if (max_transitive_size == 0) { |
|
4475 |
// no interfaces, use canonicalized array |
|
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4476 |
return Universe::the_empty_instance_klass_array(); |
1 | 4477 |
} else if (max_transitive_size == super_size) { |
4478 |
// 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
|
4479 |
return super->transitive_interfaces(); |
1 | 4480 |
} else if (max_transitive_size == local_size) { |
4481 |
// 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
|
4482 |
return local_ifs; |
1 | 4483 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4484 |
ResourceMark rm; |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4485 |
GrowableArray<InstanceKlass*>* const result = new GrowableArray<InstanceKlass*>(max_transitive_size); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4486 |
|
1 | 4487 |
// Copy down from superclass |
34666 | 4488 |
if (super != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4489 |
append_interfaces(result, super->transitive_interfaces()); |
1 | 4490 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4491 |
|
1 | 4492 |
// Copy down from local interfaces' superinterfaces |
34666 | 4493 |
for (int i = 0; i < local_size; i++) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4494 |
InstanceKlass* const l = local_ifs->at(i); |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4495 |
append_interfaces(result, l->transitive_interfaces()); |
1 | 4496 |
} |
4497 |
// Finally add local interfaces |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4498 |
append_interfaces(result, local_ifs); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4499 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4500 |
// length will be less than the max_transitive_size if duplicates were removed |
34666 | 4501 |
const int length = result->length(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4502 |
assert(length <= max_transitive_size, "just checking"); |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4503 |
Array<InstanceKlass*>* const new_result = |
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4504 |
MetadataFactory::new_array<InstanceKlass*>(loader_data, length, CHECK_NULL); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4505 |
for (int i = 0; i < length; i++) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4506 |
InstanceKlass* const e = result->at(i); |
34666 | 4507 |
assert(e != NULL, "just checking"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4508 |
new_result->at_put(i, e); |
1 | 4509 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4510 |
return new_result; |
1 | 4511 |
} |
4512 |
} |
|
4513 |
||
34666 | 4514 |
static void check_super_class_access(const InstanceKlass* this_klass, TRAPS) { |
4515 |
assert(this_klass != NULL, "invariant"); |
|
4516 |
const Klass* const super = this_klass->super(); |
|
36508 | 4517 |
if (super != NULL) { |
42574
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4518 |
|
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4519 |
// If the loader is not the boot loader then throw an exception if its |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4520 |
// superclass is in package jdk.internal.reflect and its loader is not a |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4521 |
// special reflection class loader |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4522 |
if (!this_klass->class_loader_data()->is_the_null_class_loader_data()) { |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4523 |
assert(super->is_instance_klass(), "super is not instance klass"); |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4524 |
PackageEntry* super_package = super->package(); |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4525 |
if (super_package != NULL && |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4526 |
super_package->name()->fast_compare(vmSymbols::jdk_internal_reflect()) == 0 && |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4527 |
!java_lang_ClassLoader::is_reflection_class_loader(this_klass->class_loader())) { |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4528 |
ResourceMark rm(THREAD); |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4529 |
Exceptions::fthrow( |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4530 |
THREAD_AND_LOCATION, |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4531 |
vmSymbols::java_lang_IllegalAccessError(), |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4532 |
"class %s loaded by %s cannot access jdk/internal/reflect superclass %s", |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4533 |
this_klass->external_name(), |
50634
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50633
diff
changeset
|
4534 |
this_klass->class_loader_data()->loader_name_and_id(), |
42574
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4535 |
super->external_name()); |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4536 |
return; |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4537 |
} |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4538 |
} |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41744
diff
changeset
|
4539 |
|
36508 | 4540 |
Reflection::VerifyClassAccessResults vca_result = |
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
42656
diff
changeset
|
4541 |
Reflection::verify_class_access(this_klass, InstanceKlass::cast(super), false); |
36508 | 4542 |
if (vca_result != Reflection::ACCESS_OK) { |
4543 |
ResourceMark rm(THREAD); |
|
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
42656
diff
changeset
|
4544 |
char* msg = Reflection::verify_class_access_msg(this_klass, |
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
42656
diff
changeset
|
4545 |
InstanceKlass::cast(super), |
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
42656
diff
changeset
|
4546 |
vca_result); |
36508 | 4547 |
if (msg == NULL) { |
50816
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4548 |
bool same_module = (this_klass->module() == super->module()); |
36508 | 4549 |
Exceptions::fthrow( |
4550 |
THREAD_AND_LOCATION, |
|
4551 |
vmSymbols::java_lang_IllegalAccessError(), |
|
50816
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4552 |
"class %s cannot access its %ssuperclass %s (%s%s%s)", |
36508 | 4553 |
this_klass->external_name(), |
50816
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4554 |
super->is_abstract() ? "abstract " : "", |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4555 |
super->external_name(), |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4556 |
(same_module) ? this_klass->joint_in_module_of_loader(super) : this_klass->class_in_module_of_loader(), |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4557 |
(same_module) ? "" : "; ", |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4558 |
(same_module) ? "" : super->class_in_module_of_loader()); |
36508 | 4559 |
} else { |
4560 |
// Add additional message content. |
|
4561 |
Exceptions::fthrow( |
|
4562 |
THREAD_AND_LOCATION, |
|
4563 |
vmSymbols::java_lang_IllegalAccessError(), |
|
4564 |
"superclass access check failed: %s", |
|
4565 |
msg); |
|
4566 |
} |
|
4567 |
} |
|
1 | 4568 |
} |
4569 |
} |
|
4570 |
||
4571 |
||
34666 | 4572 |
static void check_super_interface_access(const InstanceKlass* this_klass, TRAPS) { |
4573 |
assert(this_klass != NULL, "invariant"); |
|
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4574 |
const Array<InstanceKlass*>* const local_interfaces = this_klass->local_interfaces(); |
34666 | 4575 |
const int lng = local_interfaces->length(); |
1 | 4576 |
for (int i = lng - 1; i >= 0; i--) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4577 |
InstanceKlass* const k = local_interfaces->at(i); |
14488 | 4578 |
assert (k != NULL && k->is_interface(), "invalid interface"); |
36508 | 4579 |
Reflection::VerifyClassAccessResults vca_result = |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4580 |
Reflection::verify_class_access(this_klass, k, false); |
36508 | 4581 |
if (vca_result != Reflection::ACCESS_OK) { |
1 | 4582 |
ResourceMark rm(THREAD); |
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
42656
diff
changeset
|
4583 |
char* msg = Reflection::verify_class_access_msg(this_klass, |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
4584 |
k, |
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
42656
diff
changeset
|
4585 |
vca_result); |
36508 | 4586 |
if (msg == NULL) { |
50816
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4587 |
bool same_module = (this_klass->module() == k->module()); |
36508 | 4588 |
Exceptions::fthrow( |
4589 |
THREAD_AND_LOCATION, |
|
4590 |
vmSymbols::java_lang_IllegalAccessError(), |
|
50816
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4591 |
"class %s cannot access its superinterface %s (%s%s%s)", |
36508 | 4592 |
this_klass->external_name(), |
50816
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4593 |
k->external_name(), |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4594 |
(same_module) ? this_klass->joint_in_module_of_loader(k) : this_klass->class_in_module_of_loader(), |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4595 |
(same_module) ? "" : "; ", |
a73848f8d0ad
8199940: Print more information about class loaders in IllegalAccessErrors.
goetz
parents:
50761
diff
changeset
|
4596 |
(same_module) ? "" : k->class_in_module_of_loader()); |
36508 | 4597 |
} else { |
4598 |
// Add additional message content. |
|
4599 |
Exceptions::fthrow( |
|
4600 |
THREAD_AND_LOCATION, |
|
4601 |
vmSymbols::java_lang_IllegalAccessError(), |
|
4602 |
"superinterface check failed: %s", |
|
4603 |
msg); |
|
4604 |
} |
|
1 | 4605 |
} |
4606 |
} |
|
4607 |
} |
|
4608 |
||
4609 |
||
34666 | 4610 |
static void check_final_method_override(const InstanceKlass* this_klass, TRAPS) { |
4611 |
assert(this_klass != NULL, "invariant"); |
|
4612 |
const Array<Method*>* const methods = this_klass->methods(); |
|
4613 |
const int num_methods = methods->length(); |
|
1 | 4614 |
|
4615 |
// go thru each method and check if it overrides a final method |
|
4616 |
for (int index = 0; index < num_methods; index++) { |
|
34666 | 4617 |
const Method* const m = methods->at(index); |
1 | 4618 |
|
21765
e2c19a9f1039
8028520: JVM should not throw VerifyError when a private method overrides a final method
hseigel
parents:
21556
diff
changeset
|
4619 |
// 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
|
4620 |
if ((!m->is_private() && !m->is_static()) && |
1 | 4621 |
(m->name() != vmSymbols::object_initializer_name())) { |
4622 |
||
34666 | 4623 |
const Symbol* const name = m->name(); |
4624 |
const Symbol* const signature = m->signature(); |
|
4625 |
const Klass* k = this_klass->super(); |
|
4626 |
const Method* super_m = NULL; |
|
1 | 4627 |
while (k != NULL) { |
4628 |
// 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
|
4629 |
if (k->has_final_method()) { |
1 | 4630 |
// 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
|
4631 |
super_m = InstanceKlass::cast(k)->lookup_method(name, signature); |
1 | 4632 |
if (super_m == NULL) { |
4633 |
break; // didn't find any match; get out |
|
4634 |
} |
|
4635 |
||
22534
520f7a937396
8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
hseigel
parents:
22485
diff
changeset
|
4636 |
if (super_m->is_final() && !super_m->is_static() && |
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4637 |
!super_m->access_flags().is_private()) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4638 |
// matching method in super is final, and not static or private |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4639 |
bool can_access = Reflection::verify_member_access(this_klass, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4640 |
super_m->method_holder(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4641 |
super_m->method_holder(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4642 |
super_m->access_flags(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4643 |
false, false, CHECK); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4644 |
if (can_access) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4645 |
// this class can access super final method and therefore override |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4646 |
ResourceMark rm(THREAD); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4647 |
Exceptions::fthrow(THREAD_AND_LOCATION, |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4648 |
vmSymbols::java_lang_VerifyError(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4649 |
"class %s overrides final method %s.%s%s", |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4650 |
this_klass->external_name(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4651 |
super_m->method_holder()->external_name(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4652 |
name->as_C_string(), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4653 |
signature->as_C_string() |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4654 |
); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4655 |
return; |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
4656 |
} |
1 | 4657 |
} |
4658 |
||
4659 |
// 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
|
4660 |
k = super_m->method_holder()->super(); |
1 | 4661 |
continue; |
4662 |
} |
|
4663 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
4664 |
k = k->super(); |
1 | 4665 |
} |
4666 |
} |
|
4667 |
} |
|
4668 |
} |
|
4669 |
||
4670 |
||
4671 |
// assumes that this_klass is an interface |
|
34666 | 4672 |
static void check_illegal_static_method(const InstanceKlass* this_klass, TRAPS) { |
4673 |
assert(this_klass != NULL, "invariant"); |
|
1 | 4674 |
assert(this_klass->is_interface(), "not an interface"); |
34666 | 4675 |
const Array<Method*>* methods = this_klass->methods(); |
4676 |
const int num_methods = methods->length(); |
|
1 | 4677 |
|
4678 |
for (int index = 0; index < num_methods; index++) { |
|
34666 | 4679 |
const Method* const m = methods->at(index); |
1 | 4680 |
// if m is static and not the init method, throw a verify error |
4681 |
if ((m->is_static()) && (m->name() != vmSymbols::class_initializer_name())) { |
|
4682 |
ResourceMark rm(THREAD); |
|
4683 |
Exceptions::fthrow( |
|
4684 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4685 |
vmSymbols::java_lang_VerifyError(), |
1 | 4686 |
"Illegal static method %s in interface %s", |
4687 |
m->name()->as_C_string(), |
|
4688 |
this_klass->external_name() |
|
4689 |
); |
|
4690 |
return; |
|
4691 |
} |
|
4692 |
} |
|
4693 |
} |
|
4694 |
||
4695 |
// utility methods for format checking |
|
4696 |
||
34666 | 4697 |
void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) const { |
43977
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4698 |
const bool is_module = (flags & JVM_ACC_MODULE) != 0; |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4699 |
assert(_major_version >= JAVA_9_VERSION || !is_module, "JVM_ACC_MODULE should not be set"); |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4700 |
if (is_module) { |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4701 |
ResourceMark rm(THREAD); |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4702 |
Exceptions::fthrow( |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4703 |
THREAD_AND_LOCATION, |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4704 |
vmSymbols::java_lang_NoClassDefFoundError(), |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4705 |
"%s is not a class because access_flag ACC_MODULE is set", |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4706 |
_class_name->as_C_string()); |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4707 |
return; |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4708 |
} |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4709 |
|
1 | 4710 |
if (!_need_verify) { return; } |
4711 |
||
4712 |
const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0; |
|
4713 |
const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; |
|
4714 |
const bool is_final = (flags & JVM_ACC_FINAL) != 0; |
|
4715 |
const bool is_super = (flags & JVM_ACC_SUPER) != 0; |
|
4716 |
const bool is_enum = (flags & JVM_ACC_ENUM) != 0; |
|
4717 |
const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0; |
|
4718 |
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
|
4719 |
||
4720 |
if ((is_abstract && is_final) || |
|
4721 |
(is_interface && !is_abstract) || |
|
4722 |
(is_interface && major_gte_15 && (is_super || is_enum)) || |
|
43977
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
4723 |
(!is_interface && major_gte_15 && is_annotation)) { |
1 | 4724 |
ResourceMark rm(THREAD); |
4725 |
Exceptions::fthrow( |
|
4726 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4727 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4728 |
"Illegal class modifiers in class %s: 0x%X", |
4729 |
_class_name->as_C_string(), flags |
|
4730 |
); |
|
4731 |
return; |
|
4732 |
} |
|
4733 |
} |
|
4734 |
||
34666 | 4735 |
static bool has_illegal_visibility(jint flags) { |
1 | 4736 |
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; |
4737 |
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
|
4738 |
const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; |
|
4739 |
||
4740 |
return ((is_public && is_protected) || |
|
4741 |
(is_public && is_private) || |
|
4742 |
(is_protected && is_private)); |
|
4743 |
} |
|
4744 |
||
49716 | 4745 |
// A legal major_version.minor_version must be one of the following: |
4746 |
// |
|
55313
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4747 |
// Major_version >= 45 and major_version < 56, any minor_version. |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4748 |
// Major_version >= 56 and major_version <= JVM_CLASSFILE_MAJOR_VERSION and minor_version = 0. |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4749 |
// Major_version = JVM_CLASSFILE_MAJOR_VERSION and minor_version = 65535 and --enable-preview is present. |
49716 | 4750 |
// |
4751 |
static void verify_class_version(u2 major, u2 minor, Symbol* class_name, TRAPS){ |
|
55313
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4752 |
ResourceMark rm(THREAD); |
48355 | 4753 |
const u2 max_version = JVM_CLASSFILE_MAJOR_VERSION; |
55313
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4754 |
if (major < JAVA_MIN_SUPPORTED_VERSION) { |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4755 |
Exceptions::fthrow( |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4756 |
THREAD_AND_LOCATION, |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4757 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4758 |
"%s (class file version %u.%u) was compiled with an invalid major version", |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4759 |
class_name->as_C_string(), major, minor); |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4760 |
return; |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4761 |
} |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4762 |
|
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4763 |
if (major > max_version) { |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4764 |
Exceptions::fthrow( |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4765 |
THREAD_AND_LOCATION, |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4766 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4767 |
"%s has been compiled by a more recent version of the Java Runtime (class file version %u.%u), " |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4768 |
"this version of the Java Runtime only recognizes class file versions up to %u.0", |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4769 |
class_name->as_C_string(), major, minor, JVM_CLASSFILE_MAJOR_VERSION); |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4770 |
return; |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4771 |
} |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4772 |
|
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4773 |
if (major < JAVA_12_VERSION || minor == 0) { |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4774 |
return; |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4775 |
} |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4776 |
|
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4777 |
if (minor == JAVA_PREVIEW_MINOR_VERSION) { |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4778 |
if (major != max_version) { |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4779 |
Exceptions::fthrow( |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4780 |
THREAD_AND_LOCATION, |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4781 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4782 |
"%s (class file version %u.%u) was compiled with preview features that are unsupported. " |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4783 |
"This version of the Java Runtime only recognizes preview features for class file version %u.%u", |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4784 |
class_name->as_C_string(), major, minor, JVM_CLASSFILE_MAJOR_VERSION, JAVA_PREVIEW_MINOR_VERSION); |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4785 |
return; |
49716 | 4786 |
} |
55313
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4787 |
|
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4788 |
if (!Arguments::enable_preview()) { |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4789 |
Exceptions::fthrow( |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4790 |
THREAD_AND_LOCATION, |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4791 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4792 |
"Preview features are not enabled for %s (class file version %u.%u). Try running with '--enable-preview'", |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4793 |
class_name->as_C_string(), major, minor); |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4794 |
return; |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4795 |
} |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4796 |
|
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4797 |
} else { // minor != JAVA_PREVIEW_MINOR_VERSION |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4798 |
Exceptions::fthrow( |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4799 |
THREAD_AND_LOCATION, |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4800 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4801 |
"%s (class file version %u.%u) was compiled with an invalid non-zero minor version", |
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
4802 |
class_name->as_C_string(), major, minor); |
49716 | 4803 |
} |
1 | 4804 |
} |
4805 |
||
34666 | 4806 |
void ClassFileParser::verify_legal_field_modifiers(jint flags, |
4807 |
bool is_interface, |
|
4808 |
TRAPS) const { |
|
1 | 4809 |
if (!_need_verify) { return; } |
4810 |
||
4811 |
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; |
|
4812 |
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
|
4813 |
const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; |
|
4814 |
const bool is_static = (flags & JVM_ACC_STATIC) != 0; |
|
4815 |
const bool is_final = (flags & JVM_ACC_FINAL) != 0; |
|
4816 |
const bool is_volatile = (flags & JVM_ACC_VOLATILE) != 0; |
|
4817 |
const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0; |
|
4818 |
const bool is_enum = (flags & JVM_ACC_ENUM) != 0; |
|
4819 |
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
|
4820 |
||
4821 |
bool is_illegal = false; |
|
4822 |
||
4823 |
if (is_interface) { |
|
4824 |
if (!is_public || !is_static || !is_final || is_private || |
|
4825 |
is_protected || is_volatile || is_transient || |
|
4826 |
(major_gte_15 && is_enum)) { |
|
4827 |
is_illegal = true; |
|
4828 |
} |
|
4829 |
} else { // not interface |
|
4830 |
if (has_illegal_visibility(flags) || (is_final && is_volatile)) { |
|
4831 |
is_illegal = true; |
|
4832 |
} |
|
4833 |
} |
|
4834 |
||
4835 |
if (is_illegal) { |
|
4836 |
ResourceMark rm(THREAD); |
|
4837 |
Exceptions::fthrow( |
|
4838 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4839 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4840 |
"Illegal field modifiers in class %s: 0x%X", |
4841 |
_class_name->as_C_string(), flags); |
|
4842 |
return; |
|
4843 |
} |
|
4844 |
} |
|
4845 |
||
34666 | 4846 |
void ClassFileParser::verify_legal_method_modifiers(jint flags, |
4847 |
bool is_interface, |
|
4848 |
const Symbol* name, |
|
4849 |
TRAPS) const { |
|
1 | 4850 |
if (!_need_verify) { return; } |
4851 |
||
4852 |
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0; |
|
4853 |
const bool is_private = (flags & JVM_ACC_PRIVATE) != 0; |
|
4854 |
const bool is_static = (flags & JVM_ACC_STATIC) != 0; |
|
4855 |
const bool is_final = (flags & JVM_ACC_FINAL) != 0; |
|
4856 |
const bool is_native = (flags & JVM_ACC_NATIVE) != 0; |
|
4857 |
const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0; |
|
4858 |
const bool is_bridge = (flags & JVM_ACC_BRIDGE) != 0; |
|
4859 |
const bool is_strict = (flags & JVM_ACC_STRICT) != 0; |
|
4860 |
const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0; |
|
15185
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4861 |
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0; |
1 | 4862 |
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION; |
14385 | 4863 |
const bool major_gte_8 = _major_version >= JAVA_8_VERSION; |
1 | 4864 |
const bool is_initializer = (name == vmSymbols::object_initializer_name()); |
4865 |
||
4866 |
bool is_illegal = false; |
|
4867 |
||
4868 |
if (is_interface) { |
|
15185
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4869 |
if (major_gte_8) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4870 |
// Class file version is JAVA_8_VERSION or later Methods of |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4871 |
// interfaces may set any of the flags except ACC_PROTECTED, |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4872 |
// ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4873 |
// 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
|
4874 |
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
|
4875 |
(is_native || is_protected || is_final || is_synchronized) || |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4876 |
// If a specific method of a class or interface has its |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4877 |
// ACC_ABSTRACT flag set, it must not have any of its |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4878 |
// ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC, |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4879 |
// ACC_STRICT, or ACC_SYNCHRONIZED flags set. No need to |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4880 |
// check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4881 |
// 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
|
4882 |
(is_abstract && (is_private || is_static || is_strict))) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4883 |
is_illegal = true; |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4884 |
} |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4885 |
} else if (major_gte_15) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4886 |
// Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION) |
35911
80dd27ae501c
8135206: VM permits illegal flags for abstract methods in interfaces, versions 45.3 - 51.0
hseigel
parents:
35898
diff
changeset
|
4887 |
if (!is_public || is_private || is_protected || is_static || is_final || |
80dd27ae501c
8135206: VM permits illegal flags for abstract methods in interfaces, versions 45.3 - 51.0
hseigel
parents:
35898
diff
changeset
|
4888 |
is_synchronized || is_native || !is_abstract || is_strict) { |
15185
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4889 |
is_illegal = true; |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4890 |
} |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4891 |
} else { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4892 |
// Class file version is pre-JAVA_1_5_VERSION |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4893 |
if (!is_public || is_static || is_final || is_native || !is_abstract) { |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4894 |
is_illegal = true; |
1ce0205b9a47
8005689: InterfaceAccessFlagsTest failures in Lambda-JDK tests
acorn
parents:
15102
diff
changeset
|
4895 |
} |
1 | 4896 |
} |
4897 |
} else { // not interface |
|
30136
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4898 |
if (has_illegal_visibility(flags)) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4899 |
is_illegal = true; |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4900 |
} else { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4901 |
if (is_initializer) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4902 |
if (is_static || is_final || is_synchronized || is_native || |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4903 |
is_abstract || (major_gte_15 && is_bridge)) { |
1 | 4904 |
is_illegal = true; |
4905 |
} |
|
30136
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4906 |
} else { // not initializer |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4907 |
if (is_abstract) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4908 |
if ((is_final || is_native || is_private || is_static || |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4909 |
(major_gte_15 && (is_synchronized || is_strict)))) { |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4910 |
is_illegal = true; |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4911 |
} |
1c5202fa105b
8076236: VM permits illegal flags for class init method
hseigel
parents:
29201
diff
changeset
|
4912 |
} |
1 | 4913 |
} |
4914 |
} |
|
4915 |
} |
|
4916 |
||
4917 |
if (is_illegal) { |
|
4918 |
ResourceMark rm(THREAD); |
|
4919 |
Exceptions::fthrow( |
|
4920 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
4921 |
vmSymbols::java_lang_ClassFormatError(), |
1 | 4922 |
"Method %s in class %s has illegal modifiers: 0x%X", |
4923 |
name->as_C_string(), _class_name->as_C_string(), flags); |
|
4924 |
return; |
|
4925 |
} |
|
4926 |
} |
|
4927 |
||
34666 | 4928 |
void ClassFileParser::verify_legal_utf8(const unsigned char* buffer, |
4929 |
int length, |
|
4930 |
TRAPS) const { |
|
1 | 4931 |
assert(_need_verify, "only called when _need_verify is true"); |
36508 | 4932 |
if (!UTF8::is_legal_utf8(buffer, length, _major_version <= 47)) { |
4933 |
classfile_parse_error("Illegal UTF8 string in constant pool in class file %s", CHECK); |
|
1 | 4934 |
} |
4935 |
} |
|
4936 |
||
34666 | 4937 |
// Unqualified names may not contain the characters '.', ';', '[', or '/'. |
39218
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4938 |
// In class names, '/' separates unqualified names. This is verified in this function also. |
34666 | 4939 |
// Method names also may not contain the characters '<' or '>', unless <init> |
4940 |
// or <clinit>. Note that method names may not be <init> or <clinit> in this |
|
4941 |
// method. Because these names have been checked as special cases before |
|
4942 |
// calling this method in verify_legal_method_name. |
|
36508 | 4943 |
// |
4944 |
// This method is also called from the modular system APIs in modules.cpp |
|
4945 |
// to verify the validity of module and package names. |
|
4946 |
bool ClassFileParser::verify_unqualified_name(const char* name, |
|
4947 |
unsigned int length, |
|
4948 |
int type) { |
|
55437
360f8769d3dc
8225789: Empty method parameter type should generate ClassFormatError
hseigel
parents:
55313
diff
changeset
|
4949 |
if (length == 0) return false; // Must have at least one char. |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4950 |
for (const char* p = name; p != name + length; p++) { |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4951 |
switch(*p) { |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4952 |
case JVM_SIGNATURE_DOT: |
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4953 |
case JVM_SIGNATURE_ENDCLASS: |
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4954 |
case JVM_SIGNATURE_ARRAY: |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4955 |
// do not permit '.', ';', or '[' |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4956 |
return false; |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4957 |
case JVM_SIGNATURE_SLASH: |
39218
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4958 |
// check for '//' or leading or trailing '/' which are not legal |
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4959 |
// unqualified name must not be empty |
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4960 |
if (type == ClassFileParser::LegalClass) { |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4961 |
if (p == name || p+1 >= name+length || |
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4962 |
*(p+1) == JVM_SIGNATURE_SLASH) { |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4963 |
return false; |
39218
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4964 |
} |
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4965 |
} else { |
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4966 |
return false; // do not permit '/' unless it's class name |
43ac06a5ee4f
8158297: Lack of proper checking of non-well formed elements in CONSTANT_Utf8_info's structure
coleenp
parents:
38701
diff
changeset
|
4967 |
} |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4968 |
break; |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4969 |
case JVM_SIGNATURE_SPECIAL: |
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
4970 |
case JVM_SIGNATURE_ENDSPECIAL: |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4971 |
// do not permit '<' or '>' in method names |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4972 |
if (type == ClassFileParser::LegalMethod) { |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4973 |
return false; |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4974 |
} |
34666 | 4975 |
} |
4976 |
} |
|
4977 |
return true; |
|
4978 |
} |
|
4979 |
||
53768
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
4980 |
// Take pointer to a UTF8 byte string (not NUL-terminated). |
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
4981 |
// Skip over the longest part of the string that could |
34666 | 4982 |
// be taken as a fieldname. Allow '/' if slash_ok is true. |
4983 |
// Return a pointer to just past the fieldname. |
|
4984 |
// Return NULL if no fieldname at all was found, or in the case of slash_ok |
|
4985 |
// being true, we saw consecutive slashes (meaning we were looking for a |
|
4986 |
// qualified path but found something that was badly-formed). |
|
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
4987 |
static const char* skip_over_field_name(const char* const name, |
34666 | 4988 |
bool slash_ok, |
4989 |
unsigned int length) { |
|
4990 |
const char* p; |
|
4991 |
jboolean last_is_slash = false; |
|
4992 |
jboolean not_first_ch = false; |
|
4993 |
||
4994 |
for (p = name; p != name + length; not_first_ch = true) { |
|
4995 |
const char* old_p = p; |
|
4996 |
jchar ch = *p; |
|
4997 |
if (ch < 128) { |
|
4998 |
p++; |
|
4999 |
// quick check for ascii |
|
5000 |
if ((ch >= 'a' && ch <= 'z') || |
|
5001 |
(ch >= 'A' && ch <= 'Z') || |
|
5002 |
(ch == '_' || ch == '$') || |
|
5003 |
(not_first_ch && ch >= '0' && ch <= '9')) { |
|
5004 |
last_is_slash = false; |
|
5005 |
continue; |
|
5006 |
} |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5007 |
if (slash_ok && ch == JVM_SIGNATURE_SLASH) { |
34666 | 5008 |
if (last_is_slash) { |
5009 |
return NULL; // Don't permit consecutive slashes |
|
5010 |
} |
|
5011 |
last_is_slash = true; |
|
5012 |
continue; |
|
5013 |
} |
|
5014 |
} |
|
5015 |
else { |
|
5016 |
jint unicode_ch; |
|
5017 |
char* tmp_p = UTF8::next_character(p, &unicode_ch); |
|
5018 |
p = tmp_p; |
|
5019 |
last_is_slash = false; |
|
5020 |
// Check if ch is Java identifier start or is Java identifier part |
|
5021 |
// 4672820: call java.lang.Character methods directly without generating separate tables. |
|
5022 |
EXCEPTION_MARK; |
|
5023 |
// return value |
|
5024 |
JavaValue result(T_BOOLEAN); |
|
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5025 |
// Set up the arguments to isJavaIdentifierStart or isJavaIdentifierPart |
34666 | 5026 |
JavaCallArguments args; |
5027 |
args.push_int(unicode_ch); |
|
5028 |
||
5029 |
if (not_first_ch) { |
|
5030 |
// public static boolean isJavaIdentifierPart(char ch); |
|
5031 |
JavaCalls::call_static(&result, |
|
5032 |
SystemDictionary::Character_klass(), |
|
5033 |
vmSymbols::isJavaIdentifierPart_name(), |
|
5034 |
vmSymbols::int_bool_signature(), |
|
5035 |
&args, |
|
5036 |
THREAD); |
|
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5037 |
} else { |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5038 |
// public static boolean isJavaIdentifierStart(char ch); |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5039 |
JavaCalls::call_static(&result, |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5040 |
SystemDictionary::Character_klass(), |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5041 |
vmSymbols::isJavaIdentifierStart_name(), |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5042 |
vmSymbols::int_bool_signature(), |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5043 |
&args, |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5044 |
THREAD); |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5045 |
} |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5046 |
if (HAS_PENDING_EXCEPTION) { |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5047 |
CLEAR_PENDING_EXCEPTION; |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5048 |
return NULL; |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5049 |
} |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5050 |
if(result.get_jboolean()) { |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5051 |
continue; |
34666 | 5052 |
} |
5053 |
} |
|
5054 |
return (not_first_ch) ? old_p : NULL; |
|
5055 |
} |
|
5056 |
return (not_first_ch) ? p : NULL; |
|
5057 |
} |
|
5058 |
||
53768
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
5059 |
// Take pointer to a UTF8 byte string (not NUL-terminated). |
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
5060 |
// Skip over the longest part of the string that could |
34666 | 5061 |
// be taken as a field signature. Allow "void" if void_ok. |
5062 |
// Return a pointer to just past the signature. |
|
5063 |
// Return NULL if no legal signature is found. |
|
5064 |
const char* ClassFileParser::skip_over_field_signature(const char* signature, |
|
5065 |
bool void_ok, |
|
5066 |
unsigned int length, |
|
5067 |
TRAPS) const { |
|
5068 |
unsigned int array_dim = 0; |
|
5069 |
while (length > 0) { |
|
5070 |
switch (signature[0]) { |
|
5071 |
case JVM_SIGNATURE_VOID: if (!void_ok) { return NULL; } |
|
5072 |
case JVM_SIGNATURE_BOOLEAN: |
|
5073 |
case JVM_SIGNATURE_BYTE: |
|
5074 |
case JVM_SIGNATURE_CHAR: |
|
5075 |
case JVM_SIGNATURE_SHORT: |
|
5076 |
case JVM_SIGNATURE_INT: |
|
5077 |
case JVM_SIGNATURE_FLOAT: |
|
5078 |
case JVM_SIGNATURE_LONG: |
|
5079 |
case JVM_SIGNATURE_DOUBLE: |
|
5080 |
return signature + 1; |
|
5081 |
case JVM_SIGNATURE_CLASS: { |
|
5082 |
if (_major_version < JAVA_1_5_VERSION) { |
|
5083 |
// Skip over the class name if one is there |
|
5084 |
const char* const p = skip_over_field_name(signature + 1, true, --length); |
|
5085 |
||
5086 |
// The next character better be a semicolon |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5087 |
if (p && (p - signature) > 1 && p[0] == JVM_SIGNATURE_ENDCLASS) { |
34666 | 5088 |
return p + 1; |
5089 |
} |
|
5090 |
} |
|
5091 |
else { |
|
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5092 |
// Skip leading 'L' and ignore first appearance of ';' |
34666 | 5093 |
signature++; |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5094 |
const char* c = (const char*) memchr(signature, JVM_SIGNATURE_ENDCLASS, length - 1); |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5095 |
// Format check signature |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5096 |
if (c != NULL) { |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5097 |
int newlen = c - (char*) signature; |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5098 |
bool legal = verify_unqualified_name(signature, newlen, LegalClass); |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5099 |
if (!legal) { |
55437
360f8769d3dc
8225789: Empty method parameter type should generate ClassFormatError
hseigel
parents:
55313
diff
changeset
|
5100 |
classfile_parse_error("Class name is empty or contains illegal character " |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5101 |
"in descriptor in class file %s", |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5102 |
CHECK_0); |
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5103 |
return NULL; |
34666 | 5104 |
} |
40920
8fcd156236e6
8161224: CONSTANT_NameAndType_info permits references to illegal names and descriptors
rprotacio
parents:
40633
diff
changeset
|
5105 |
return signature + newlen + 1; |
34666 | 5106 |
} |
5107 |
} |
|
5108 |
return NULL; |
|
5109 |
} |
|
5110 |
case JVM_SIGNATURE_ARRAY: |
|
5111 |
array_dim++; |
|
5112 |
if (array_dim > 255) { |
|
5113 |
// 4277370: array descriptor is valid only if it represents 255 or fewer dimensions. |
|
5114 |
classfile_parse_error("Array type descriptor has more than 255 dimensions in class file %s", CHECK_0); |
|
5115 |
} |
|
5116 |
// The rest of what's there better be a legal signature |
|
5117 |
signature++; |
|
5118 |
length--; |
|
5119 |
void_ok = false; |
|
5120 |
break; |
|
5121 |
default: |
|
5122 |
return NULL; |
|
5123 |
} |
|
5124 |
} |
|
5125 |
return NULL; |
|
5126 |
} |
|
5127 |
||
1 | 5128 |
// Checks if name is a legal class name. |
34666 | 5129 |
void ClassFileParser::verify_legal_class_name(const Symbol* name, TRAPS) const { |
1 | 5130 |
if (!_need_verify || _relax_verify) { return; } |
5131 |
||
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5132 |
assert(name->refcount() > 0, "symbol must be kept alive"); |
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5133 |
char* bytes = (char*)name->bytes(); |
1 | 5134 |
unsigned int length = name->utf8_length(); |
5135 |
bool legal = false; |
|
5136 |
||
5137 |
if (length > 0) { |
|
34666 | 5138 |
const char* p; |
1 | 5139 |
if (bytes[0] == JVM_SIGNATURE_ARRAY) { |
5140 |
p = skip_over_field_signature(bytes, false, length, CHECK); |
|
5141 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
5142 |
} else if (_major_version < JAVA_1_5_VERSION) { |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5143 |
if (bytes[0] != JVM_SIGNATURE_SPECIAL) { |
1 | 5144 |
p = skip_over_field_name(bytes, true, length); |
5145 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
5146 |
} |
|
5147 |
} else { |
|
5148 |
// 4900761: relax the constraints based on JSR202 spec |
|
5149 |
// Class names may be drawn from the entire Unicode character set. |
|
5150 |
// Identifiers between '/' must be unqualified names. |
|
5151 |
// The utf8 string has been verified when parsing cpool entries. |
|
5152 |
legal = verify_unqualified_name(bytes, length, LegalClass); |
|
5153 |
} |
|
5154 |
} |
|
5155 |
if (!legal) { |
|
5156 |
ResourceMark rm(THREAD); |
|
34666 | 5157 |
assert(_class_name != NULL, "invariant"); |
1 | 5158 |
Exceptions::fthrow( |
5159 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5160 |
vmSymbols::java_lang_ClassFormatError(), |
53768
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
5161 |
"Illegal class name \"%.*s\" in class file %s", length, bytes, |
1 | 5162 |
_class_name->as_C_string() |
5163 |
); |
|
5164 |
return; |
|
5165 |
} |
|
5166 |
} |
|
5167 |
||
5168 |
// Checks if name is a legal field name. |
|
34666 | 5169 |
void ClassFileParser::verify_legal_field_name(const Symbol* name, TRAPS) const { |
1 | 5170 |
if (!_need_verify || _relax_verify) { return; } |
5171 |
||
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5172 |
char* bytes = (char*)name->bytes(); |
1 | 5173 |
unsigned int length = name->utf8_length(); |
5174 |
bool legal = false; |
|
5175 |
||
5176 |
if (length > 0) { |
|
5177 |
if (_major_version < JAVA_1_5_VERSION) { |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5178 |
if (bytes[0] != JVM_SIGNATURE_SPECIAL) { |
34666 | 5179 |
const char* p = skip_over_field_name(bytes, false, length); |
1 | 5180 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
5181 |
} |
|
5182 |
} else { |
|
5183 |
// 4881221: relax the constraints based on JSR202 spec |
|
5184 |
legal = verify_unqualified_name(bytes, length, LegalField); |
|
5185 |
} |
|
5186 |
} |
|
5187 |
||
5188 |
if (!legal) { |
|
5189 |
ResourceMark rm(THREAD); |
|
34666 | 5190 |
assert(_class_name != NULL, "invariant"); |
1 | 5191 |
Exceptions::fthrow( |
5192 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5193 |
vmSymbols::java_lang_ClassFormatError(), |
53768
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
5194 |
"Illegal field name \"%.*s\" in class %s", length, bytes, |
1 | 5195 |
_class_name->as_C_string() |
5196 |
); |
|
5197 |
return; |
|
5198 |
} |
|
5199 |
} |
|
5200 |
||
5201 |
// Checks if name is a legal method name. |
|
34666 | 5202 |
void ClassFileParser::verify_legal_method_name(const Symbol* name, TRAPS) const { |
1 | 5203 |
if (!_need_verify || _relax_verify) { return; } |
5204 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5205 |
assert(name != NULL, "method name is null"); |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5206 |
char* bytes = (char*)name->bytes(); |
1 | 5207 |
unsigned int length = name->utf8_length(); |
5208 |
bool legal = false; |
|
5209 |
||
5210 |
if (length > 0) { |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5211 |
if (bytes[0] == JVM_SIGNATURE_SPECIAL) { |
1 | 5212 |
if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) { |
5213 |
legal = true; |
|
5214 |
} |
|
5215 |
} else if (_major_version < JAVA_1_5_VERSION) { |
|
34666 | 5216 |
const char* p; |
1 | 5217 |
p = skip_over_field_name(bytes, false, length); |
5218 |
legal = (p != NULL) && ((p - bytes) == (int)length); |
|
5219 |
} else { |
|
5220 |
// 4881221: relax the constraints based on JSR202 spec |
|
5221 |
legal = verify_unqualified_name(bytes, length, LegalMethod); |
|
5222 |
} |
|
5223 |
} |
|
5224 |
||
5225 |
if (!legal) { |
|
5226 |
ResourceMark rm(THREAD); |
|
34666 | 5227 |
assert(_class_name != NULL, "invariant"); |
1 | 5228 |
Exceptions::fthrow( |
5229 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7709
diff
changeset
|
5230 |
vmSymbols::java_lang_ClassFormatError(), |
53768
5f02b8c98b35
8218939: vm/mlvm/anonloader/stress/byteMutation crashed on windows
dholmes
parents:
53745
diff
changeset
|
5231 |
"Illegal method name \"%.*s\" in class %s", length, bytes, |
1 | 5232 |
_class_name->as_C_string() |
5233 |
); |
|
5234 |
return; |
|
5235 |
} |
|
5236 |
} |
|
5237 |
||
5238 |
||
5239 |
// Checks if signature is a legal field signature. |
|
34666 | 5240 |
void ClassFileParser::verify_legal_field_signature(const Symbol* name, |
5241 |
const Symbol* signature, |
|
5242 |
TRAPS) const { |
|
1 | 5243 |
if (!_need_verify) { return; } |
5244 |
||
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5245 |
const char* const bytes = (const char* const)signature->bytes(); |
34666 | 5246 |
const unsigned int length = signature->utf8_length(); |
5247 |
const char* const p = skip_over_field_signature(bytes, false, length, CHECK); |
|
1 | 5248 |
|
5249 |
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
|
5250 |
throwIllegalSignature("Field", name, signature, CHECK); |
1 | 5251 |
} |
5252 |
} |
|
5253 |
||
5254 |
// Checks if signature is a legal method signature. |
|
5255 |
// Returns number of parameters |
|
34666 | 5256 |
int ClassFileParser::verify_legal_method_signature(const Symbol* name, |
5257 |
const Symbol* signature, |
|
5258 |
TRAPS) const { |
|
1 | 5259 |
if (!_need_verify) { |
5260 |
// make sure caller's args_size will be less than 0 even for non-static |
|
5261 |
// method so it will be recomputed in compute_size_of_parameters(). |
|
5262 |
return -2; |
|
5263 |
} |
|
5264 |
||
33799
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5265 |
// Class initializers cannot have args for class format version >= 51. |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5266 |
if (name == vmSymbols::class_initializer_name() && |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5267 |
signature != vmSymbols::void_method_signature() && |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5268 |
_major_version >= JAVA_7_VERSION) { |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5269 |
throwIllegalSignature("Method", name, signature, CHECK_0); |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5270 |
return 0; |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5271 |
} |
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5272 |
|
1 | 5273 |
unsigned int args_size = 0; |
53728
675dbad7a9b0
8218675: Reduce verification overhead in ClassFileParser
redestad
parents:
53705
diff
changeset
|
5274 |
const char* p = (const char*)signature->bytes(); |
1 | 5275 |
unsigned int length = signature->utf8_length(); |
34666 | 5276 |
const char* nextp; |
1 | 5277 |
|
5278 |
// The first character must be a '(' |
|
5279 |
if ((length > 0) && (*p++ == JVM_SIGNATURE_FUNC)) { |
|
5280 |
length--; |
|
5281 |
// Skip over legal field signatures |
|
5282 |
nextp = skip_over_field_signature(p, false, length, CHECK_0); |
|
5283 |
while ((length > 0) && (nextp != NULL)) { |
|
5284 |
args_size++; |
|
5285 |
if (p[0] == 'J' || p[0] == 'D') { |
|
5286 |
args_size++; |
|
5287 |
} |
|
5288 |
length -= nextp - p; |
|
5289 |
p = nextp; |
|
5290 |
nextp = skip_over_field_signature(p, false, length, CHECK_0); |
|
5291 |
} |
|
5292 |
// The first non-signature thing better be a ')' |
|
5293 |
if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { |
|
5294 |
length--; |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5295 |
if (name->utf8_length() > 0 && name->char_at(0) == JVM_SIGNATURE_SPECIAL) { |
33799
77ebbd9b0ecc
8139164: JVM should throw ClassFormatError for non-void methods named <clinit>
hseigel
parents:
33612
diff
changeset
|
5296 |
// All internal methods must return void |
1 | 5297 |
if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { |
5298 |
return args_size; |
|
5299 |
} |
|
5300 |
} else { |
|
5301 |
// Now we better just have a return value |
|
5302 |
nextp = skip_over_field_signature(p, true, length, CHECK_0); |
|
5303 |
if (nextp && ((int)length == (nextp - p))) { |
|
5304 |
return args_size; |
|
5305 |
} |
|
5306 |
} |
|
5307 |
} |
|
5308 |
} |
|
5309 |
// Report error |
|
5709
3b5307e27c1d
6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases
kamg
parents:
5426
diff
changeset
|
5310 |
throwIllegalSignature("Method", name, signature, CHECK_0); |
1 | 5311 |
return 0; |
5312 |
} |
|
5313 |
||
34666 | 5314 |
int ClassFileParser::static_field_size() const { |
5315 |
assert(_field_info != NULL, "invariant"); |
|
5316 |
return _field_info->static_field_size; |
|
5317 |
} |
|
5318 |
||
5319 |
int ClassFileParser::total_oop_map_count() const { |
|
5320 |
assert(_field_info != NULL, "invariant"); |
|
5321 |
return _field_info->total_oop_map_count; |
|
5322 |
} |
|
5323 |
||
5324 |
jint ClassFileParser::layout_size() const { |
|
5325 |
assert(_field_info != NULL, "invariant"); |
|
5326 |
return _field_info->instance_size; |
|
5327 |
} |
|
5328 |
||
5329 |
static void check_methods_for_intrinsics(const InstanceKlass* ik, |
|
5330 |
const Array<Method*>* methods) { |
|
5331 |
assert(ik != NULL, "invariant"); |
|
5332 |
assert(methods != NULL, "invariant"); |
|
5333 |
||
5334 |
// Set up Method*::intrinsic_id as soon as we know the names of methods. |
|
5335 |
// (We used to do this lazily, but now we query it in Rewriter, |
|
5336 |
// which is eagerly done for every method, so we might as well do it now, |
|
5337 |
// when everything is fresh in memory.) |
|
5338 |
const vmSymbols::SID klass_id = Method::klass_id_for_intrinsics(ik); |
|
5339 |
||
5340 |
if (klass_id != vmSymbols::NO_SID) { |
|
5341 |
for (int j = 0; j < methods->length(); ++j) { |
|
5342 |
Method* method = methods->at(j); |
|
5343 |
method->init_intrinsic_id(); |
|
5344 |
||
5345 |
if (CheckIntrinsics) { |
|
5346 |
// Check if an intrinsic is defined for method 'method', |
|
5347 |
// but the method is not annotated with @HotSpotIntrinsicCandidate. |
|
5348 |
if (method->intrinsic_id() != vmIntrinsics::_none && |
|
5349 |
!method->intrinsic_candidate()) { |
|
5350 |
tty->print("Compiler intrinsic is defined for method [%s], " |
|
5351 |
"but the method is not annotated with @HotSpotIntrinsicCandidate.%s", |
|
5352 |
method->name_and_sig_as_C_string(), |
|
5353 |
NOT_DEBUG(" Method will not be inlined.") DEBUG_ONLY(" Exiting.") |
|
5354 |
); |
|
5355 |
tty->cr(); |
|
5356 |
DEBUG_ONLY(vm_exit(1)); |
|
5357 |
} |
|
5358 |
// Check is the method 'method' is annotated with @HotSpotIntrinsicCandidate, |
|
5359 |
// but there is no intrinsic available for it. |
|
5360 |
if (method->intrinsic_candidate() && |
|
5361 |
method->intrinsic_id() == vmIntrinsics::_none) { |
|
5362 |
tty->print("Method [%s] is annotated with @HotSpotIntrinsicCandidate, " |
|
5363 |
"but no compiler intrinsic is defined for the method.%s", |
|
5364 |
method->name_and_sig_as_C_string(), |
|
5365 |
NOT_DEBUG("") DEBUG_ONLY(" Exiting.") |
|
5366 |
); |
|
5367 |
tty->cr(); |
|
5368 |
DEBUG_ONLY(vm_exit(1)); |
|
5369 |
} |
|
1 | 5370 |
} |
34666 | 5371 |
} // end for |
5372 |
||
5373 |
#ifdef ASSERT |
|
5374 |
if (CheckIntrinsics) { |
|
5375 |
// Check for orphan methods in the current class. A method m |
|
5376 |
// of a class C is orphan if an intrinsic is defined for method m, |
|
5377 |
// but class C does not declare m. |
|
5378 |
// The check is potentially expensive, therefore it is available |
|
5379 |
// only in debug builds. |
|
5380 |
||
5381 |
for (int id = vmIntrinsics::FIRST_ID; id < (int)vmIntrinsics::ID_LIMIT; ++id) { |
|
5382 |
if (vmIntrinsics::_compiledLambdaForm == id) { |
|
5383 |
// The _compiledLamdbdaForm intrinsic is a special marker for bytecode |
|
5384 |
// generated for the JVM from a LambdaForm and therefore no method |
|
5385 |
// is defined for it. |
|
5386 |
continue; |
|
5387 |
} |
|
5388 |
||
5389 |
if (vmIntrinsics::class_for(vmIntrinsics::ID_from(id)) == klass_id) { |
|
5390 |
// Check if the current class contains a method with the same |
|
5391 |
// name, flags, signature. |
|
5392 |
bool match = false; |
|
5393 |
for (int j = 0; j < methods->length(); ++j) { |
|
5394 |
const Method* method = methods->at(j); |
|
5395 |
if (method->intrinsic_id() == id) { |
|
5396 |
match = true; |
|
5397 |
break; |
|
5398 |
} |
|
5399 |
} |
|
5400 |
||
5401 |
if (!match) { |
|
5402 |
char buf[1000]; |
|
5403 |
tty->print("Compiler intrinsic is defined for method [%s], " |
|
5404 |
"but the method is not available in class [%s].%s", |
|
5405 |
vmIntrinsics::short_name_as_C_string(vmIntrinsics::ID_from(id), |
|
5406 |
buf, sizeof(buf)), |
|
5407 |
ik->name()->as_C_string(), |
|
5408 |
NOT_DEBUG("") DEBUG_ONLY(" Exiting.") |
|
5409 |
); |
|
5410 |
tty->cr(); |
|
5411 |
DEBUG_ONLY(vm_exit(1)); |
|
5412 |
} |
|
5413 |
} |
|
5414 |
} // end for |
|
5415 |
} // CheckIntrinsics |
|
5416 |
#endif // ASSERT |
|
5417 |
} |
|
5418 |
} |
|
5419 |
||
36508 | 5420 |
InstanceKlass* ClassFileParser::create_instance_klass(bool changed_by_loadhook, TRAPS) { |
34666 | 5421 |
if (_klass != NULL) { |
5422 |
return _klass; |
|
5423 |
} |
|
5424 |
||
5425 |
InstanceKlass* const ik = |
|
5426 |
InstanceKlass::allocate_instance_klass(*this, CHECK_NULL); |
|
5427 |
||
36508 | 5428 |
fill_instance_klass(ik, changed_by_loadhook, CHECK_NULL); |
34666 | 5429 |
|
5430 |
assert(_klass == ik, "invariant"); |
|
5431 |
||
52692
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5432 |
|
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5433 |
if (ik->should_store_fingerprint()) { |
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5434 |
ik->store_fingerprint(_stream->compute_fingerprint()); |
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5435 |
} |
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5436 |
|
42650 | 5437 |
ik->set_has_passed_fingerprint_check(false); |
5438 |
if (UseAOT && ik->supers_have_passed_fingerprint_checks()) { |
|
5439 |
uint64_t aot_fp = AOTLoader::get_saved_fingerprint(ik); |
|
52692
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5440 |
uint64_t fp = ik->has_stored_fingerprint() ? ik->get_stored_fingerprint() : _stream->compute_fingerprint(); |
bffef37beacb
8213259: [AOT] AOTing java.base fails with "java.lang.AssertionError: no fingerprint for Ljdk/internal/event/Event"
dlong
parents:
52431
diff
changeset
|
5441 |
if (aot_fp != 0 && aot_fp == fp) { |
42650 | 5442 |
// This class matches with a class saved in an AOT library |
5443 |
ik->set_has_passed_fingerprint_check(true); |
|
5444 |
} else { |
|
5445 |
ResourceMark rm; |
|
5446 |
log_info(class, fingerprint)("%s : expected = " PTR64_FORMAT " actual = " PTR64_FORMAT, |
|
5447 |
ik->external_name(), aot_fp, _stream->compute_fingerprint()); |
|
5448 |
} |
|
5449 |
} |
|
5450 |
||
34666 | 5451 |
return ik; |
5452 |
} |
|
5453 |
||
36508 | 5454 |
void ClassFileParser::fill_instance_klass(InstanceKlass* ik, bool changed_by_loadhook, TRAPS) { |
34666 | 5455 |
assert(ik != NULL, "invariant"); |
5456 |
||
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5457 |
// Set name and CLD before adding to CLD |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5458 |
ik->set_class_loader_data(_loader_data); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5459 |
ik->set_name(_class_name); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5460 |
|
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5461 |
// Add all classes to our internal class loader list here, |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5462 |
// including classes in the bootstrap (NULL) class loader. |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5463 |
const bool publicize = !is_internal(); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5464 |
|
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5465 |
_loader_data->add_class(ik, publicize); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
5466 |
|
34666 | 5467 |
set_klass_to_deallocate(ik); |
5468 |
||
5469 |
assert(_field_info != NULL, "invariant"); |
|
5470 |
assert(ik->static_field_size() == _field_info->static_field_size, "sanity"); |
|
5471 |
assert(ik->nonstatic_oop_map_count() == _field_info->total_oop_map_count, |
|
5472 |
"sanity"); |
|
5473 |
||
5474 |
assert(ik->is_instance_klass(), "sanity"); |
|
5475 |
assert(ik->size_helper() == _field_info->instance_size, "sanity"); |
|
5476 |
||
5477 |
// Fill in information already parsed |
|
5478 |
ik->set_should_verify_class(_need_verify); |
|
5479 |
||
5480 |
// Not yet: supers are done below to support the new subtype-checking fields |
|
5481 |
ik->set_nonstatic_field_size(_field_info->nonstatic_field_size); |
|
5482 |
ik->set_has_nonstatic_fields(_field_info->has_nonstatic_fields); |
|
5483 |
assert(_fac != NULL, "invariant"); |
|
5484 |
ik->set_static_oop_field_count(_fac->count[STATIC_OOP]); |
|
5485 |
||
5486 |
// this transfers ownership of a lot of arrays from |
|
5487 |
// the parser onto the InstanceKlass* |
|
5488 |
apply_parsed_class_metadata(ik, _java_fields_count, CHECK); |
|
5489 |
||
5490 |
// note that is not safe to use the fields in the parser from this point on |
|
5491 |
assert(NULL == _cp, "invariant"); |
|
5492 |
assert(NULL == _fields, "invariant"); |
|
5493 |
assert(NULL == _methods, "invariant"); |
|
5494 |
assert(NULL == _inner_classes, "invariant"); |
|
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5495 |
assert(NULL == _nest_members, "invariant"); |
34666 | 5496 |
assert(NULL == _local_interfaces, "invariant"); |
5497 |
assert(NULL == _combined_annotations, "invariant"); |
|
5498 |
||
5499 |
if (_has_final_method) { |
|
5500 |
ik->set_has_final_method(); |
|
5501 |
} |
|
5502 |
||
5503 |
ik->copy_method_ordering(_method_ordering, CHECK); |
|
5504 |
// The InstanceKlass::_methods_jmethod_ids cache |
|
5505 |
// is managed on the assumption that the initial cache |
|
5506 |
// size is equal to the number of methods in the class. If |
|
5507 |
// that changes, then InstanceKlass::idnum_can_increment() |
|
5508 |
// has to be changed accordingly. |
|
5509 |
ik->set_initial_method_idnum(ik->methods()->length()); |
|
5510 |
||
49677 | 5511 |
ik->set_this_class_index(_this_class_index); |
5512 |
||
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5513 |
if (is_unsafe_anonymous()) { |
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5514 |
// _this_class_index is a CONSTANT_Class entry that refers to this |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5515 |
// anonymous class itself. If this class needs to refer to its own methods or |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5516 |
// fields, it would use a CONSTANT_MethodRef, etc, which would reference |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5517 |
// _this_class_index. However, because this class is anonymous (it's |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5518 |
// not stored in SystemDictionary), _this_class_index cannot be resolved |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5519 |
// with ConstantPool::klass_at_impl, which does a SystemDictionary lookup. |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5520 |
// Therefore, we must eagerly resolve _this_class_index now. |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5521 |
ik->constants()->klass_at_put(_this_class_index, ik); |
34666 | 5522 |
} |
5523 |
||
5524 |
ik->set_minor_version(_minor_version); |
|
5525 |
ik->set_major_version(_major_version); |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5526 |
ik->set_has_nonstatic_concrete_methods(_has_nonstatic_concrete_methods); |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5527 |
ik->set_declares_nonstatic_concrete_methods(_declares_nonstatic_concrete_methods); |
34666 | 5528 |
|
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5529 |
if (_unsafe_anonymous_host != NULL) { |
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5530 |
assert (ik->is_unsafe_anonymous(), "should be the same"); |
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5531 |
ik->set_unsafe_anonymous_host(_unsafe_anonymous_host); |
34666 | 5532 |
} |
5533 |
||
36508 | 5534 |
// Set PackageEntry for this_klass |
5535 |
oop cl = ik->class_loader(); |
|
5536 |
Handle clh = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(cl)); |
|
5537 |
ClassLoaderData* cld = ClassLoaderData::class_loader_data_or_null(clh()); |
|
5538 |
ik->set_package(cld, CHECK); |
|
5539 |
||
34666 | 5540 |
const Array<Method*>* const methods = ik->methods(); |
5541 |
assert(methods != NULL, "invariant"); |
|
5542 |
const int methods_len = methods->length(); |
|
5543 |
||
5544 |
check_methods_for_intrinsics(ik, methods); |
|
5545 |
||
5546 |
// Fill in field values obtained by parse_classfile_attributes |
|
5547 |
if (_parsed_annotations->has_any_annotations()) { |
|
5548 |
_parsed_annotations->apply_to(ik); |
|
5549 |
} |
|
5550 |
||
5551 |
apply_parsed_class_attributes(ik); |
|
5552 |
||
5553 |
// Miranda methods |
|
5554 |
if ((_num_miranda_methods > 0) || |
|
5555 |
// if this class introduced new miranda methods or |
|
5556 |
(_super_klass != NULL && _super_klass->has_miranda_methods()) |
|
5557 |
// super class exists and this class inherited miranda methods |
|
5558 |
) { |
|
5559 |
ik->set_has_miranda_methods(); // then set a flag |
|
5560 |
} |
|
5561 |
||
5562 |
// Fill in information needed to compute superclasses. |
|
49948
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
5563 |
ik->initialize_supers(const_cast<InstanceKlass*>(_super_klass), _transitive_interfaces, CHECK); |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
5564 |
ik->set_transitive_interfaces(_transitive_interfaces); |
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
5565 |
_transitive_interfaces = NULL; |
34666 | 5566 |
|
5567 |
// Initialize itable offset tables |
|
5568 |
klassItable::setup_itable_offset_table(ik); |
|
5569 |
||
5570 |
// Compute transitive closure of interfaces this class implements |
|
5571 |
// Do final class setup |
|
5572 |
fill_oop_maps(ik, |
|
5573 |
_field_info->nonstatic_oop_map_count, |
|
5574 |
_field_info->nonstatic_oop_offsets, |
|
5575 |
_field_info->nonstatic_oop_counts); |
|
5576 |
||
5577 |
// Fill in has_finalizer, has_vanilla_constructor, and layout_helper |
|
5578 |
set_precomputed_flags(ik); |
|
5579 |
||
5580 |
// check if this class can access its super class |
|
5581 |
check_super_class_access(ik, CHECK); |
|
5582 |
||
5583 |
// check if this class can access its superinterfaces |
|
5584 |
check_super_interface_access(ik, CHECK); |
|
5585 |
||
5586 |
// check if this class overrides any final method |
|
5587 |
check_final_method_override(ik, CHECK); |
|
5588 |
||
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5589 |
// reject static interface methods prior to Java 8 |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5590 |
if (ik->is_interface() && _major_version < JAVA_8_VERSION) { |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5591 |
check_illegal_static_method(ik, CHECK); |
1 | 5592 |
} |
34666 | 5593 |
|
36508 | 5594 |
// Obtain this_klass' module entry |
5595 |
ModuleEntry* module_entry = ik->module(); |
|
5596 |
assert(module_entry != NULL, "module_entry should always be set"); |
|
5597 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44243
diff
changeset
|
5598 |
// Obtain java.lang.Module |
46773
fb17cc9a6847
8185717: Make ModuleEntry->module() return an oop not a jobject
hseigel
parents:
46727
diff
changeset
|
5599 |
Handle module_handle(THREAD, module_entry->module()); |
36508 | 5600 |
|
34666 | 5601 |
// Allocate mirror and initialize static fields |
5602 |
// The create_mirror() call will also call compute_modifiers() |
|
5603 |
java_lang_Class::create_mirror(ik, |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46262
diff
changeset
|
5604 |
Handle(THREAD, _loader_data->class_loader()), |
36508 | 5605 |
module_handle, |
34666 | 5606 |
_protection_domain, |
5607 |
CHECK); |
|
5608 |
||
5609 |
assert(_all_mirandas != NULL, "invariant"); |
|
5610 |
||
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5611 |
// Generate any default methods - default methods are public interface methods |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5612 |
// that have a default implementation. This is new with Java 8. |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5613 |
if (_has_nonstatic_concrete_methods) { |
34666 | 5614 |
DefaultMethods::generate_default_methods(ik, |
5615 |
_all_mirandas, |
|
5616 |
CHECK); |
|
5617 |
} |
|
5618 |
||
36508 | 5619 |
// Add read edges to the unnamed modules of the bootstrap and app class loaders. |
5620 |
if (changed_by_loadhook && !module_handle.is_null() && module_entry->is_named() && |
|
5621 |
!module_entry->has_default_read_edges()) { |
|
5622 |
if (!module_entry->set_has_default_read_edges()) { |
|
5623 |
// We won a potential race |
|
5624 |
JvmtiExport::add_default_read_edges(module_handle, THREAD); |
|
5625 |
} |
|
5626 |
} |
|
5627 |
||
34666 | 5628 |
ClassLoadingService::notify_class_loaded(ik, false /* not shared class */); |
5629 |
||
5630 |
if (!is_internal()) { |
|
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38147
diff
changeset
|
5631 |
if (log_is_enabled(Info, class, load)) { |
36508 | 5632 |
ResourceMark rm; |
39277
460f34bbd0c0
8157490: JCK test vm/jni/DefineClass/dfcl001/dfcl00101m1/dfcl00101m1 crashes when run with -Xlog:classload=info
mockner
parents:
39218
diff
changeset
|
5633 |
const char* module_name = (module_entry->name() == NULL) ? UNNAMED_MODULE : module_entry->name()->as_C_string(); |
46444
677be3444372
8154791: Xlog classload too redundant msgs info/debug
rprotacio
parents:
46427
diff
changeset
|
5634 |
ik->print_class_load_logging(_loader_data, module_name, _stream); |
34666 | 5635 |
} |
5636 |
||
49716 | 5637 |
if (ik->minor_version() == JAVA_PREVIEW_MINOR_VERSION && |
55313
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
5638 |
ik->major_version() == JVM_CLASSFILE_MAJOR_VERSION && |
49716 | 5639 |
log_is_enabled(Info, class, preview)) { |
5640 |
ResourceMark rm; |
|
52945
de85ab85fbc7
8215165: Improve -Xlog:class+preview message text
hseigel
parents:
52692
diff
changeset
|
5641 |
log_info(class, preview)("Loading class %s that depends on preview features (class file version %d.65535)", |
55313
f72f801b00bd
8224952: RI deviates from JVMS - non-zero minor_version for class files throws UnsupportedClassVersionError.
hseigel
parents:
54847
diff
changeset
|
5642 |
ik->external_name(), JVM_CLASSFILE_MAJOR_VERSION); |
49716 | 5643 |
} |
5644 |
||
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38147
diff
changeset
|
5645 |
if (log_is_enabled(Debug, class, resolve)) { |
34666 | 5646 |
ResourceMark rm; |
5647 |
// print out the superclass. |
|
5648 |
const char * from = ik->external_name(); |
|
5649 |
if (ik->java_super() != NULL) { |
|
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38147
diff
changeset
|
5650 |
log_debug(class, resolve)("%s %s (super)", |
34666 | 5651 |
from, |
5652 |
ik->java_super()->external_name()); |
|
1 | 5653 |
} |
34666 | 5654 |
// print out each of the interface classes referred to by this class. |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
5655 |
const Array<InstanceKlass*>* const local_interfaces = ik->local_interfaces(); |
34666 | 5656 |
if (local_interfaces != NULL) { |
5657 |
const int length = local_interfaces->length(); |
|
5658 |
for (int i = 0; i < length; i++) { |
|
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
5659 |
const InstanceKlass* const k = local_interfaces->at(i); |
34666 | 5660 |
const char * to = k->external_name(); |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38147
diff
changeset
|
5661 |
log_debug(class, resolve)("%s %s (interface)", from, to); |
1 | 5662 |
} |
5663 |
} |
|
5664 |
} |
|
5665 |
} |
|
34666 | 5666 |
|
50113 | 5667 |
JFR_ONLY(INIT_ID(ik);) |
34666 | 5668 |
|
5669 |
// If we reach here, all is well. |
|
5670 |
// Now remove the InstanceKlass* from the _klass_to_deallocate field |
|
5671 |
// in order for it to not be destroyed in the ClassFileParser destructor. |
|
5672 |
set_klass_to_deallocate(NULL); |
|
5673 |
||
5674 |
// it's official |
|
5675 |
set_klass(ik); |
|
5676 |
||
5677 |
debug_only(ik->verify();) |
|
5678 |
} |
|
5679 |
||
53705
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5680 |
void ClassFileParser::update_class_name(Symbol* new_class_name) { |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5681 |
// Decrement the refcount in the old name, since we're clobbering it. |
53739
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5682 |
_class_name->decrement_refcount(); |
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5683 |
|
53705
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5684 |
_class_name = new_class_name; |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5685 |
// Increment the refcount of the new name. |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5686 |
// Now the ClassFileParser owns this name and will decrement in |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5687 |
// the destructor. |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5688 |
_class_name->increment_refcount(); |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5689 |
} |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5690 |
|
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5691 |
|
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5692 |
// For an unsafe anonymous class that is in the unnamed package, move it to its host class's |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5693 |
// package by prepending its host class's package name to its class name and setting |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5694 |
// its _class_name field. |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5695 |
void ClassFileParser::prepend_host_package_name(const InstanceKlass* unsafe_anonymous_host, TRAPS) { |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5696 |
ResourceMark rm(THREAD); |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5697 |
assert(strrchr(_class_name->as_C_string(), JVM_SIGNATURE_SLASH) == NULL, |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5698 |
"Unsafe anonymous class should not be in a package"); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5699 |
const char* host_pkg_name = |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5700 |
ClassLoader::package_from_name(unsafe_anonymous_host->name()->as_C_string(), NULL); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5701 |
|
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5702 |
if (host_pkg_name != NULL) { |
53882
ca682d9d8db5
8214777: Avoid some GCC 8.X strncpy() errors in HotSpot
mikael
parents:
53768
diff
changeset
|
5703 |
int host_pkg_len = (int)strlen(host_pkg_name); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5704 |
int class_name_len = _class_name->utf8_length(); |
53882
ca682d9d8db5
8214777: Avoid some GCC 8.X strncpy() errors in HotSpot
mikael
parents:
53768
diff
changeset
|
5705 |
int symbol_len = host_pkg_len + 1 + class_name_len; |
ca682d9d8db5
8214777: Avoid some GCC 8.X strncpy() errors in HotSpot
mikael
parents:
53768
diff
changeset
|
5706 |
char* new_anon_name = NEW_RESOURCE_ARRAY(char, symbol_len + 1); |
53908
45a23c64d0f6
8219583: Windows build failure after JDK-8214777 (Avoid some GCC 8.X strncpy() errors in HotSpot)
shade
parents:
53882
diff
changeset
|
5707 |
int n = os::snprintf(new_anon_name, symbol_len + 1, "%s/%.*s", |
45a23c64d0f6
8219583: Windows build failure after JDK-8214777 (Avoid some GCC 8.X strncpy() errors in HotSpot)
shade
parents:
53882
diff
changeset
|
5708 |
host_pkg_name, class_name_len, _class_name->base()); |
53882
ca682d9d8db5
8214777: Avoid some GCC 8.X strncpy() errors in HotSpot
mikael
parents:
53768
diff
changeset
|
5709 |
assert(n == symbol_len, "Unexpected number of characters in string"); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5710 |
|
53739
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5711 |
// Decrement old _class_name to avoid leaking. |
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5712 |
_class_name->decrement_refcount(); |
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5713 |
|
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5714 |
// Create a symbol and update the anonymous class name. |
53739
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5715 |
// The new class name is created with a refcount of one. When installed into the InstanceKlass, |
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5716 |
// it'll be two and when the ClassFileParser destructor runs, it'll go back to one and get deleted |
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5717 |
// when the class is unloaded. |
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54595
diff
changeset
|
5718 |
_class_name = SymbolTable::new_symbol(new_anon_name, symbol_len); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5719 |
} |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5720 |
} |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5721 |
|
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5722 |
// If the host class and the anonymous class are in the same package then do |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5723 |
// nothing. If the anonymous class is in the unnamed package then move it to its |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5724 |
// host's package. If the classes are in different packages then throw an IAE |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5725 |
// exception. |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5726 |
void ClassFileParser::fix_unsafe_anonymous_class_name(TRAPS) { |
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5727 |
assert(_unsafe_anonymous_host != NULL, "Expected an unsafe anonymous class"); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5728 |
|
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
5729 |
const jbyte* anon_last_slash = UTF8::strrchr((const jbyte*)_class_name->base(), |
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
5730 |
_class_name->utf8_length(), JVM_SIGNATURE_SLASH); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5731 |
if (anon_last_slash == NULL) { // Unnamed package |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5732 |
prepend_host_package_name(_unsafe_anonymous_host, CHECK); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5733 |
} else { |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5734 |
if (!_unsafe_anonymous_host->is_same_class_package(_unsafe_anonymous_host->class_loader(), _class_name)) { |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5735 |
ResourceMark rm(THREAD); |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5736 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5737 |
err_msg("Host class %s and anonymous class %s are in different packages", |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5738 |
_unsafe_anonymous_host->name()->as_C_string(), _class_name->as_C_string())); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5739 |
} |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5740 |
} |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5741 |
} |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
5742 |
|
40856
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5743 |
static bool relax_format_check_for(ClassLoaderData* loader_data) { |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5744 |
bool trusted = (loader_data->is_the_null_class_loader_data() || |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5745 |
SystemDictionary::is_platform_class_loader(loader_data->class_loader())); |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5746 |
bool need_verify = |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5747 |
// verifyAll |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5748 |
(BytecodeVerificationLocal && BytecodeVerificationRemote) || |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5749 |
// verifyRemote |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5750 |
(!BytecodeVerificationLocal && BytecodeVerificationRemote && !trusted); |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5751 |
return !need_verify; |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5752 |
} |
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5753 |
|
34666 | 5754 |
ClassFileParser::ClassFileParser(ClassFileStream* stream, |
5755 |
Symbol* name, |
|
5756 |
ClassLoaderData* loader_data, |
|
5757 |
Handle protection_domain, |
|
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5758 |
const InstanceKlass* unsafe_anonymous_host, |
34666 | 5759 |
GrowableArray<Handle>* cp_patches, |
5760 |
Publicity pub_level, |
|
5761 |
TRAPS) : |
|
5762 |
_stream(stream), |
|
5763 |
_requested_name(name), |
|
53705
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5764 |
_class_name(NULL), |
34666 | 5765 |
_loader_data(loader_data), |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
5766 |
_unsafe_anonymous_host(unsafe_anonymous_host), |
34666 | 5767 |
_cp_patches(cp_patches), |
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5768 |
_num_patched_klasses(0), |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5769 |
_max_num_patched_klasses(0), |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5770 |
_orig_cp_size(0), |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5771 |
_first_patched_klass_resolved_index(0), |
34666 | 5772 |
_super_klass(), |
5773 |
_cp(NULL), |
|
5774 |
_fields(NULL), |
|
5775 |
_methods(NULL), |
|
5776 |
_inner_classes(NULL), |
|
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5777 |
_nest_members(NULL), |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5778 |
_nest_host(0), |
34666 | 5779 |
_local_interfaces(NULL), |
5780 |
_transitive_interfaces(NULL), |
|
5781 |
_combined_annotations(NULL), |
|
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5782 |
_class_annotations(NULL), |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5783 |
_class_type_annotations(NULL), |
34666 | 5784 |
_fields_annotations(NULL), |
5785 |
_fields_type_annotations(NULL), |
|
5786 |
_klass(NULL), |
|
5787 |
_klass_to_deallocate(NULL), |
|
5788 |
_parsed_annotations(NULL), |
|
5789 |
_fac(NULL), |
|
5790 |
_field_info(NULL), |
|
5791 |
_method_ordering(NULL), |
|
5792 |
_all_mirandas(NULL), |
|
5793 |
_vtable_size(0), |
|
5794 |
_itable_size(0), |
|
5795 |
_num_miranda_methods(0), |
|
5796 |
_rt(REF_NONE), |
|
5797 |
_protection_domain(protection_domain), |
|
5798 |
_access_flags(), |
|
5799 |
_pub_level(pub_level), |
|
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
5800 |
_bad_constant_seen(0), |
34666 | 5801 |
_synthetic_flag(false), |
5802 |
_sde_length(false), |
|
5803 |
_sde_buffer(NULL), |
|
5804 |
_sourcefile_index(0), |
|
5805 |
_generic_signature_index(0), |
|
5806 |
_major_version(0), |
|
5807 |
_minor_version(0), |
|
5808 |
_this_class_index(0), |
|
5809 |
_super_class_index(0), |
|
5810 |
_itfs_len(0), |
|
5811 |
_java_fields_count(0), |
|
5812 |
_need_verify(false), |
|
5813 |
_relax_verify(false), |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5814 |
_has_nonstatic_concrete_methods(false), |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
5815 |
_declares_nonstatic_concrete_methods(false), |
34666 | 5816 |
_has_final_method(false), |
5817 |
_has_finalizer(false), |
|
5818 |
_has_empty_finalizer(false), |
|
5819 |
_has_vanilla_constructor(false), |
|
5820 |
_max_bootstrap_specifier_index(-1) { |
|
5821 |
||
53739
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5822 |
_class_name = name != NULL ? name : vmSymbols::unknown_class_name(); |
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
5823 |
_class_name->increment_refcount(); |
34666 | 5824 |
|
5825 |
assert(THREAD->is_Java_thread(), "invariant"); |
|
5826 |
assert(_loader_data != NULL, "invariant"); |
|
5827 |
assert(stream != NULL, "invariant"); |
|
5828 |
assert(_stream != NULL, "invariant"); |
|
5829 |
assert(_stream->buffer() == _stream->current(), "invariant"); |
|
5830 |
assert(_class_name != NULL, "invariant"); |
|
5831 |
assert(0 == _access_flags.as_int(), "invariant"); |
|
5832 |
||
5833 |
// Figure out whether we can skip format checking (matching classic VM behavior) |
|
5834 |
if (DumpSharedSpaces) { |
|
5835 |
// verify == true means it's a 'remote' class (i.e., non-boot class) |
|
5836 |
// Verification decision is based on BytecodeVerificationRemote flag |
|
5837 |
// for those classes. |
|
5838 |
_need_verify = (stream->need_verify()) ? BytecodeVerificationRemote : |
|
5839 |
BytecodeVerificationLocal; |
|
5840 |
} |
|
5841 |
else { |
|
5842 |
_need_verify = Verifier::should_verify_for(_loader_data->class_loader(), |
|
5843 |
stream->need_verify()); |
|
5844 |
} |
|
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5845 |
if (_cp_patches != NULL) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5846 |
int len = _cp_patches->length(); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5847 |
for (int i=0; i<len; i++) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5848 |
if (has_cp_patch_at(i)) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5849 |
Handle patch = cp_patch_at(i); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5850 |
if (java_lang_String::is_instance(patch()) || java_lang_Class::is_instance(patch())) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5851 |
// We need to append the names of the patched classes to the end of the constant pool, |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5852 |
// because a patched class may have a Utf8 name that's not already included in the |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5853 |
// original constant pool. These class names are used when patch_constant_pool() |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5854 |
// calls patch_class(). |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5855 |
// |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5856 |
// Note that a String in cp_patch_at(i) may be used to patch a Utf8, a String, or a Class. |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5857 |
// At this point, we don't know the tag for index i yet, because we haven't parsed the |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5858 |
// constant pool. So we can only assume the worst -- every String is used to patch a Class. |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5859 |
_max_num_patched_klasses++; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5860 |
} |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5861 |
} |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5862 |
} |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5863 |
} |
34666 | 5864 |
|
5865 |
// synch back verification state to stream |
|
5866 |
stream->set_verify(_need_verify); |
|
5867 |
||
5868 |
// Check if verification needs to be relaxed for this class file |
|
5869 |
// Do not restrict it to jdk1.0 or jdk1.1 to maintain backward compatibility (4982376) |
|
40856
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40633
diff
changeset
|
5870 |
_relax_verify = relax_format_check_for(_loader_data); |
34666 | 5871 |
|
5872 |
parse_stream(stream, CHECK); |
|
5873 |
||
5874 |
post_process_parsed_stream(stream, _cp, CHECK); |
|
5875 |
} |
|
5876 |
||
5877 |
void ClassFileParser::clear_class_metadata() { |
|
5878 |
// metadata created before the instance klass is created. Must be |
|
5879 |
// deallocated if classfile parsing returns an error. |
|
5880 |
_cp = NULL; |
|
5881 |
_fields = NULL; |
|
5882 |
_methods = NULL; |
|
5883 |
_inner_classes = NULL; |
|
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5884 |
_nest_members = NULL; |
34666 | 5885 |
_local_interfaces = NULL; |
5886 |
_combined_annotations = NULL; |
|
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5887 |
_class_annotations = _class_type_annotations = NULL; |
34666 | 5888 |
_fields_annotations = _fields_type_annotations = NULL; |
5889 |
} |
|
5890 |
||
5891 |
// Destructor to clean up |
|
5892 |
ClassFileParser::~ClassFileParser() { |
|
53705
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5893 |
_class_name->decrement_refcount(); |
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
5894 |
|
34666 | 5895 |
if (_cp != NULL) { |
5896 |
MetadataFactory::free_metadata(_loader_data, _cp); |
|
5897 |
} |
|
5898 |
if (_fields != NULL) { |
|
5899 |
MetadataFactory::free_array<u2>(_loader_data, _fields); |
|
5900 |
} |
|
5901 |
||
5902 |
if (_methods != NULL) { |
|
5903 |
// Free methods |
|
5904 |
InstanceKlass::deallocate_methods(_loader_data, _methods); |
|
5905 |
} |
|
5906 |
||
5907 |
// beware of the Universe::empty_blah_array!! |
|
5908 |
if (_inner_classes != NULL && _inner_classes != Universe::the_empty_short_array()) { |
|
5909 |
MetadataFactory::free_array<u2>(_loader_data, _inner_classes); |
|
5910 |
} |
|
5911 |
||
50735
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5912 |
if (_nest_members != NULL && _nest_members != Universe::the_empty_short_array()) { |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5913 |
MetadataFactory::free_array<u2>(_loader_data, _nest_members); |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5914 |
} |
2f2af62dfac7
8010319: Implementation of JEP 181: Nest-Based Access Control
dholmes
parents:
50634
diff
changeset
|
5915 |
|
34666 | 5916 |
// Free interfaces |
5917 |
InstanceKlass::deallocate_interfaces(_loader_data, _super_klass, |
|
5918 |
_local_interfaces, _transitive_interfaces); |
|
5919 |
||
5920 |
if (_combined_annotations != NULL) { |
|
5921 |
// After all annotations arrays have been created, they are installed into the |
|
5922 |
// Annotations object that will be assigned to the InstanceKlass being created. |
|
5923 |
||
5924 |
// Deallocate the Annotations object and the installed annotations arrays. |
|
5925 |
_combined_annotations->deallocate_contents(_loader_data); |
|
5926 |
||
5927 |
// If the _combined_annotations pointer is non-NULL, |
|
5928 |
// then the other annotations fields should have been cleared. |
|
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5929 |
assert(_class_annotations == NULL, "Should have been cleared"); |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5930 |
assert(_class_type_annotations == NULL, "Should have been cleared"); |
34666 | 5931 |
assert(_fields_annotations == NULL, "Should have been cleared"); |
5932 |
assert(_fields_type_annotations == NULL, "Should have been cleared"); |
|
5933 |
} else { |
|
5934 |
// If the annotations arrays were not installed into the Annotations object, |
|
5935 |
// then they have to be deallocated explicitly. |
|
58221
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5936 |
MetadataFactory::free_array<u1>(_loader_data, _class_annotations); |
b73753eff8b7
8066774: Rename the annotations arrays names in ClassFileParser
godin
parents:
55439
diff
changeset
|
5937 |
MetadataFactory::free_array<u1>(_loader_data, _class_type_annotations); |
34666 | 5938 |
Annotations::free_contents(_loader_data, _fields_annotations); |
5939 |
Annotations::free_contents(_loader_data, _fields_type_annotations); |
|
5940 |
} |
|
5941 |
||
5942 |
clear_class_metadata(); |
|
49948
ff8dbb56740a
8200466: Revisit the setting of _transitive_interfaces in InstanceKlass
ccheung
parents:
49716
diff
changeset
|
5943 |
_transitive_interfaces = NULL; |
34666 | 5944 |
|
5945 |
// deallocate the klass if already created. Don't directly deallocate, but add |
|
5946 |
// to the deallocate list so that the klass is removed from the CLD::_klasses list |
|
5947 |
// at a safepoint. |
|
5948 |
if (_klass_to_deallocate != NULL) { |
|
5949 |
_loader_data->add_to_deallocate_list(_klass_to_deallocate); |
|
5950 |
} |
|
1 | 5951 |
} |
5952 |
||
34666 | 5953 |
void ClassFileParser::parse_stream(const ClassFileStream* const stream, |
5954 |
TRAPS) { |
|
5955 |
||
5956 |
assert(stream != NULL, "invariant"); |
|
5957 |
assert(_class_name != NULL, "invariant"); |
|
5958 |
||
5959 |
// BEGIN STREAM PARSING |
|
5960 |
stream->guarantee_more(8, CHECK); // magic, major, minor |
|
5961 |
// Magic value |
|
5962 |
const u4 magic = stream->get_u4_fast(); |
|
5963 |
guarantee_property(magic == JAVA_CLASSFILE_MAGIC, |
|
5964 |
"Incompatible magic value %u in class file %s", |
|
5965 |
magic, CHECK); |
|
5966 |
||
5967 |
// Version numbers |
|
5968 |
_minor_version = stream->get_u2_fast(); |
|
5969 |
_major_version = stream->get_u2_fast(); |
|
5970 |
||
54552 | 5971 |
if (DumpSharedSpaces && _major_version < JAVA_6_VERSION) { |
34666 | 5972 |
ResourceMark rm; |
54552 | 5973 |
warning("Pre JDK 6 class not supported by CDS: %u.%u %s", |
34666 | 5974 |
_major_version, _minor_version, _class_name->as_C_string()); |
5975 |
Exceptions::fthrow( |
|
5976 |
THREAD_AND_LOCATION, |
|
5977 |
vmSymbols::java_lang_UnsupportedClassVersionError(), |
|
5978 |
"Unsupported major.minor version for dump time %u.%u", |
|
5979 |
_major_version, |
|
5980 |
_minor_version); |
|
5981 |
} |
|
5982 |
||
5983 |
// Check version numbers - we check this even with verifier off |
|
49716 | 5984 |
verify_class_version(_major_version, _minor_version, _class_name, CHECK); |
34666 | 5985 |
|
5986 |
stream->guarantee_more(3, CHECK); // length, first cp tag |
|
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5987 |
u2 cp_size = stream->get_u2_fast(); |
34666 | 5988 |
|
5989 |
guarantee_property( |
|
5990 |
cp_size >= 1, "Illegal constant pool size %u in class file %s", |
|
5991 |
cp_size, CHECK); |
|
5992 |
||
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5993 |
_orig_cp_size = cp_size; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5994 |
if (int(cp_size) + _max_num_patched_klasses > 0xffff) { |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5995 |
THROW_MSG(vmSymbols::java_lang_InternalError(), "not enough space for patched classes"); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5996 |
} |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5997 |
cp_size += _max_num_patched_klasses; |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
5998 |
|
34666 | 5999 |
_cp = ConstantPool::allocate(_loader_data, |
6000 |
cp_size, |
|
6001 |
CHECK); |
|
6002 |
||
6003 |
ConstantPool* const cp = _cp; |
|
6004 |
||
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46388
diff
changeset
|
6005 |
parse_constant_pool(stream, cp, _orig_cp_size, CHECK); |
34666 | 6006 |
|
6007 |
assert(cp_size == (const u2)cp->length(), "invariant"); |
|
6008 |
||
6009 |
// ACCESS FLAGS |
|
6010 |
stream->guarantee_more(8, CHECK); // flags, this_class, super_class, infs_len |
|
6011 |
||
6012 |
// Access flags |
|
43977
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6013 |
jint flags; |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6014 |
// JVM_ACC_MODULE is defined in JDK-9 and later. |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6015 |
if (_major_version >= JAVA_9_VERSION) { |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6016 |
flags = stream->get_u2_fast() & (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_MODULE); |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6017 |
} else { |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6018 |
flags = stream->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS; |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6019 |
} |
34666 | 6020 |
|
6021 |
if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) { |
|
6022 |
// Set abstract bit for old class files for backward compatibility |
|
6023 |
flags |= JVM_ACC_ABSTRACT; |
|
6024 |
} |
|
6025 |
||
43977
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6026 |
verify_legal_class_modifiers(flags, CHECK); |
bf59cd83ea95
8174725: JVM should throw NoClassDefFoundError if ACC_MODULE is set in access_flags
hseigel
parents:
43177
diff
changeset
|
6027 |
|
44239
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6028 |
short bad_constant = class_bad_constant_seen(); |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6029 |
if (bad_constant != 0) { |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6030 |
// Do not throw CFE until after the access_flags are checked because if |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6031 |
// ACC_MODULE is set in the access flags, then NCDFE must be thrown, not CFE. |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6032 |
classfile_parse_error("Unknown constant tag %u in class file %s", bad_constant, CHECK); |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6033 |
} |
fdd97dc2367b
8175383: JVM should throw NCDFE if ACC_MODULE and CONSTANT_Module/Package are set
hseigel
parents:
43977
diff
changeset
|
6034 |
|
34666 | 6035 |
_access_flags.set_flags(flags); |
6036 |
||
6037 |
// This class and superclass |
|
6038 |
_this_class_index = stream->get_u2_fast(); |
|
6039 |
check_property( |
|
6040 |
valid_cp_range(_this_class_index, cp_size) && |
|
6041 |
cp->tag_at(_this_class_index).is_unresolved_klass(), |
|
6042 |
"Invalid this class index %u in constant pool in class file %s", |
|
6043 |
_this_class_index, CHECK); |
|
6044 |
||
6045 |
Symbol* const class_name_in_cp = cp->klass_name_at(_this_class_index); |
|
6046 |
assert(class_name_in_cp != NULL, "class_name can't be null"); |
|
6047 |
||
53739
4dab92cc7aed
8218755: Refix Symbol leak in prepend_host_package_name
coleenp
parents:
53728
diff
changeset
|
6048 |
// Update _class_name to reflect the name in the constant pool |
53705
757e9407bafc
8218593: Symbol leak in prepend_host_package_name
coleenp
parents:
53435
diff
changeset
|
6049 |
update_class_name(class_name_in_cp); |
34666 | 6050 |
|
6051 |
// Don't need to check whether this class name is legal or not. |
|
6052 |
// It has been checked when constant pool is parsed. |
|
6053 |
// However, make sure it is not an array type. |
|
6054 |
if (_need_verify) { |
|
51997
9ce37fa2e179
8209138: Symbol constructor uses u1 as the element type of its name argument
hseigel
parents:
51444
diff
changeset
|
6055 |
guarantee_property(_class_name->char_at(0) != JVM_SIGNATURE_ARRAY, |
34666 | 6056 |
"Bad class name in class file %s", |
6057 |
CHECK); |
|
6058 |
} |
|
6059 |
||
6060 |
// Checks if name in class file matches requested name |
|
6061 |
if (_requested_name != NULL && _requested_name != _class_name) { |
|
6062 |
ResourceMark rm(THREAD); |
|
6063 |
Exceptions::fthrow( |
|
6064 |
THREAD_AND_LOCATION, |
|
6065 |
vmSymbols::java_lang_NoClassDefFoundError(), |
|
6066 |
"%s (wrong name: %s)", |
|
6067 |
_class_name->as_C_string(), |
|
6068 |
_requested_name != NULL ? _requested_name->as_C_string() : "NoName" |
|
6069 |
); |
|
6070 |
return; |
|
6071 |
} |
|
6072 |
||
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
6073 |
// if this is an anonymous class fix up its name if it's in the unnamed |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
6074 |
// package. Otherwise, throw IAE if it is in a different package than |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
6075 |
// its host class. |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
6076 |
if (_unsafe_anonymous_host != NULL) { |
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
6077 |
fix_unsafe_anonymous_class_name(CHECK); |
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
6078 |
} |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40921
diff
changeset
|
6079 |
|
40016 | 6080 |
// Verification prevents us from creating names with dots in them, this |
6081 |
// asserts that that's the case. |
|
6082 |
assert(is_internal_format(_class_name), "external class name format used internally"); |
|
6083 |
||
34666 | 6084 |
if (!is_internal()) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
6085 |
LogTarget(Debug, class, preorder) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
6086 |
if (lt.is_enabled()){ |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
6087 |
ResourceMark rm(THREAD); |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
6088 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
6089 |
ls.print("%s", _class_name->as_klass_external_name()); |
34666 | 6090 |
if (stream->source() != NULL) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
6091 |
ls.print(" source: %s", stream->source()); |
34666 | 6092 |
} |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46697
diff
changeset
|
6093 |
ls.cr(); |
34666 | 6094 |
} |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
6095 |
|
34666 | 6096 |
#if INCLUDE_CDS |
6097 |
if (DumpLoadedClassList != NULL && stream->source() != NULL && classlist_file->is_open()) { |
|
47673
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6098 |
if (!ClassLoader::has_jrt_entry()) { |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6099 |
warning("DumpLoadedClassList and CDS are not supported in exploded build"); |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6100 |
DumpLoadedClassList = NULL; |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6101 |
} else if (SystemDictionaryShared::is_sharing_possible(_loader_data) && |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
6102 |
_unsafe_anonymous_host == NULL) { |
47673
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6103 |
// Only dump the classes that can be stored into CDS archive. |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51329
diff
changeset
|
6104 |
// Unsafe anonymous classes such as generated LambdaForm classes are also not included. |
41741
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6105 |
oop class_loader = _loader_data->class_loader(); |
34666 | 6106 |
ResourceMark rm(THREAD); |
47673
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6107 |
bool skip = false; |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6108 |
if (class_loader == NULL || SystemDictionary::is_platform_class_loader(class_loader)) { |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6109 |
// For the boot and platform class loaders, skip classes that are not found in the |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6110 |
// java runtime image, such as those found in the --patch-module entries. |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6111 |
// These classes can't be loaded from the archive during runtime. |
54257
21702e87efdf
8220095: Assertion failure when symlink (with different name) is used for lib/modules file
iklam
parents:
54042
diff
changeset
|
6112 |
if (!stream->from_boot_loader_modules_image() && strncmp(stream->source(), "jrt:", 4) != 0) { |
47673
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6113 |
skip = true; |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6114 |
} |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6115 |
|
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6116 |
if (class_loader == NULL && ClassLoader::contains_append_entry(stream->source())) { |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6117 |
// .. but don't skip the boot classes that are loaded from -Xbootclasspath/a |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6118 |
// as they can be loaded from the archive during runtime. |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6119 |
skip = false; |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6120 |
} |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6121 |
} |
6126617b8508
8185160: -XX:DumpLoadedClassList omits graal classes
iklam
parents:
47216
diff
changeset
|
6122 |
if (skip) { |
41741
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6123 |
tty->print_cr("skip writing class %s from source %s to classlist file", |
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6124 |
_class_name->as_C_string(), stream->source()); |
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6125 |
} else { |
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6126 |
classlist_file->print_cr("%s", _class_name->as_C_string()); |
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6127 |
classlist_file->flush(); |
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41669
diff
changeset
|
6128 |
} |
34666 | 6129 |
} |
6130 |
} |
|
6131 |
#endif |
|
6132 |
} |
|
6133 |
||
6134 |
// SUPERKLASS |
|
6135 |
_super_class_index = stream->get_u2_fast(); |
|
6136 |
_super_klass = parse_super_class(cp, |
|
6137 |
_super_class_index, |
|
6138 |
_need_verify, |
|
6139 |
CHECK); |
|
6140 |
||
6141 |
// Interfaces |
|
6142 |
_itfs_len = stream->get_u2_fast(); |
|
6143 |
parse_interfaces(stream, |
|
6144 |
_itfs_len, |
|
6145 |
cp, |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
6146 |
&_has_nonstatic_concrete_methods, |
34666 | 6147 |
CHECK); |
6148 |
||
6149 |
assert(_local_interfaces != NULL, "invariant"); |
|
6150 |
||
6151 |
// Fields (offsets are filled in later) |
|
6152 |
_fac = new FieldAllocationCount(); |
|
6153 |
parse_fields(stream, |
|
6154 |
_access_flags.is_interface(), |
|
6155 |
_fac, |
|
6156 |
cp, |
|
6157 |
cp_size, |
|
6158 |
&_java_fields_count, |
|
6159 |
CHECK); |
|
6160 |
||
6161 |
assert(_fields != NULL, "invariant"); |
|
6162 |
||
6163 |
// Methods |
|
6164 |
AccessFlags promoted_flags; |
|
6165 |
parse_methods(stream, |
|
6166 |
_access_flags.is_interface(), |
|
6167 |
&promoted_flags, |
|
6168 |
&_has_final_method, |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
6169 |
&_declares_nonstatic_concrete_methods, |
34666 | 6170 |
CHECK); |
6171 |
||
6172 |
assert(_methods != NULL, "invariant"); |
|
6173 |
||
6174 |
// promote flags from parse_methods() to the klass' flags |
|
6175 |
_access_flags.add_promoted_flags(promoted_flags.as_int()); |
|
6176 |
||
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
6177 |
if (_declares_nonstatic_concrete_methods) { |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
6178 |
_has_nonstatic_concrete_methods = true; |
34666 | 6179 |
} |
6180 |
||
6181 |
// Additional attributes/annotations |
|
6182 |
_parsed_annotations = new ClassAnnotationCollector(); |
|
6183 |
parse_classfile_attributes(stream, cp, _parsed_annotations, CHECK); |
|
6184 |
||
6185 |
assert(_inner_classes != NULL, "invariant"); |
|
6186 |
||
6187 |
// Finalize the Annotations metadata object, |
|
6188 |
// now that all annotation arrays have been created. |
|
6189 |
create_combined_annotations(CHECK); |
|
6190 |
||
6191 |
// Make sure this is the end of class file stream |
|
6192 |
guarantee_property(stream->at_eos(), |
|
6193 |
"Extra bytes at the end of class file %s", |
|
6194 |
CHECK); |
|
6195 |
||
6196 |
// all bytes in stream read and parsed |
|
6197 |
} |
|
6198 |
||
6199 |
void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const stream, |
|
6200 |
ConstantPool* cp, |
|
1 | 6201 |
TRAPS) { |
34666 | 6202 |
assert(stream != NULL, "invariant"); |
6203 |
assert(stream->at_eos(), "invariant"); |
|
6204 |
assert(cp != NULL, "invariant"); |
|
6205 |
assert(_loader_data != NULL, "invariant"); |
|
6206 |
||
41544 | 6207 |
if (_class_name == vmSymbols::java_lang_Object()) { |
51329
9c68699bebe5
8208999: Some use of Klass* should be replaced by InstanceKlass*
iklam
parents:
51308
diff
changeset
|
6208 |
check_property(_local_interfaces == Universe::the_empty_instance_klass_array(), |
41544 | 6209 |
"java.lang.Object cannot implement an interface in class file %s", |
6210 |
CHECK); |
|
6211 |
} |
|
34666 | 6212 |
// We check super class after class file is parsed and format is checked |
6213 |
if (_super_class_index > 0 && NULL ==_super_klass) { |
|
6214 |
Symbol* const super_class_name = cp->klass_name_at(_super_class_index); |
|
6215 |
if (_access_flags.is_interface()) { |
|
6216 |
// Before attempting to resolve the superclass, check for class format |
|
6217 |
// errors not checked yet. |
|
6218 |
guarantee_property(super_class_name == vmSymbols::java_lang_Object(), |
|
6219 |
"Interfaces must have java.lang.Object as superclass in class file %s", |
|
6220 |
CHECK); |
|
38147
c020feaafdcb
8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream
ecaspole
parents:
38060
diff
changeset
|
6221 |
} |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46262
diff
changeset
|
6222 |
Handle loader(THREAD, _loader_data->class_loader()); |
38147
c020feaafdcb
8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream
ecaspole
parents:
38060
diff
changeset
|
6223 |
_super_klass = (const InstanceKlass*) |
34666 | 6224 |
SystemDictionary::resolve_super_or_fail(_class_name, |
6225 |
super_class_name, |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46262
diff
changeset
|
6226 |
loader, |
34666 | 6227 |
_protection_domain, |
6228 |
true, |
|
6229 |
CHECK); |
|
6230 |
} |
|
6231 |
||
6232 |
if (_super_klass != NULL) { |
|
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
6233 |
if (_super_klass->has_nonstatic_concrete_methods()) { |
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
40923
diff
changeset
|
6234 |
_has_nonstatic_concrete_methods = true; |
34666 | 6235 |
} |
6236 |
||
6237 |
if (_super_klass->is_interface()) { |
|
6238 |
ResourceMark rm(THREAD); |
|
6239 |
Exceptions::fthrow( |
|
6240 |
THREAD_AND_LOCATION, |
|
6241 |
vmSymbols::java_lang_IncompatibleClassChangeError(), |
|
6242 |
"class %s has interface %s as super class", |
|
6243 |
_class_name->as_klass_external_name(), |
|
6244 |
_super_klass->external_name() |
|
6245 |
); |
|
6246 |
return; |
|
6247 |
} |
|
6248 |
// Make sure super class is not final |
|
6249 |
if (_super_klass->is_final()) { |
|
6250 |
THROW_MSG(vmSymbols::java_lang_VerifyError(), "Cannot inherit from final class"); |
|
1 | 6251 |
} |
6252 |
} |
|
34666 | 6253 |
|
6254 |
// Compute the transitive list of all unique interfaces implemented by this class |
|
6255 |
_transitive_interfaces = |
|
6256 |
compute_transitive_interfaces(_super_klass, |
|
6257 |
_local_interfaces, |
|
6258 |
_loader_data, |
|
6259 |
CHECK); |
|
6260 |
||
6261 |
assert(_transitive_interfaces != NULL, "invariant"); |
|
6262 |
||
6263 |
// sort methods |
|
6264 |
_method_ordering = sort_methods(_methods); |
|
6265 |
||
6266 |
_all_mirandas = new GrowableArray<Method*>(20); |
|
6267 |
||
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46262
diff
changeset
|
6268 |
Handle loader(THREAD, _loader_data->class_loader()); |
34666 | 6269 |
klassVtable::compute_vtable_size_and_num_mirandas(&_vtable_size, |
6270 |
&_num_miranda_methods, |
|
6271 |
_all_mirandas, |
|
6272 |
_super_klass, |
|
6273 |
_methods, |
|
6274 |
_access_flags, |
|
40633
c33ad2ff51de
8163808: Fix asserts and logging for old classfile vtable construction
acorn
parents:
40016
diff
changeset
|
6275 |
_major_version, |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46262
diff
changeset
|
6276 |
loader, |
34666 | 6277 |
_class_name, |
6278 |
_local_interfaces, |
|
6279 |
CHECK); |
|
6280 |
||
6281 |
// Size of Java itable (in words) |
|
6282 |
_itable_size = _access_flags.is_interface() ? 0 : |
|
6283 |
klassItable::compute_itable_size(_transitive_interfaces); |
|
6284 |
||
6285 |
assert(_fac != NULL, "invariant"); |
|
6286 |
assert(_parsed_annotations != NULL, "invariant"); |
|
6287 |
||
6288 |
_field_info = new FieldLayoutInfo(); |
|
6289 |
layout_fields(cp, _fac, _parsed_annotations, _field_info, CHECK); |
|
6290 |
||
6291 |
// Compute reference typ |
|
6292 |
_rt = (NULL ==_super_klass) ? REF_NONE : _super_klass->reference_type(); |
|
6293 |
||
1 | 6294 |
} |
34666 | 6295 |
|
6296 |
void ClassFileParser::set_klass(InstanceKlass* klass) { |
|
6297 |
||
6298 |
#ifdef ASSERT |
|
6299 |
if (klass != NULL) { |
|
6300 |
assert(NULL == _klass, "leaking?"); |
|
6301 |
} |
|
6302 |
#endif |
|
6303 |
||
6304 |
_klass = klass; |
|
6305 |
} |
|
6306 |
||
6307 |
void ClassFileParser::set_klass_to_deallocate(InstanceKlass* klass) { |
|
6308 |
||
6309 |
#ifdef ASSERT |
|
6310 |
if (klass != NULL) { |
|
6311 |
assert(NULL == _klass_to_deallocate, "leaking?"); |
|
6312 |
} |
|
6313 |
#endif |
|
6314 |
||
6315 |
_klass_to_deallocate = klass; |
|
6316 |
} |
|
6317 |
||
6318 |
// Caller responsible for ResourceMark |
|
6319 |
// clone stream with rewound position |
|
6320 |
const ClassFileStream* ClassFileParser::clone_stream() const { |
|
6321 |
assert(_stream != NULL, "invariant"); |
|
6322 |
||
6323 |
return _stream->clone(); |
|
6324 |
} |
|
40016 | 6325 |
// ---------------------------------------------------------------------------- |
6326 |
// debugging |
|
6327 |
||
6328 |
#ifdef ASSERT |
|
6329 |
||
6330 |
// return true if class_name contains no '.' (internal format is '/') |
|
6331 |
bool ClassFileParser::is_internal_format(Symbol* class_name) { |
|
6332 |
if (class_name != NULL) { |
|
6333 |
ResourceMark rm; |
|
6334 |
char* name = class_name->as_C_string(); |
|
58722
cba8afa5cfed
8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently
lfoltan
parents:
58447
diff
changeset
|
6335 |
return strchr(name, JVM_SIGNATURE_DOT) == NULL; |
40016 | 6336 |
} else { |
6337 |
return true; |
|
6338 |
} |
|
6339 |
} |
|
6340 |
||
6341 |
#endif |