Mercurial > hg > graal-jvmci-8
annotate src/share/vm/classfile/verifier.cpp @ 23938:09fbe9c45409
8155981: Bolster bytecode verification
Reviewed-by: acorn, jdn
Contributed-by: harold.seigel@oracle.com
author | shshahma |
---|---|
date | Wed, 11 May 2016 12:03:46 -0400 |
parents | 6b65121b3258 |
children | e4525db27263 |
rev | line source |
---|---|
0 | 1 /* |
22847
ecdf1e03db40
8064335: Null pointer dereference in hotspot/src/share/vm/classfile/verifier.cpp
hseigel
parents:
20762
diff
changeset
|
2 * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1142
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1142
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1142
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
26 #include "classfile/classFileStream.hpp" | |
27 #include "classfile/javaClasses.hpp" | |
28 #include "classfile/stackMapTable.hpp" | |
6605 | 29 #include "classfile/stackMapFrame.hpp" |
30 #include "classfile/stackMapTableFormat.hpp" | |
1972 | 31 #include "classfile/systemDictionary.hpp" |
32 #include "classfile/verifier.hpp" | |
33 #include "classfile/vmSymbols.hpp" | |
6605 | 34 #include "interpreter/bytecodes.hpp" |
1972 | 35 #include "interpreter/bytecodeStream.hpp" |
36 #include "memory/oopFactory.hpp" | |
37 #include "memory/resourceArea.hpp" | |
38 #include "oops/instanceKlass.hpp" | |
39 #include "oops/oop.inline.hpp" | |
40 #include "oops/typeArrayOop.hpp" | |
41 #include "prims/jvm.h" | |
42 #include "runtime/fieldDescriptor.hpp" | |
43 #include "runtime/handles.inline.hpp" | |
44 #include "runtime/interfaceSupport.hpp" | |
45 #include "runtime/javaCalls.hpp" | |
20197
ce8f6bb717c9
8042195: Introduce umbrella header orderAccess.inline.hpp.
goetz
parents:
17937
diff
changeset
|
46 #include "runtime/orderAccess.inline.hpp" |
1972 | 47 #include "runtime/os.hpp" |
48 #ifdef TARGET_ARCH_x86 | |
49 # include "bytes_x86.hpp" | |
50 #endif | |
51 #ifdef TARGET_ARCH_sparc | |
52 # include "bytes_sparc.hpp" | |
53 #endif | |
54 #ifdef TARGET_ARCH_zero | |
55 # include "bytes_zero.hpp" | |
56 #endif | |
2192
b92c45f2bc75
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
2177
diff
changeset
|
57 #ifdef TARGET_ARCH_arm |
b92c45f2bc75
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
2177
diff
changeset
|
58 # include "bytes_arm.hpp" |
b92c45f2bc75
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
2177
diff
changeset
|
59 #endif |
b92c45f2bc75
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
2177
diff
changeset
|
60 #ifdef TARGET_ARCH_ppc |
b92c45f2bc75
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
2177
diff
changeset
|
61 # include "bytes_ppc.hpp" |
b92c45f2bc75
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
2177
diff
changeset
|
62 #endif |
0 | 63 |
8816
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
64 #define NOFAILOVER_MAJOR_VERSION 51 |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
65 #define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION 51 |
9066
09b0d3e9ba6c
8011671: JCK tests on static interface methods fail under b84: Illegal type at constant pool entry 5
bharadwaj
parents:
8819
diff
changeset
|
66 #define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION 52 |
1560
e40a3601bc1f
6911922: JVM must throw VerifyError for jsr or jsr_w opcodes in class file v.51+
kamg
parents:
1142
diff
changeset
|
67 |
0 | 68 // Access to external entry for VerifyClassCodes - old byte code verifier |
69 | |
70 extern "C" { | |
71 typedef jboolean (*verify_byte_codes_fn_t)(JNIEnv *, jclass, char *, jint); | |
72 typedef jboolean (*verify_byte_codes_fn_new_t)(JNIEnv *, jclass, char *, jint, jint); | |
73 } | |
74 | |
75 static void* volatile _verify_byte_codes_fn = NULL; | |
76 | |
77 static volatile jint _is_new_verify_byte_codes_fn = (jint) true; | |
78 | |
79 static void* verify_byte_codes_fn() { | |
80 if (_verify_byte_codes_fn == NULL) { | |
81 void *lib_handle = os::native_java_library(); | |
1980
828eafbd85cc
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
1972
diff
changeset
|
82 void *func = os::dll_lookup(lib_handle, "VerifyClassCodesForMajorVersion"); |
0 | 83 OrderAccess::release_store_ptr(&_verify_byte_codes_fn, func); |
84 if (func == NULL) { | |
85 OrderAccess::release_store(&_is_new_verify_byte_codes_fn, false); | |
1980
828eafbd85cc
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
1972
diff
changeset
|
86 func = os::dll_lookup(lib_handle, "VerifyClassCodes"); |
0 | 87 OrderAccess::release_store_ptr(&_verify_byte_codes_fn, func); |
88 } | |
89 } | |
90 return (void*)_verify_byte_codes_fn; | |
91 } | |
92 | |
93 | |
94 // Methods in Verifier | |
95 | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
96 bool Verifier::should_verify_for(oop class_loader, bool should_verify_class) { |
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
97 return (class_loader == NULL || !should_verify_class) ? |
0 | 98 BytecodeVerificationLocal : BytecodeVerificationRemote; |
99 } | |
100 | |
101 bool Verifier::relax_verify_for(oop loader) { | |
102 bool trusted = java_lang_ClassLoader::is_trusted_loader(loader); | |
103 bool need_verify = | |
104 // verifyAll | |
105 (BytecodeVerificationLocal && BytecodeVerificationRemote) || | |
106 // verifyRemote | |
107 (!BytecodeVerificationLocal && BytecodeVerificationRemote && !trusted); | |
108 return !need_verify; | |
109 } | |
110 | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
111 bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, bool should_verify_class, TRAPS) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
112 HandleMark hm; |
0 | 113 ResourceMark rm(THREAD); |
114 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
115 Symbol* exception_name = NULL; |
0 | 116 const size_t message_buffer_len = klass->name()->utf8_length() + 1024; |
117 char* message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len); | |
6605 | 118 char* exception_message = message_buffer; |
0 | 119 |
120 const char* klassName = klass->external_name(); | |
6605 | 121 bool can_failover = FailOverToOldVerifier && |
122 klass->major_version() < NOFAILOVER_MAJOR_VERSION; | |
0 | 123 |
124 // If the class should be verified, first see if we can use the split | |
125 // verifier. If not, or if verification fails and FailOverToOldVerifier | |
126 // is set, then call the inference verifier. | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
127 if (is_eligible_for_verification(klass, should_verify_class)) { |
0 | 128 if (TraceClassInitialization) { |
129 tty->print_cr("Start class verification for: %s", klassName); | |
130 } | |
8819
36376b540a98
8009595: The UseSplitVerifier option needs to be deprecated.
hseigel
parents:
8817
diff
changeset
|
131 if (klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) { |
6605 | 132 ClassVerifier split_verifier(klass, THREAD); |
133 split_verifier.verify_class(THREAD); | |
134 exception_name = split_verifier.result(); | |
135 if (can_failover && !HAS_PENDING_EXCEPTION && | |
0 | 136 (exception_name == vmSymbols::java_lang_VerifyError() || |
137 exception_name == vmSymbols::java_lang_ClassFormatError())) { | |
6605 | 138 if (TraceClassInitialization || VerboseVerification) { |
0 | 139 tty->print_cr( |
140 "Fail over class verification to old verifier for: %s", klassName); | |
141 } | |
142 exception_name = inference_verify( | |
143 klass, message_buffer, message_buffer_len, THREAD); | |
144 } | |
6605 | 145 if (exception_name != NULL) { |
146 exception_message = split_verifier.exception_message(); | |
147 } | |
0 | 148 } else { |
149 exception_name = inference_verify( | |
150 klass, message_buffer, message_buffer_len, THREAD); | |
151 } | |
152 | |
6605 | 153 if (TraceClassInitialization || VerboseVerification) { |
0 | 154 if (HAS_PENDING_EXCEPTION) { |
155 tty->print("Verification for %s has", klassName); | |
156 tty->print_cr(" exception pending %s ", | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
157 InstanceKlass::cast(PENDING_EXCEPTION->klass())->external_name()); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
158 } else if (exception_name != NULL) { |
0 | 159 tty->print_cr("Verification for %s failed", klassName); |
160 } | |
161 tty->print_cr("End class verification for: %s", klassName); | |
162 } | |
163 } | |
164 | |
165 if (HAS_PENDING_EXCEPTION) { | |
166 return false; // use the existing exception | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
167 } else if (exception_name == NULL) { |
0 | 168 return true; // verifcation succeeded |
169 } else { // VerifyError or ClassFormatError to be created and thrown | |
170 ResourceMark rm(THREAD); | |
171 instanceKlassHandle kls = | |
172 SystemDictionary::resolve_or_fail(exception_name, true, CHECK_false); | |
173 while (!kls.is_null()) { | |
174 if (kls == klass) { | |
175 // If the class being verified is the exception we're creating | |
176 // or one of it's superclasses, we're in trouble and are going | |
177 // to infinitely recurse when we try to initialize the exception. | |
178 // So bail out here by throwing the preallocated VM error. | |
179 THROW_OOP_(Universe::virtual_machine_error_instance(), false); | |
180 } | |
181 kls = kls->super(); | |
182 } | |
183 message_buffer[message_buffer_len - 1] = '\0'; // just to be sure | |
6605 | 184 THROW_MSG_(exception_name, exception_message, false); |
0 | 185 } |
186 } | |
187 | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
188 bool Verifier::is_eligible_for_verification(instanceKlassHandle klass, bool should_verify_class) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
189 Symbol* name = klass->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
190 Klass* refl_magic_klass = SystemDictionary::reflect_MagicAccessorImpl_klass(); |
12154
3a1df0dce3e5
8023872: Verification error in generated lambda classes
acorn
parents:
12142
diff
changeset
|
191 |
3a1df0dce3e5
8023872: Verification error in generated lambda classes
acorn
parents:
12142
diff
changeset
|
192 bool is_reflect = refl_magic_klass != NULL && klass->is_subtype_of(refl_magic_klass); |
0 | 193 |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
194 return (should_verify_for(klass->class_loader(), should_verify_class) && |
0 | 195 // return if the class is a bootstrapping class |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
844
diff
changeset
|
196 // or defineClass specified not to verify by default (flags override passed arg) |
0 | 197 // We need to skip the following four for bootstraping |
198 name != vmSymbols::java_lang_Object() && | |
199 name != vmSymbols::java_lang_Class() && | |
200 name != vmSymbols::java_lang_String() && | |
201 name != vmSymbols::java_lang_Throwable() && | |
202 | |
203 // Can not verify the bytecodes for shared classes because they have | |
204 // already been rewritten to contain constant pool cache indices, | |
205 // which the verifier can't understand. | |
206 // Shared classes shouldn't have stackmaps either. | |
207 !klass()->is_shared() && | |
208 | |
209 // As of the fix for 4486457 we disable verification for all of the | |
210 // dynamically-generated bytecodes associated with the 1.4 | |
211 // reflection implementation, not just those associated with | |
212 // sun/reflect/SerializationConstructorAccessor. | |
213 // NOTE: this is called too early in the bootstrapping process to be | |
214 // guarded by Universe::is_gte_jdk14x_version()/UseNewReflection. | |
12154
3a1df0dce3e5
8023872: Verification error in generated lambda classes
acorn
parents:
12142
diff
changeset
|
215 // Also for lambda generated code, gte jdk8 |
13385
cdf20166ec45
8025632: Remove all references to MagicLambdaImpl from Hotspot
minqi
parents:
12891
diff
changeset
|
216 (!is_reflect || VerifyReflectionBytecodes)); |
0 | 217 } |
218 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
219 Symbol* Verifier::inference_verify( |
0 | 220 instanceKlassHandle klass, char* message, size_t message_len, TRAPS) { |
221 JavaThread* thread = (JavaThread*)THREAD; | |
222 JNIEnv *env = thread->jni_environment(); | |
223 | |
224 void* verify_func = verify_byte_codes_fn(); | |
225 | |
226 if (verify_func == NULL) { | |
227 jio_snprintf(message, message_len, "Could not link verifier"); | |
228 return vmSymbols::java_lang_VerifyError(); | |
229 } | |
230 | |
231 ResourceMark rm(THREAD); | |
6605 | 232 if (VerboseVerification) { |
0 | 233 tty->print_cr("Verifying class %s with old format", klass->external_name()); |
234 } | |
235 | |
236 jclass cls = (jclass) JNIHandles::make_local(env, klass->java_mirror()); | |
237 jint result; | |
238 | |
239 { | |
240 HandleMark hm(thread); | |
241 ThreadToNativeFromVM ttn(thread); | |
242 // ThreadToNativeFromVM takes care of changing thread_state, so safepoint | |
243 // code knows that we have left the VM | |
244 | |
245 if (_is_new_verify_byte_codes_fn) { | |
246 verify_byte_codes_fn_new_t func = | |
247 CAST_TO_FN_PTR(verify_byte_codes_fn_new_t, verify_func); | |
248 result = (*func)(env, cls, message, (int)message_len, | |
249 klass->major_version()); | |
250 } else { | |
251 verify_byte_codes_fn_t func = | |
252 CAST_TO_FN_PTR(verify_byte_codes_fn_t, verify_func); | |
253 result = (*func)(env, cls, message, (int)message_len); | |
254 } | |
255 } | |
256 | |
257 JNIHandles::destroy_local(cls); | |
258 | |
259 // These numbers are chosen so that VerifyClassCodes interface doesn't need | |
260 // to be changed (still return jboolean (unsigned char)), and result is | |
261 // 1 when verification is passed. | |
262 if (result == 0) { | |
263 return vmSymbols::java_lang_VerifyError(); | |
264 } else if (result == 1) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
265 return NULL; // verified. |
0 | 266 } else if (result == 2) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
267 THROW_MSG_(vmSymbols::java_lang_OutOfMemoryError(), message, NULL); |
0 | 268 } else if (result == 3) { |
269 return vmSymbols::java_lang_ClassFormatError(); | |
270 } else { | |
271 ShouldNotReachHere(); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
272 return NULL; |
0 | 273 } |
274 } | |
275 | |
6605 | 276 TypeOrigin TypeOrigin::null() { |
277 return TypeOrigin(); | |
278 } | |
279 TypeOrigin TypeOrigin::local(u2 index, StackMapFrame* frame) { | |
280 assert(frame != NULL, "Must have a frame"); | |
281 return TypeOrigin(CF_LOCALS, index, StackMapFrame::copy(frame), | |
282 frame->local_at(index)); | |
283 } | |
284 TypeOrigin TypeOrigin::stack(u2 index, StackMapFrame* frame) { | |
285 assert(frame != NULL, "Must have a frame"); | |
286 return TypeOrigin(CF_STACK, index, StackMapFrame::copy(frame), | |
287 frame->stack_at(index)); | |
288 } | |
289 TypeOrigin TypeOrigin::sm_local(u2 index, StackMapFrame* frame) { | |
290 assert(frame != NULL, "Must have a frame"); | |
291 return TypeOrigin(SM_LOCALS, index, StackMapFrame::copy(frame), | |
292 frame->local_at(index)); | |
293 } | |
294 TypeOrigin TypeOrigin::sm_stack(u2 index, StackMapFrame* frame) { | |
295 assert(frame != NULL, "Must have a frame"); | |
296 return TypeOrigin(SM_STACK, index, StackMapFrame::copy(frame), | |
297 frame->stack_at(index)); | |
298 } | |
299 TypeOrigin TypeOrigin::bad_index(u2 index) { | |
300 return TypeOrigin(BAD_INDEX, index, NULL, VerificationType::bogus_type()); | |
301 } | |
302 TypeOrigin TypeOrigin::cp(u2 index, VerificationType vt) { | |
303 return TypeOrigin(CONST_POOL, index, NULL, vt); | |
304 } | |
305 TypeOrigin TypeOrigin::signature(VerificationType vt) { | |
306 return TypeOrigin(SIG, 0, NULL, vt); | |
307 } | |
308 TypeOrigin TypeOrigin::implicit(VerificationType t) { | |
309 return TypeOrigin(IMPLICIT, 0, NULL, t); | |
310 } | |
311 TypeOrigin TypeOrigin::frame(StackMapFrame* frame) { | |
312 return TypeOrigin(FRAME_ONLY, 0, StackMapFrame::copy(frame), | |
313 VerificationType::bogus_type()); | |
314 } | |
315 | |
316 void TypeOrigin::reset_frame() { | |
317 if (_frame != NULL) { | |
318 _frame->restore(); | |
319 } | |
320 } | |
321 | |
322 void TypeOrigin::details(outputStream* ss) const { | |
323 _type.print_on(ss); | |
324 switch (_origin) { | |
325 case CF_LOCALS: | |
326 ss->print(" (current frame, locals[%d])", _index); | |
327 break; | |
328 case CF_STACK: | |
329 ss->print(" (current frame, stack[%d])", _index); | |
330 break; | |
331 case SM_LOCALS: | |
332 ss->print(" (stack map, locals[%d])", _index); | |
333 break; | |
334 case SM_STACK: | |
335 ss->print(" (stack map, stack[%d])", _index); | |
336 break; | |
337 case CONST_POOL: | |
338 ss->print(" (constant pool %d)", _index); | |
339 break; | |
340 case SIG: | |
341 ss->print(" (from method signature)"); | |
342 break; | |
343 case IMPLICIT: | |
344 case FRAME_ONLY: | |
345 case NONE: | |
346 default: | |
347 ; | |
348 } | |
349 } | |
350 | |
351 #ifdef ASSERT | |
352 void TypeOrigin::print_on(outputStream* str) const { | |
353 str->print("{%d,%d,%p:", _origin, _index, _frame); | |
354 if (_frame != NULL) { | |
355 _frame->print_on(str); | |
356 } else { | |
357 str->print("null"); | |
358 } | |
359 str->print(","); | |
360 _type.print_on(str); | |
361 str->print("}"); | |
362 } | |
363 #endif | |
364 | |
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
9066
diff
changeset
|
365 void ErrorContext::details(outputStream* ss, const Method* method) const { |
6605 | 366 if (is_valid()) { |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
367 ss->cr(); |
6605 | 368 ss->print_cr("Exception Details:"); |
369 location_details(ss, method); | |
370 reason_details(ss); | |
371 frame_details(ss); | |
372 bytecode_details(ss, method); | |
373 handler_details(ss, method); | |
374 stackmap_details(ss, method); | |
375 } | |
376 } | |
377 | |
378 void ErrorContext::reason_details(outputStream* ss) const { | |
379 streamIndentor si(ss); | |
380 ss->indent().print_cr("Reason:"); | |
381 streamIndentor si2(ss); | |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
382 ss->indent().print("%s", ""); |
6605 | 383 switch (_fault) { |
384 case INVALID_BYTECODE: | |
385 ss->print("Error exists in the bytecode"); | |
386 break; | |
387 case WRONG_TYPE: | |
388 if (_expected.is_valid()) { | |
389 ss->print("Type "); | |
390 _type.details(ss); | |
391 ss->print(" is not assignable to "); | |
392 _expected.details(ss); | |
393 } else { | |
394 ss->print("Invalid type: "); | |
395 _type.details(ss); | |
396 } | |
397 break; | |
398 case FLAGS_MISMATCH: | |
399 if (_expected.is_valid()) { | |
400 ss->print("Current frame's flags are not assignable " | |
401 "to stack map frame's."); | |
402 } else { | |
403 ss->print("Current frame's flags are invalid in this context."); | |
404 } | |
405 break; | |
406 case BAD_CP_INDEX: | |
407 ss->print("Constant pool index %d is invalid", _type.index()); | |
408 break; | |
409 case BAD_LOCAL_INDEX: | |
410 ss->print("Local index %d is invalid", _type.index()); | |
411 break; | |
412 case LOCALS_SIZE_MISMATCH: | |
413 ss->print("Current frame's local size doesn't match stackmap."); | |
414 break; | |
415 case STACK_SIZE_MISMATCH: | |
416 ss->print("Current frame's stack size doesn't match stackmap."); | |
417 break; | |
418 case STACK_OVERFLOW: | |
419 ss->print("Exceeded max stack size."); | |
420 break; | |
421 case STACK_UNDERFLOW: | |
422 ss->print("Attempt to pop empty stack."); | |
423 break; | |
424 case MISSING_STACKMAP: | |
425 ss->print("Expected stackmap frame at this location."); | |
426 break; | |
427 case BAD_STACKMAP: | |
428 ss->print("Invalid stackmap specification."); | |
429 break; | |
430 case UNKNOWN: | |
431 default: | |
432 ShouldNotReachHere(); | |
433 ss->print_cr("Unknown"); | |
434 } | |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
435 ss->cr(); |
6605 | 436 } |
437 | |
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
9066
diff
changeset
|
438 void ErrorContext::location_details(outputStream* ss, const Method* method) const { |
6605 | 439 if (_bci != -1 && method != NULL) { |
440 streamIndentor si(ss); | |
441 const char* bytecode_name = "<invalid>"; | |
442 if (method->validate_bci_from_bcx(_bci) != -1) { | |
443 Bytecodes::Code code = Bytecodes::code_or_bp_at(method->bcp_from(_bci)); | |
444 if (Bytecodes::is_defined(code)) { | |
445 bytecode_name = Bytecodes::name(code); | |
446 } else { | |
447 bytecode_name = "<illegal>"; | |
448 } | |
449 } | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
450 InstanceKlass* ik = method->method_holder(); |
6605 | 451 ss->indent().print_cr("Location:"); |
452 streamIndentor si2(ss); | |
453 ss->indent().print_cr("%s.%s%s @%d: %s", | |
454 ik->name()->as_C_string(), method->name()->as_C_string(), | |
455 method->signature()->as_C_string(), _bci, bytecode_name); | |
456 } | |
457 } | |
458 | |
459 void ErrorContext::frame_details(outputStream* ss) const { | |
460 streamIndentor si(ss); | |
461 if (_type.is_valid() && _type.frame() != NULL) { | |
462 ss->indent().print_cr("Current Frame:"); | |
463 streamIndentor si2(ss); | |
464 _type.frame()->print_on(ss); | |
465 } | |
466 if (_expected.is_valid() && _expected.frame() != NULL) { | |
467 ss->indent().print_cr("Stackmap Frame:"); | |
468 streamIndentor si2(ss); | |
469 _expected.frame()->print_on(ss); | |
470 } | |
471 } | |
472 | |
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
9066
diff
changeset
|
473 void ErrorContext::bytecode_details(outputStream* ss, const Method* method) const { |
6605 | 474 if (method != NULL) { |
475 streamIndentor si(ss); | |
476 ss->indent().print_cr("Bytecode:"); | |
477 streamIndentor si2(ss); | |
478 ss->print_data(method->code_base(), method->code_size(), false); | |
479 } | |
480 } | |
481 | |
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
9066
diff
changeset
|
482 void ErrorContext::handler_details(outputStream* ss, const Method* method) const { |
6605 | 483 if (method != NULL) { |
484 streamIndentor si(ss); | |
485 ExceptionTable table(method); | |
486 if (table.length() > 0) { | |
487 ss->indent().print_cr("Exception Handler Table:"); | |
488 streamIndentor si2(ss); | |
489 for (int i = 0; i < table.length(); ++i) { | |
490 ss->indent().print_cr("bci [%d, %d] => handler: %d", table.start_pc(i), | |
491 table.end_pc(i), table.handler_pc(i)); | |
492 } | |
493 } | |
494 } | |
495 } | |
496 | |
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
9066
diff
changeset
|
497 void ErrorContext::stackmap_details(outputStream* ss, const Method* method) const { |
6605 | 498 if (method != NULL && method->has_stackmap_table()) { |
499 streamIndentor si(ss); | |
500 ss->indent().print_cr("Stackmap Table:"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
501 Array<u1>* data = method->stackmap_data(); |
6605 | 502 stack_map_table* sm_table = |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
503 stack_map_table::at((address)data->adr_at(0)); |
6605 | 504 stack_map_frame* sm_frame = sm_table->entries(); |
505 streamIndentor si2(ss); | |
506 int current_offset = -1; | |
507 for (u2 i = 0; i < sm_table->number_of_entries(); ++i) { | |
508 ss->indent(); | |
509 sm_frame->print_on(ss, current_offset); | |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
510 ss->cr(); |
6605 | 511 current_offset += sm_frame->offset_delta(); |
512 sm_frame = sm_frame->next(); | |
513 } | |
514 } | |
515 } | |
516 | |
0 | 517 // Methods in ClassVerifier |
518 | |
519 ClassVerifier::ClassVerifier( | |
6605 | 520 instanceKlassHandle klass, TRAPS) |
521 : _thread(THREAD), _exception_type(NULL), _message(NULL), _klass(klass) { | |
0 | 522 _this_type = VerificationType::reference_type(klass->name()); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
523 // Create list to hold symbols in reference area. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
524 _symbols = new GrowableArray<Symbol*>(100, 0, NULL); |
0 | 525 } |
526 | |
527 ClassVerifier::~ClassVerifier() { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
528 // Decrement the reference count for any symbols created. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
529 for (int i = 0; i < _symbols->length(); i++) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
530 Symbol* s = _symbols->at(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
531 s->decrement_refcount(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
532 } |
0 | 533 } |
534 | |
1955
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
535 VerificationType ClassVerifier::object_type() const { |
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
536 return VerificationType::reference_type(vmSymbols::java_lang_Object()); |
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
537 } |
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
538 |
6605 | 539 TypeOrigin ClassVerifier::ref_ctx(const char* sig, TRAPS) { |
540 VerificationType vt = VerificationType::reference_type( | |
541 create_temporary_symbol(sig, (int)strlen(sig), THREAD)); | |
542 return TypeOrigin::implicit(vt); | |
543 } | |
544 | |
0 | 545 void ClassVerifier::verify_class(TRAPS) { |
6605 | 546 if (VerboseVerification) { |
0 | 547 tty->print_cr("Verifying class %s with new format", |
548 _klass->external_name()); | |
549 } | |
550 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
551 Array<Method*>* methods = _klass->methods(); |
0 | 552 int num_methods = methods->length(); |
553 | |
554 for (int index = 0; index < num_methods; index++) { | |
1570 | 555 // Check for recursive re-verification before each method. |
556 if (was_recursively_verified()) return; | |
557 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
558 Method* m = methods->at(index); |
6934 | 559 if (m->is_native() || m->is_abstract() || m->is_overpass()) { |
0 | 560 // If m is native or abstract, skip it. It is checked in class file |
6934 | 561 // parser that methods do not override a final method. Overpass methods |
562 // are trusted since the VM generates them. | |
0 | 563 continue; |
564 } | |
565 verify_method(methodHandle(THREAD, m), CHECK_VERIFY(this)); | |
566 } | |
1570 | 567 |
6605 | 568 if (VerboseVerification || TraceClassInitialization) { |
1570 | 569 if (was_recursively_verified()) |
570 tty->print_cr("Recursive verification detected for: %s", | |
571 _klass->external_name()); | |
572 } | |
0 | 573 } |
574 | |
575 void ClassVerifier::verify_method(methodHandle m, TRAPS) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
576 HandleMark hm(THREAD); |
0 | 577 _method = m; // initialize _method |
6605 | 578 if (VerboseVerification) { |
0 | 579 tty->print_cr("Verifying method %s", m->name_and_sig_as_C_string()); |
580 } | |
581 | |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
582 // For clang, the only good constant format string is a literal constant format string. |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
583 #define bad_type_msg "Bad type on operand stack in %s" |
0 | 584 |
6271
93c71eb28866
7188911: nightly failures after JSR 292 lazy method handle update (round 2)
twisti
parents:
6214
diff
changeset
|
585 int32_t max_stack = m->verifier_max_stack(); |
0 | 586 int32_t max_locals = m->max_locals(); |
587 constantPoolHandle cp(THREAD, m->constants()); | |
588 | |
589 if (!SignatureVerifier::is_valid_method_signature(m->signature())) { | |
590 class_format_error("Invalid method signature"); | |
591 return; | |
592 } | |
593 | |
594 // Initial stack map frame: offset is 0, stack is initially empty. | |
595 StackMapFrame current_frame(max_locals, max_stack, this); | |
596 // Set initial locals | |
597 VerificationType return_type = current_frame.set_locals_from_arg( | |
598 m, current_type(), CHECK_VERIFY(this)); | |
599 | |
600 int32_t stackmap_index = 0; // index to the stackmap array | |
601 | |
602 u4 code_length = m->code_size(); | |
603 | |
604 // Scan the bytecode and map each instruction's start offset to a number. | |
605 char* code_data = generate_code_data(m, code_length, CHECK_VERIFY(this)); | |
606 | |
607 int ex_min = code_length; | |
608 int ex_max = -1; | |
609 // Look through each item on the exception table. Each of the fields must refer | |
610 // to a legal instruction. | |
611 verify_exception_handler_table( | |
612 code_length, code_data, ex_min, ex_max, CHECK_VERIFY(this)); | |
613 | |
614 // Look through each entry on the local variable table and make sure | |
615 // its range of code array offsets is valid. (4169817) | |
616 if (m->has_localvariable_table()) { | |
617 verify_local_variable_table(code_length, code_data, CHECK_VERIFY(this)); | |
618 } | |
619 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
620 Array<u1>* stackmap_data = m->stackmap_data(); |
0 | 621 StackMapStream stream(stackmap_data); |
622 StackMapReader reader(this, &stream, code_data, code_length, THREAD); | |
623 StackMapTable stackmap_table(&reader, ¤t_frame, max_locals, max_stack, | |
624 code_data, code_length, CHECK_VERIFY(this)); | |
625 | |
6605 | 626 if (VerboseVerification) { |
627 stackmap_table.print_on(tty); | |
0 | 628 } |
629 | |
630 RawBytecodeStream bcs(m); | |
631 | |
632 // Scan the byte code linearly from the start to the end | |
633 bool no_control_flow = false; // Set to true when there is no direct control | |
634 // flow from current instruction to the next | |
635 // instruction in sequence | |
17573 | 636 |
0 | 637 Bytecodes::Code opcode; |
638 while (!bcs.is_last_bytecode()) { | |
1570 | 639 // Check for recursive re-verification before each bytecode. |
640 if (was_recursively_verified()) return; | |
641 | |
0 | 642 opcode = bcs.raw_next(); |
643 u2 bci = bcs.bci(); | |
644 | |
645 // Set current frame's offset to bci | |
646 current_frame.set_offset(bci); | |
6605 | 647 current_frame.set_mark(); |
0 | 648 |
649 // Make sure every offset in stackmap table point to the beginning to | |
650 // an instruction. Match current_frame to stackmap_table entry with | |
651 // the same offset if exists. | |
652 stackmap_index = verify_stackmap_table( | |
653 stackmap_index, bci, ¤t_frame, &stackmap_table, | |
654 no_control_flow, CHECK_VERIFY(this)); | |
655 | |
6605 | 656 |
0 | 657 bool this_uninit = false; // Set to true when invokespecial <init> initialized 'this' |
22916
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
658 bool verified_exc_handlers = false; |
0 | 659 |
660 // Merge with the next instruction | |
661 { | |
662 u2 index; | |
663 int target; | |
664 VerificationType type, type2; | |
665 VerificationType atype; | |
666 | |
667 #ifndef PRODUCT | |
6605 | 668 if (VerboseVerification) { |
669 current_frame.print_on(tty); | |
0 | 670 tty->print_cr("offset = %d, opcode = %s", bci, Bytecodes::name(opcode)); |
671 } | |
672 #endif | |
673 | |
674 // Make sure wide instruction is in correct format | |
675 if (bcs.is_wide()) { | |
676 if (opcode != Bytecodes::_iinc && opcode != Bytecodes::_iload && | |
677 opcode != Bytecodes::_aload && opcode != Bytecodes::_lload && | |
678 opcode != Bytecodes::_istore && opcode != Bytecodes::_astore && | |
679 opcode != Bytecodes::_lstore && opcode != Bytecodes::_fload && | |
680 opcode != Bytecodes::_dload && opcode != Bytecodes::_fstore && | |
681 opcode != Bytecodes::_dstore) { | |
6605 | 682 /* Unreachable? RawBytecodeStream's raw_next() returns 'illegal' |
683 * if we encounter a wide instruction that modifies an invalid | |
684 * opcode (not one of the ones listed above) */ | |
685 verify_error(ErrorContext::bad_code(bci), "Bad wide instruction"); | |
0 | 686 return; |
687 } | |
688 } | |
689 | |
22916
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
690 // Look for possible jump target in exception handlers and see if it |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
691 // matches current_frame. Do this check here for astore*, dstore*, |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
692 // fstore*, istore*, and lstore* opcodes because they can change the type |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
693 // state by adding a local. JVM Spec says that the incoming type state |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
694 // should be used for this check. So, do the check here before a possible |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
695 // local is added to the type state. |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
696 if (Bytecodes::is_store_into_local(opcode) && bci >= ex_min && bci < ex_max) { |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
697 verify_exception_handler_targets( |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
698 bci, this_uninit, ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
699 verified_exc_handlers = true; |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
700 } |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
701 |
0 | 702 switch (opcode) { |
703 case Bytecodes::_nop : | |
704 no_control_flow = false; break; | |
705 case Bytecodes::_aconst_null : | |
706 current_frame.push_stack( | |
707 VerificationType::null_type(), CHECK_VERIFY(this)); | |
708 no_control_flow = false; break; | |
709 case Bytecodes::_iconst_m1 : | |
710 case Bytecodes::_iconst_0 : | |
711 case Bytecodes::_iconst_1 : | |
712 case Bytecodes::_iconst_2 : | |
713 case Bytecodes::_iconst_3 : | |
714 case Bytecodes::_iconst_4 : | |
715 case Bytecodes::_iconst_5 : | |
716 current_frame.push_stack( | |
717 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
718 no_control_flow = false; break; | |
719 case Bytecodes::_lconst_0 : | |
720 case Bytecodes::_lconst_1 : | |
721 current_frame.push_stack_2( | |
722 VerificationType::long_type(), | |
723 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
724 no_control_flow = false; break; | |
725 case Bytecodes::_fconst_0 : | |
726 case Bytecodes::_fconst_1 : | |
727 case Bytecodes::_fconst_2 : | |
728 current_frame.push_stack( | |
729 VerificationType::float_type(), CHECK_VERIFY(this)); | |
730 no_control_flow = false; break; | |
731 case Bytecodes::_dconst_0 : | |
732 case Bytecodes::_dconst_1 : | |
733 current_frame.push_stack_2( | |
734 VerificationType::double_type(), | |
735 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
736 no_control_flow = false; break; | |
737 case Bytecodes::_sipush : | |
738 case Bytecodes::_bipush : | |
739 current_frame.push_stack( | |
740 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
741 no_control_flow = false; break; | |
742 case Bytecodes::_ldc : | |
743 verify_ldc( | |
1565 | 744 opcode, bcs.get_index_u1(), ¤t_frame, |
0 | 745 cp, bci, CHECK_VERIFY(this)); |
746 no_control_flow = false; break; | |
747 case Bytecodes::_ldc_w : | |
748 case Bytecodes::_ldc2_w : | |
749 verify_ldc( | |
1565 | 750 opcode, bcs.get_index_u2(), ¤t_frame, |
0 | 751 cp, bci, CHECK_VERIFY(this)); |
752 no_control_flow = false; break; | |
753 case Bytecodes::_iload : | |
754 verify_iload(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
755 no_control_flow = false; break; | |
756 case Bytecodes::_iload_0 : | |
757 case Bytecodes::_iload_1 : | |
758 case Bytecodes::_iload_2 : | |
759 case Bytecodes::_iload_3 : | |
760 index = opcode - Bytecodes::_iload_0; | |
761 verify_iload(index, ¤t_frame, CHECK_VERIFY(this)); | |
762 no_control_flow = false; break; | |
763 case Bytecodes::_lload : | |
764 verify_lload(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
765 no_control_flow = false; break; | |
766 case Bytecodes::_lload_0 : | |
767 case Bytecodes::_lload_1 : | |
768 case Bytecodes::_lload_2 : | |
769 case Bytecodes::_lload_3 : | |
770 index = opcode - Bytecodes::_lload_0; | |
771 verify_lload(index, ¤t_frame, CHECK_VERIFY(this)); | |
772 no_control_flow = false; break; | |
773 case Bytecodes::_fload : | |
774 verify_fload(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
775 no_control_flow = false; break; | |
776 case Bytecodes::_fload_0 : | |
777 case Bytecodes::_fload_1 : | |
778 case Bytecodes::_fload_2 : | |
779 case Bytecodes::_fload_3 : | |
780 index = opcode - Bytecodes::_fload_0; | |
781 verify_fload(index, ¤t_frame, CHECK_VERIFY(this)); | |
782 no_control_flow = false; break; | |
783 case Bytecodes::_dload : | |
784 verify_dload(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
785 no_control_flow = false; break; | |
786 case Bytecodes::_dload_0 : | |
787 case Bytecodes::_dload_1 : | |
788 case Bytecodes::_dload_2 : | |
789 case Bytecodes::_dload_3 : | |
790 index = opcode - Bytecodes::_dload_0; | |
791 verify_dload(index, ¤t_frame, CHECK_VERIFY(this)); | |
792 no_control_flow = false; break; | |
793 case Bytecodes::_aload : | |
794 verify_aload(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
795 no_control_flow = false; break; | |
796 case Bytecodes::_aload_0 : | |
797 case Bytecodes::_aload_1 : | |
798 case Bytecodes::_aload_2 : | |
799 case Bytecodes::_aload_3 : | |
800 index = opcode - Bytecodes::_aload_0; | |
801 verify_aload(index, ¤t_frame, CHECK_VERIFY(this)); | |
802 no_control_flow = false; break; | |
803 case Bytecodes::_iaload : | |
804 type = current_frame.pop_stack( | |
805 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
806 atype = current_frame.pop_stack( | |
807 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
808 if (!atype.is_int_array()) { | |
6605 | 809 verify_error(ErrorContext::bad_type(bci, |
810 current_frame.stack_top_ctx(), ref_ctx("[I", THREAD)), | |
811 bad_type_msg, "iaload"); | |
0 | 812 return; |
813 } | |
814 current_frame.push_stack( | |
815 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
816 no_control_flow = false; break; | |
817 case Bytecodes::_baload : | |
818 type = current_frame.pop_stack( | |
819 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
820 atype = current_frame.pop_stack( | |
821 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
822 if (!atype.is_bool_array() && !atype.is_byte_array()) { | |
6605 | 823 verify_error( |
824 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
825 bad_type_msg, "baload"); | |
0 | 826 return; |
827 } | |
828 current_frame.push_stack( | |
829 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
830 no_control_flow = false; break; | |
831 case Bytecodes::_caload : | |
832 type = current_frame.pop_stack( | |
833 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
834 atype = current_frame.pop_stack( | |
835 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
836 if (!atype.is_char_array()) { | |
6605 | 837 verify_error(ErrorContext::bad_type(bci, |
838 current_frame.stack_top_ctx(), ref_ctx("[C", THREAD)), | |
839 bad_type_msg, "caload"); | |
0 | 840 return; |
841 } | |
842 current_frame.push_stack( | |
843 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
844 no_control_flow = false; break; | |
845 case Bytecodes::_saload : | |
846 type = current_frame.pop_stack( | |
847 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
848 atype = current_frame.pop_stack( | |
849 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
850 if (!atype.is_short_array()) { | |
6605 | 851 verify_error(ErrorContext::bad_type(bci, |
852 current_frame.stack_top_ctx(), ref_ctx("[S", THREAD)), | |
853 bad_type_msg, "saload"); | |
0 | 854 return; |
855 } | |
856 current_frame.push_stack( | |
857 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
858 no_control_flow = false; break; | |
859 case Bytecodes::_laload : | |
860 type = current_frame.pop_stack( | |
861 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
862 atype = current_frame.pop_stack( | |
863 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
864 if (!atype.is_long_array()) { | |
6605 | 865 verify_error(ErrorContext::bad_type(bci, |
866 current_frame.stack_top_ctx(), ref_ctx("[J", THREAD)), | |
867 bad_type_msg, "laload"); | |
0 | 868 return; |
869 } | |
870 current_frame.push_stack_2( | |
871 VerificationType::long_type(), | |
872 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
873 no_control_flow = false; break; | |
874 case Bytecodes::_faload : | |
875 type = current_frame.pop_stack( | |
876 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
877 atype = current_frame.pop_stack( | |
878 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
879 if (!atype.is_float_array()) { | |
6605 | 880 verify_error(ErrorContext::bad_type(bci, |
881 current_frame.stack_top_ctx(), ref_ctx("[F", THREAD)), | |
882 bad_type_msg, "faload"); | |
0 | 883 return; |
884 } | |
885 current_frame.push_stack( | |
886 VerificationType::float_type(), CHECK_VERIFY(this)); | |
887 no_control_flow = false; break; | |
888 case Bytecodes::_daload : | |
889 type = current_frame.pop_stack( | |
890 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
891 atype = current_frame.pop_stack( | |
892 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
893 if (!atype.is_double_array()) { | |
6605 | 894 verify_error(ErrorContext::bad_type(bci, |
895 current_frame.stack_top_ctx(), ref_ctx("[D", THREAD)), | |
896 bad_type_msg, "daload"); | |
0 | 897 return; |
898 } | |
899 current_frame.push_stack_2( | |
900 VerificationType::double_type(), | |
901 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
902 no_control_flow = false; break; | |
903 case Bytecodes::_aaload : { | |
904 type = current_frame.pop_stack( | |
905 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
906 atype = current_frame.pop_stack( | |
907 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
908 if (!atype.is_reference_array()) { | |
6605 | 909 verify_error(ErrorContext::bad_type(bci, |
910 current_frame.stack_top_ctx(), | |
911 TypeOrigin::implicit(VerificationType::reference_check())), | |
912 bad_type_msg, "aaload"); | |
0 | 913 return; |
914 } | |
915 if (atype.is_null()) { | |
916 current_frame.push_stack( | |
917 VerificationType::null_type(), CHECK_VERIFY(this)); | |
918 } else { | |
919 VerificationType component = | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
920 atype.get_component(this, CHECK_VERIFY(this)); |
0 | 921 current_frame.push_stack(component, CHECK_VERIFY(this)); |
922 } | |
923 no_control_flow = false; break; | |
924 } | |
925 case Bytecodes::_istore : | |
926 verify_istore(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
927 no_control_flow = false; break; | |
928 case Bytecodes::_istore_0 : | |
929 case Bytecodes::_istore_1 : | |
930 case Bytecodes::_istore_2 : | |
931 case Bytecodes::_istore_3 : | |
932 index = opcode - Bytecodes::_istore_0; | |
933 verify_istore(index, ¤t_frame, CHECK_VERIFY(this)); | |
934 no_control_flow = false; break; | |
935 case Bytecodes::_lstore : | |
936 verify_lstore(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
937 no_control_flow = false; break; | |
938 case Bytecodes::_lstore_0 : | |
939 case Bytecodes::_lstore_1 : | |
940 case Bytecodes::_lstore_2 : | |
941 case Bytecodes::_lstore_3 : | |
942 index = opcode - Bytecodes::_lstore_0; | |
943 verify_lstore(index, ¤t_frame, CHECK_VERIFY(this)); | |
944 no_control_flow = false; break; | |
945 case Bytecodes::_fstore : | |
946 verify_fstore(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
947 no_control_flow = false; break; | |
948 case Bytecodes::_fstore_0 : | |
949 case Bytecodes::_fstore_1 : | |
950 case Bytecodes::_fstore_2 : | |
951 case Bytecodes::_fstore_3 : | |
952 index = opcode - Bytecodes::_fstore_0; | |
953 verify_fstore(index, ¤t_frame, CHECK_VERIFY(this)); | |
954 no_control_flow = false; break; | |
955 case Bytecodes::_dstore : | |
956 verify_dstore(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
957 no_control_flow = false; break; | |
958 case Bytecodes::_dstore_0 : | |
959 case Bytecodes::_dstore_1 : | |
960 case Bytecodes::_dstore_2 : | |
961 case Bytecodes::_dstore_3 : | |
962 index = opcode - Bytecodes::_dstore_0; | |
963 verify_dstore(index, ¤t_frame, CHECK_VERIFY(this)); | |
964 no_control_flow = false; break; | |
965 case Bytecodes::_astore : | |
966 verify_astore(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
967 no_control_flow = false; break; | |
968 case Bytecodes::_astore_0 : | |
969 case Bytecodes::_astore_1 : | |
970 case Bytecodes::_astore_2 : | |
971 case Bytecodes::_astore_3 : | |
972 index = opcode - Bytecodes::_astore_0; | |
973 verify_astore(index, ¤t_frame, CHECK_VERIFY(this)); | |
974 no_control_flow = false; break; | |
975 case Bytecodes::_iastore : | |
976 type = current_frame.pop_stack( | |
977 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
978 type2 = current_frame.pop_stack( | |
979 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
980 atype = current_frame.pop_stack( | |
981 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
982 if (!atype.is_int_array()) { | |
6605 | 983 verify_error(ErrorContext::bad_type(bci, |
984 current_frame.stack_top_ctx(), ref_ctx("[I", THREAD)), | |
985 bad_type_msg, "iastore"); | |
0 | 986 return; |
987 } | |
988 no_control_flow = false; break; | |
989 case Bytecodes::_bastore : | |
990 type = current_frame.pop_stack( | |
991 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
992 type2 = current_frame.pop_stack( | |
993 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
994 atype = current_frame.pop_stack( | |
995 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
996 if (!atype.is_bool_array() && !atype.is_byte_array()) { | |
6605 | 997 verify_error( |
998 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
999 bad_type_msg, "bastore"); | |
0 | 1000 return; |
1001 } | |
1002 no_control_flow = false; break; | |
1003 case Bytecodes::_castore : | |
1004 current_frame.pop_stack( | |
1005 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1006 current_frame.pop_stack( | |
1007 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1008 atype = current_frame.pop_stack( | |
1009 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1010 if (!atype.is_char_array()) { | |
6605 | 1011 verify_error(ErrorContext::bad_type(bci, |
1012 current_frame.stack_top_ctx(), ref_ctx("[C", THREAD)), | |
1013 bad_type_msg, "castore"); | |
0 | 1014 return; |
1015 } | |
1016 no_control_flow = false; break; | |
1017 case Bytecodes::_sastore : | |
1018 current_frame.pop_stack( | |
1019 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1020 current_frame.pop_stack( | |
1021 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1022 atype = current_frame.pop_stack( | |
1023 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1024 if (!atype.is_short_array()) { | |
6605 | 1025 verify_error(ErrorContext::bad_type(bci, |
1026 current_frame.stack_top_ctx(), ref_ctx("[S", THREAD)), | |
1027 bad_type_msg, "sastore"); | |
0 | 1028 return; |
1029 } | |
1030 no_control_flow = false; break; | |
1031 case Bytecodes::_lastore : | |
1032 current_frame.pop_stack_2( | |
1033 VerificationType::long2_type(), | |
1034 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1035 current_frame.pop_stack( | |
1036 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1037 atype = current_frame.pop_stack( | |
1038 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1039 if (!atype.is_long_array()) { | |
6605 | 1040 verify_error(ErrorContext::bad_type(bci, |
1041 current_frame.stack_top_ctx(), ref_ctx("[J", THREAD)), | |
1042 bad_type_msg, "lastore"); | |
0 | 1043 return; |
1044 } | |
1045 no_control_flow = false; break; | |
1046 case Bytecodes::_fastore : | |
1047 current_frame.pop_stack( | |
1048 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1049 current_frame.pop_stack | |
1050 (VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1051 atype = current_frame.pop_stack( | |
1052 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1053 if (!atype.is_float_array()) { | |
6605 | 1054 verify_error(ErrorContext::bad_type(bci, |
1055 current_frame.stack_top_ctx(), ref_ctx("[F", THREAD)), | |
1056 bad_type_msg, "fastore"); | |
0 | 1057 return; |
1058 } | |
1059 no_control_flow = false; break; | |
1060 case Bytecodes::_dastore : | |
1061 current_frame.pop_stack_2( | |
1062 VerificationType::double2_type(), | |
1063 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1064 current_frame.pop_stack( | |
1065 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1066 atype = current_frame.pop_stack( | |
1067 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1068 if (!atype.is_double_array()) { | |
6605 | 1069 verify_error(ErrorContext::bad_type(bci, |
1070 current_frame.stack_top_ctx(), ref_ctx("[D", THREAD)), | |
1071 bad_type_msg, "dastore"); | |
0 | 1072 return; |
1073 } | |
1074 no_control_flow = false; break; | |
1075 case Bytecodes::_aastore : | |
1955
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
1076 type = current_frame.pop_stack(object_type(), CHECK_VERIFY(this)); |
0 | 1077 type2 = current_frame.pop_stack( |
1078 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1079 atype = current_frame.pop_stack( | |
1080 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1081 // more type-checking is done at runtime | |
1082 if (!atype.is_reference_array()) { | |
6605 | 1083 verify_error(ErrorContext::bad_type(bci, |
1084 current_frame.stack_top_ctx(), | |
1085 TypeOrigin::implicit(VerificationType::reference_check())), | |
1086 bad_type_msg, "aastore"); | |
0 | 1087 return; |
1088 } | |
1089 // 4938384: relaxed constraint in JVMS 3nd edition. | |
1090 no_control_flow = false; break; | |
1091 case Bytecodes::_pop : | |
1092 current_frame.pop_stack( | |
1093 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1094 no_control_flow = false; break; | |
1095 case Bytecodes::_pop2 : | |
1096 type = current_frame.pop_stack(CHECK_VERIFY(this)); | |
1097 if (type.is_category1()) { | |
1098 current_frame.pop_stack( | |
1099 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1100 } else if (type.is_category2_2nd()) { | |
1101 current_frame.pop_stack( | |
1102 VerificationType::category2_check(), CHECK_VERIFY(this)); | |
1103 } else { | |
6605 | 1104 /* Unreachable? Would need a category2_1st on TOS |
1105 * which does not appear possible. */ | |
1106 verify_error( | |
1107 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
1108 bad_type_msg, "pop2"); | |
0 | 1109 return; |
1110 } | |
1111 no_control_flow = false; break; | |
1112 case Bytecodes::_dup : | |
1113 type = current_frame.pop_stack( | |
1114 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1115 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1116 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1117 no_control_flow = false; break; | |
1118 case Bytecodes::_dup_x1 : | |
1119 type = current_frame.pop_stack( | |
1120 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1121 type2 = current_frame.pop_stack( | |
1122 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1123 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1124 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1125 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1126 no_control_flow = false; break; | |
1127 case Bytecodes::_dup_x2 : | |
1128 { | |
1129 VerificationType type3; | |
1130 type = current_frame.pop_stack( | |
1131 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1132 type2 = current_frame.pop_stack(CHECK_VERIFY(this)); | |
1133 if (type2.is_category1()) { | |
1134 type3 = current_frame.pop_stack( | |
1135 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1136 } else if (type2.is_category2_2nd()) { | |
1137 type3 = current_frame.pop_stack( | |
1138 VerificationType::category2_check(), CHECK_VERIFY(this)); | |
1139 } else { | |
6605 | 1140 /* Unreachable? Would need a category2_1st at stack depth 2 with |
1141 * a category1 on TOS which does not appear possible. */ | |
1142 verify_error(ErrorContext::bad_type( | |
1143 bci, current_frame.stack_top_ctx()), bad_type_msg, "dup_x2"); | |
0 | 1144 return; |
1145 } | |
1146 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1147 current_frame.push_stack(type3, CHECK_VERIFY(this)); | |
1148 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1149 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1150 no_control_flow = false; break; | |
1151 } | |
1152 case Bytecodes::_dup2 : | |
1153 type = current_frame.pop_stack(CHECK_VERIFY(this)); | |
1154 if (type.is_category1()) { | |
1155 type2 = current_frame.pop_stack( | |
1156 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1157 } else if (type.is_category2_2nd()) { | |
1158 type2 = current_frame.pop_stack( | |
1159 VerificationType::category2_check(), CHECK_VERIFY(this)); | |
1160 } else { | |
6605 | 1161 /* Unreachable? Would need a category2_1st on TOS which does not |
1162 * appear possible. */ | |
1163 verify_error( | |
1164 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
1165 bad_type_msg, "dup2"); | |
0 | 1166 return; |
1167 } | |
1168 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1169 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1170 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1171 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1172 no_control_flow = false; break; | |
1173 case Bytecodes::_dup2_x1 : | |
1174 { | |
1175 VerificationType type3; | |
1176 type = current_frame.pop_stack(CHECK_VERIFY(this)); | |
1177 if (type.is_category1()) { | |
1178 type2 = current_frame.pop_stack( | |
1179 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
6605 | 1180 } else if (type.is_category2_2nd()) { |
1181 type2 = current_frame.pop_stack( | |
1182 VerificationType::category2_check(), CHECK_VERIFY(this)); | |
0 | 1183 } else { |
6605 | 1184 /* Unreachable? Would need a category2_1st on TOS which does |
1185 * not appear possible. */ | |
1186 verify_error( | |
1187 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
1188 bad_type_msg, "dup2_x1"); | |
0 | 1189 return; |
1190 } | |
1191 type3 = current_frame.pop_stack( | |
1192 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1193 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1194 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1195 current_frame.push_stack(type3, CHECK_VERIFY(this)); | |
1196 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1197 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1198 no_control_flow = false; break; | |
1199 } | |
1200 case Bytecodes::_dup2_x2 : | |
1201 { | |
1202 VerificationType type3, type4; | |
1203 type = current_frame.pop_stack(CHECK_VERIFY(this)); | |
1204 if (type.is_category1()) { | |
1205 type2 = current_frame.pop_stack( | |
1206 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1207 } else if (type.is_category2_2nd()) { | |
1208 type2 = current_frame.pop_stack( | |
1209 VerificationType::category2_check(), CHECK_VERIFY(this)); | |
1210 } else { | |
6605 | 1211 /* Unreachable? Would need a category2_1st on TOS which does |
1212 * not appear possible. */ | |
1213 verify_error( | |
1214 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
1215 bad_type_msg, "dup2_x2"); | |
0 | 1216 return; |
1217 } | |
1218 type3 = current_frame.pop_stack(CHECK_VERIFY(this)); | |
1219 if (type3.is_category1()) { | |
1220 type4 = current_frame.pop_stack( | |
1221 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1222 } else if (type3.is_category2_2nd()) { | |
1223 type4 = current_frame.pop_stack( | |
1224 VerificationType::category2_check(), CHECK_VERIFY(this)); | |
1225 } else { | |
6605 | 1226 /* Unreachable? Would need a category2_1st on TOS after popping |
1227 * a long/double or two category 1's, which does not | |
1228 * appear possible. */ | |
1229 verify_error( | |
1230 ErrorContext::bad_type(bci, current_frame.stack_top_ctx()), | |
1231 bad_type_msg, "dup2_x2"); | |
0 | 1232 return; |
1233 } | |
1234 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1235 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1236 current_frame.push_stack(type4, CHECK_VERIFY(this)); | |
1237 current_frame.push_stack(type3, CHECK_VERIFY(this)); | |
1238 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1239 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1240 no_control_flow = false; break; | |
1241 } | |
1242 case Bytecodes::_swap : | |
1243 type = current_frame.pop_stack( | |
1244 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1245 type2 = current_frame.pop_stack( | |
1246 VerificationType::category1_check(), CHECK_VERIFY(this)); | |
1247 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1248 current_frame.push_stack(type2, CHECK_VERIFY(this)); | |
1249 no_control_flow = false; break; | |
1250 case Bytecodes::_iadd : | |
1251 case Bytecodes::_isub : | |
1252 case Bytecodes::_imul : | |
1253 case Bytecodes::_idiv : | |
1254 case Bytecodes::_irem : | |
1255 case Bytecodes::_ishl : | |
1256 case Bytecodes::_ishr : | |
1257 case Bytecodes::_iushr : | |
1258 case Bytecodes::_ior : | |
1259 case Bytecodes::_ixor : | |
1260 case Bytecodes::_iand : | |
1261 current_frame.pop_stack( | |
1262 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1263 // fall through | |
1264 case Bytecodes::_ineg : | |
1265 current_frame.pop_stack( | |
1266 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1267 current_frame.push_stack( | |
1268 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1269 no_control_flow = false; break; | |
1270 case Bytecodes::_ladd : | |
1271 case Bytecodes::_lsub : | |
1272 case Bytecodes::_lmul : | |
1273 case Bytecodes::_ldiv : | |
1274 case Bytecodes::_lrem : | |
1275 case Bytecodes::_land : | |
1276 case Bytecodes::_lor : | |
1277 case Bytecodes::_lxor : | |
1278 current_frame.pop_stack_2( | |
1279 VerificationType::long2_type(), | |
1280 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1281 // fall through | |
1282 case Bytecodes::_lneg : | |
1283 current_frame.pop_stack_2( | |
1284 VerificationType::long2_type(), | |
1285 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1286 current_frame.push_stack_2( | |
1287 VerificationType::long_type(), | |
1288 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1289 no_control_flow = false; break; | |
1290 case Bytecodes::_lshl : | |
1291 case Bytecodes::_lshr : | |
1292 case Bytecodes::_lushr : | |
1293 current_frame.pop_stack( | |
1294 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1295 current_frame.pop_stack_2( | |
1296 VerificationType::long2_type(), | |
1297 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1298 current_frame.push_stack_2( | |
1299 VerificationType::long_type(), | |
1300 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1301 no_control_flow = false; break; | |
1302 case Bytecodes::_fadd : | |
1303 case Bytecodes::_fsub : | |
1304 case Bytecodes::_fmul : | |
1305 case Bytecodes::_fdiv : | |
1306 case Bytecodes::_frem : | |
1307 current_frame.pop_stack( | |
1308 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1309 // fall through | |
1310 case Bytecodes::_fneg : | |
1311 current_frame.pop_stack( | |
1312 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1313 current_frame.push_stack( | |
1314 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1315 no_control_flow = false; break; | |
1316 case Bytecodes::_dadd : | |
1317 case Bytecodes::_dsub : | |
1318 case Bytecodes::_dmul : | |
1319 case Bytecodes::_ddiv : | |
1320 case Bytecodes::_drem : | |
1321 current_frame.pop_stack_2( | |
1322 VerificationType::double2_type(), | |
1323 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1324 // fall through | |
1325 case Bytecodes::_dneg : | |
1326 current_frame.pop_stack_2( | |
1327 VerificationType::double2_type(), | |
1328 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1329 current_frame.push_stack_2( | |
1330 VerificationType::double_type(), | |
1331 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
1332 no_control_flow = false; break; | |
1333 case Bytecodes::_iinc : | |
1334 verify_iinc(bcs.get_index(), ¤t_frame, CHECK_VERIFY(this)); | |
1335 no_control_flow = false; break; | |
1336 case Bytecodes::_i2l : | |
1337 type = current_frame.pop_stack( | |
1338 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1339 current_frame.push_stack_2( | |
1340 VerificationType::long_type(), | |
1341 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1342 no_control_flow = false; break; | |
1343 case Bytecodes::_l2i : | |
1344 current_frame.pop_stack_2( | |
1345 VerificationType::long2_type(), | |
1346 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1347 current_frame.push_stack( | |
1348 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1349 no_control_flow = false; break; | |
1350 case Bytecodes::_i2f : | |
1351 current_frame.pop_stack( | |
1352 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1353 current_frame.push_stack( | |
1354 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1355 no_control_flow = false; break; | |
1356 case Bytecodes::_i2d : | |
1357 current_frame.pop_stack( | |
1358 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1359 current_frame.push_stack_2( | |
1360 VerificationType::double_type(), | |
1361 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
1362 no_control_flow = false; break; | |
1363 case Bytecodes::_l2f : | |
1364 current_frame.pop_stack_2( | |
1365 VerificationType::long2_type(), | |
1366 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1367 current_frame.push_stack( | |
1368 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1369 no_control_flow = false; break; | |
1370 case Bytecodes::_l2d : | |
1371 current_frame.pop_stack_2( | |
1372 VerificationType::long2_type(), | |
1373 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1374 current_frame.push_stack_2( | |
1375 VerificationType::double_type(), | |
1376 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
1377 no_control_flow = false; break; | |
1378 case Bytecodes::_f2i : | |
1379 current_frame.pop_stack( | |
1380 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1381 current_frame.push_stack( | |
1382 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1383 no_control_flow = false; break; | |
1384 case Bytecodes::_f2l : | |
1385 current_frame.pop_stack( | |
1386 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1387 current_frame.push_stack_2( | |
1388 VerificationType::long_type(), | |
1389 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1390 no_control_flow = false; break; | |
1391 case Bytecodes::_f2d : | |
1392 current_frame.pop_stack( | |
1393 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1394 current_frame.push_stack_2( | |
1395 VerificationType::double_type(), | |
1396 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
1397 no_control_flow = false; break; | |
1398 case Bytecodes::_d2i : | |
1399 current_frame.pop_stack_2( | |
1400 VerificationType::double2_type(), | |
1401 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1402 current_frame.push_stack( | |
1403 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1404 no_control_flow = false; break; | |
1405 case Bytecodes::_d2l : | |
1406 current_frame.pop_stack_2( | |
1407 VerificationType::double2_type(), | |
1408 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1409 current_frame.push_stack_2( | |
1410 VerificationType::long_type(), | |
1411 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1412 no_control_flow = false; break; | |
1413 case Bytecodes::_d2f : | |
1414 current_frame.pop_stack_2( | |
1415 VerificationType::double2_type(), | |
1416 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1417 current_frame.push_stack( | |
1418 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1419 no_control_flow = false; break; | |
1420 case Bytecodes::_i2b : | |
1421 case Bytecodes::_i2c : | |
1422 case Bytecodes::_i2s : | |
1423 current_frame.pop_stack( | |
1424 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1425 current_frame.push_stack( | |
1426 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1427 no_control_flow = false; break; | |
1428 case Bytecodes::_lcmp : | |
1429 current_frame.pop_stack_2( | |
1430 VerificationType::long2_type(), | |
1431 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1432 current_frame.pop_stack_2( | |
1433 VerificationType::long2_type(), | |
1434 VerificationType::long_type(), CHECK_VERIFY(this)); | |
1435 current_frame.push_stack( | |
1436 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1437 no_control_flow = false; break; | |
1438 case Bytecodes::_fcmpl : | |
1439 case Bytecodes::_fcmpg : | |
1440 current_frame.pop_stack( | |
1441 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1442 current_frame.pop_stack( | |
1443 VerificationType::float_type(), CHECK_VERIFY(this)); | |
1444 current_frame.push_stack( | |
1445 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1446 no_control_flow = false; break; | |
1447 case Bytecodes::_dcmpl : | |
1448 case Bytecodes::_dcmpg : | |
1449 current_frame.pop_stack_2( | |
1450 VerificationType::double2_type(), | |
1451 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1452 current_frame.pop_stack_2( | |
1453 VerificationType::double2_type(), | |
1454 VerificationType::double_type(), CHECK_VERIFY(this)); | |
1455 current_frame.push_stack( | |
1456 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1457 no_control_flow = false; break; | |
1458 case Bytecodes::_if_icmpeq: | |
1459 case Bytecodes::_if_icmpne: | |
1460 case Bytecodes::_if_icmplt: | |
1461 case Bytecodes::_if_icmpge: | |
1462 case Bytecodes::_if_icmpgt: | |
1463 case Bytecodes::_if_icmple: | |
1464 current_frame.pop_stack( | |
1465 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1466 // fall through | |
1467 case Bytecodes::_ifeq: | |
1468 case Bytecodes::_ifne: | |
1469 case Bytecodes::_iflt: | |
1470 case Bytecodes::_ifge: | |
1471 case Bytecodes::_ifgt: | |
1472 case Bytecodes::_ifle: | |
1473 current_frame.pop_stack( | |
1474 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1475 target = bcs.dest(); | |
1476 stackmap_table.check_jump_target( | |
1477 ¤t_frame, target, CHECK_VERIFY(this)); | |
1478 no_control_flow = false; break; | |
1479 case Bytecodes::_if_acmpeq : | |
1480 case Bytecodes::_if_acmpne : | |
1481 current_frame.pop_stack( | |
1482 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1483 // fall through | |
1484 case Bytecodes::_ifnull : | |
1485 case Bytecodes::_ifnonnull : | |
1486 current_frame.pop_stack( | |
1487 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1488 target = bcs.dest(); | |
1489 stackmap_table.check_jump_target | |
1490 (¤t_frame, target, CHECK_VERIFY(this)); | |
1491 no_control_flow = false; break; | |
1492 case Bytecodes::_goto : | |
1493 target = bcs.dest(); | |
1494 stackmap_table.check_jump_target( | |
1495 ¤t_frame, target, CHECK_VERIFY(this)); | |
1496 no_control_flow = true; break; | |
1497 case Bytecodes::_goto_w : | |
1498 target = bcs.dest_w(); | |
1499 stackmap_table.check_jump_target( | |
1500 ¤t_frame, target, CHECK_VERIFY(this)); | |
1501 no_control_flow = true; break; | |
1502 case Bytecodes::_tableswitch : | |
1503 case Bytecodes::_lookupswitch : | |
1504 verify_switch( | |
1505 &bcs, code_length, code_data, ¤t_frame, | |
1506 &stackmap_table, CHECK_VERIFY(this)); | |
1507 no_control_flow = true; break; | |
1508 case Bytecodes::_ireturn : | |
1509 type = current_frame.pop_stack( | |
1510 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
6605 | 1511 verify_return_value(return_type, type, bci, |
1512 ¤t_frame, CHECK_VERIFY(this)); | |
0 | 1513 no_control_flow = true; break; |
1514 case Bytecodes::_lreturn : | |
1515 type2 = current_frame.pop_stack( | |
1516 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1517 type = current_frame.pop_stack( | |
1518 VerificationType::long_type(), CHECK_VERIFY(this)); | |
6605 | 1519 verify_return_value(return_type, type, bci, |
1520 ¤t_frame, CHECK_VERIFY(this)); | |
0 | 1521 no_control_flow = true; break; |
1522 case Bytecodes::_freturn : | |
1523 type = current_frame.pop_stack( | |
1524 VerificationType::float_type(), CHECK_VERIFY(this)); | |
6605 | 1525 verify_return_value(return_type, type, bci, |
1526 ¤t_frame, CHECK_VERIFY(this)); | |
0 | 1527 no_control_flow = true; break; |
1528 case Bytecodes::_dreturn : | |
1529 type2 = current_frame.pop_stack( | |
1530 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
1531 type = current_frame.pop_stack( | |
1532 VerificationType::double_type(), CHECK_VERIFY(this)); | |
6605 | 1533 verify_return_value(return_type, type, bci, |
1534 ¤t_frame, CHECK_VERIFY(this)); | |
0 | 1535 no_control_flow = true; break; |
1536 case Bytecodes::_areturn : | |
1537 type = current_frame.pop_stack( | |
1538 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
6605 | 1539 verify_return_value(return_type, type, bci, |
1540 ¤t_frame, CHECK_VERIFY(this)); | |
0 | 1541 no_control_flow = true; break; |
1542 case Bytecodes::_return : | |
1543 if (return_type != VerificationType::bogus_type()) { | |
6605 | 1544 verify_error(ErrorContext::bad_code(bci), |
1545 "Method expects a return value"); | |
0 | 1546 return; |
1547 } | |
1548 // Make sure "this" has been initialized if current method is an | |
1549 // <init> | |
1550 if (_method->name() == vmSymbols::object_initializer_name() && | |
1551 current_frame.flag_this_uninit()) { | |
6605 | 1552 verify_error(ErrorContext::bad_code(bci), |
1553 "Constructor must call super() or this() " | |
1554 "before return"); | |
0 | 1555 return; |
1556 } | |
1557 no_control_flow = true; break; | |
1558 case Bytecodes::_getstatic : | |
1559 case Bytecodes::_putstatic : | |
1560 case Bytecodes::_getfield : | |
1561 case Bytecodes::_putfield : | |
1562 verify_field_instructions( | |
1563 &bcs, ¤t_frame, cp, CHECK_VERIFY(this)); | |
1564 no_control_flow = false; break; | |
1565 case Bytecodes::_invokevirtual : | |
1566 case Bytecodes::_invokespecial : | |
1567 case Bytecodes::_invokestatic : | |
1568 verify_invoke_instructions( | |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
1569 &bcs, code_length, ¤t_frame, (bci >= ex_min && bci < ex_max), |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
1570 &this_uninit, return_type, cp, &stackmap_table, CHECK_VERIFY(this)); |
0 | 1571 no_control_flow = false; break; |
1572 case Bytecodes::_invokeinterface : | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
1573 case Bytecodes::_invokedynamic : |
0 | 1574 verify_invoke_instructions( |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
1575 &bcs, code_length, ¤t_frame, (bci >= ex_min && bci < ex_max), |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
1576 &this_uninit, return_type, cp, &stackmap_table, CHECK_VERIFY(this)); |
0 | 1577 no_control_flow = false; break; |
1578 case Bytecodes::_new : | |
1579 { | |
1565 | 1580 index = bcs.get_index_u2(); |
6605 | 1581 verify_cp_class_type(bci, index, cp, CHECK_VERIFY(this)); |
0 | 1582 VerificationType new_class_type = |
1583 cp_index_to_type(index, cp, CHECK_VERIFY(this)); | |
1584 if (!new_class_type.is_object()) { | |
6605 | 1585 verify_error(ErrorContext::bad_type(bci, |
1586 TypeOrigin::cp(index, new_class_type)), | |
1587 "Illegal new instruction"); | |
0 | 1588 return; |
1589 } | |
1590 type = VerificationType::uninitialized_type(bci); | |
1591 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1592 no_control_flow = false; break; | |
1593 } | |
1594 case Bytecodes::_newarray : | |
1595 type = get_newarray_type(bcs.get_index(), bci, CHECK_VERIFY(this)); | |
1596 current_frame.pop_stack( | |
1597 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1598 current_frame.push_stack(type, CHECK_VERIFY(this)); | |
1599 no_control_flow = false; break; | |
1600 case Bytecodes::_anewarray : | |
1601 verify_anewarray( | |
6605 | 1602 bci, bcs.get_index_u2(), cp, ¤t_frame, CHECK_VERIFY(this)); |
0 | 1603 no_control_flow = false; break; |
1604 case Bytecodes::_arraylength : | |
1605 type = current_frame.pop_stack( | |
1606 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
134
8a79f7ec8f5d
6692246: Regression : JDK 6u4 b01 fails two JCK tests when fallback is switched off
kamg
parents:
0
diff
changeset
|
1607 if (!(type.is_null() || type.is_array())) { |
6605 | 1608 verify_error(ErrorContext::bad_type( |
1609 bci, current_frame.stack_top_ctx()), | |
1610 bad_type_msg, "arraylength"); | |
0 | 1611 } |
1612 current_frame.push_stack( | |
1613 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1614 no_control_flow = false; break; | |
1615 case Bytecodes::_checkcast : | |
1616 { | |
1565 | 1617 index = bcs.get_index_u2(); |
6605 | 1618 verify_cp_class_type(bci, index, cp, CHECK_VERIFY(this)); |
1955
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
1619 current_frame.pop_stack(object_type(), CHECK_VERIFY(this)); |
0 | 1620 VerificationType klass_type = cp_index_to_type( |
1621 index, cp, CHECK_VERIFY(this)); | |
1622 current_frame.push_stack(klass_type, CHECK_VERIFY(this)); | |
1623 no_control_flow = false; break; | |
1624 } | |
1625 case Bytecodes::_instanceof : { | |
1565 | 1626 index = bcs.get_index_u2(); |
6605 | 1627 verify_cp_class_type(bci, index, cp, CHECK_VERIFY(this)); |
1955
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
1628 current_frame.pop_stack(object_type(), CHECK_VERIFY(this)); |
0 | 1629 current_frame.push_stack( |
1630 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1631 no_control_flow = false; break; | |
1632 } | |
1633 case Bytecodes::_monitorenter : | |
1634 case Bytecodes::_monitorexit : | |
1635 current_frame.pop_stack( | |
1636 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
1637 no_control_flow = false; break; | |
1638 case Bytecodes::_multianewarray : | |
1639 { | |
1565 | 1640 index = bcs.get_index_u2(); |
0 | 1641 u2 dim = *(bcs.bcp()+3); |
6605 | 1642 verify_cp_class_type(bci, index, cp, CHECK_VERIFY(this)); |
0 | 1643 VerificationType new_array_type = |
1644 cp_index_to_type(index, cp, CHECK_VERIFY(this)); | |
1645 if (!new_array_type.is_array()) { | |
6605 | 1646 verify_error(ErrorContext::bad_type(bci, |
1647 TypeOrigin::cp(index, new_array_type)), | |
1648 "Illegal constant pool index in multianewarray instruction"); | |
0 | 1649 return; |
1650 } | |
1651 if (dim < 1 || new_array_type.dimensions() < dim) { | |
6605 | 1652 verify_error(ErrorContext::bad_code(bci), |
1653 "Illegal dimension in multianewarray instruction: %d", dim); | |
0 | 1654 return; |
1655 } | |
1656 for (int i = 0; i < dim; i++) { | |
1657 current_frame.pop_stack( | |
1658 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1659 } | |
1660 current_frame.push_stack(new_array_type, CHECK_VERIFY(this)); | |
1661 no_control_flow = false; break; | |
1662 } | |
1663 case Bytecodes::_athrow : | |
1664 type = VerificationType::reference_type( | |
1665 vmSymbols::java_lang_Throwable()); | |
1666 current_frame.pop_stack(type, CHECK_VERIFY(this)); | |
1667 no_control_flow = true; break; | |
1668 default: | |
1669 // We only need to check the valid bytecodes in class file. | |
1670 // And jsr and ret are not in the new class file format in JDK1.5. | |
6605 | 1671 verify_error(ErrorContext::bad_code(bci), |
1672 "Bad instruction: %02x", opcode); | |
0 | 1673 no_control_flow = false; |
1674 return; | |
1675 } // end switch | |
1676 } // end Merge with the next instruction | |
1677 | |
22916
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1678 // Look for possible jump target in exception handlers and see if it matches |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1679 // current_frame. Don't do this check if it has already been done (for |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1680 // ([a,d,f,i,l]store* opcodes). This check cannot be done earlier because |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1681 // opcodes, such as invokespecial, may set the this_uninit flag. |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1682 assert(!(verified_exc_handlers && this_uninit), |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1683 "Exception handler targets got verified before this_uninit got set"); |
6b65121b3258
7127066: Class verifier accepts an invalid class file
hseigel
parents:
22893
diff
changeset
|
1684 if (!verified_exc_handlers && bci >= ex_min && bci < ex_max) { |
0 | 1685 verify_exception_handler_targets( |
1686 bci, this_uninit, ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); | |
1687 } | |
1688 } // end while | |
1689 | |
1690 // Make sure that control flow does not fall through end of the method | |
1691 if (!no_control_flow) { | |
6605 | 1692 verify_error(ErrorContext::bad_code(code_length), |
1693 "Control flow falls through code end"); | |
0 | 1694 return; |
1695 } | |
1696 } | |
1697 | |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
1698 #undef bad_type_message |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
1699 |
0 | 1700 char* ClassVerifier::generate_code_data(methodHandle m, u4 code_length, TRAPS) { |
1701 char* code_data = NEW_RESOURCE_ARRAY(char, code_length); | |
1702 memset(code_data, 0, sizeof(char) * code_length); | |
1703 RawBytecodeStream bcs(m); | |
1704 | |
1705 while (!bcs.is_last_bytecode()) { | |
1706 if (bcs.raw_next() != Bytecodes::_illegal) { | |
1707 int bci = bcs.bci(); | |
1565 | 1708 if (bcs.raw_code() == Bytecodes::_new) { |
0 | 1709 code_data[bci] = NEW_OFFSET; |
1710 } else { | |
1711 code_data[bci] = BYTECODE_OFFSET; | |
1712 } | |
1713 } else { | |
6605 | 1714 verify_error(ErrorContext::bad_code(bcs.bci()), "Bad instruction"); |
0 | 1715 return NULL; |
1716 } | |
1717 } | |
1718 | |
1719 return code_data; | |
1720 } | |
1721 | |
1722 void ClassVerifier::verify_exception_handler_table(u4 code_length, char* code_data, int& min, int& max, TRAPS) { | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1723 ExceptionTable exhandlers(_method()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1724 int exlength = exhandlers.length(); |
0 | 1725 constantPoolHandle cp (THREAD, _method->constants()); |
1726 | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1727 for(int i = 0; i < exlength; i++) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1728 //reacquire the table in case a GC happened |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1729 ExceptionTable exhandlers(_method()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1730 u2 start_pc = exhandlers.start_pc(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1731 u2 end_pc = exhandlers.end_pc(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1732 u2 handler_pc = exhandlers.handler_pc(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1733 if (start_pc >= code_length || code_data[start_pc] == 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1734 class_format_error("Illegal exception table start_pc %d", start_pc); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1735 return; |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1736 } |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1737 if (end_pc != code_length) { // special case: end_pc == code_length |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1738 if (end_pc > code_length || code_data[end_pc] == 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1739 class_format_error("Illegal exception table end_pc %d", end_pc); |
0 | 1740 return; |
1741 } | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1742 } |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1743 if (handler_pc >= code_length || code_data[handler_pc] == 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1744 class_format_error("Illegal exception table handler_pc %d", handler_pc); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1745 return; |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1746 } |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1747 int catch_type_index = exhandlers.catch_type_index(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1748 if (catch_type_index != 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1749 VerificationType catch_type = cp_index_to_type( |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1750 catch_type_index, cp, CHECK_VERIFY(this)); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1751 VerificationType throwable = |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1752 VerificationType::reference_type(vmSymbols::java_lang_Throwable()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1753 bool is_subclass = throwable.is_assignable_from( |
18052 | 1754 catch_type, this, false, CHECK_VERIFY(this)); |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1755 if (!is_subclass) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1756 // 4286534: should throw VerifyError according to recent spec change |
6605 | 1757 verify_error(ErrorContext::bad_type(handler_pc, |
1758 TypeOrigin::cp(catch_type_index, catch_type), | |
1759 TypeOrigin::implicit(throwable)), | |
1760 "Catch type is not a subclass " | |
1761 "of Throwable in exception handler %d", handler_pc); | |
0 | 1762 return; |
1763 } | |
1764 } | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1765 if (start_pc < min) min = start_pc; |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1766 if (end_pc > max) max = end_pc; |
0 | 1767 } |
1768 } | |
1769 | |
1770 void ClassVerifier::verify_local_variable_table(u4 code_length, char* code_data, TRAPS) { | |
1771 int localvariable_table_length = _method()->localvariable_table_length(); | |
1772 if (localvariable_table_length > 0) { | |
1773 LocalVariableTableElement* table = _method()->localvariable_table_start(); | |
1774 for (int i = 0; i < localvariable_table_length; i++) { | |
1775 u2 start_bci = table[i].start_bci; | |
1776 u2 length = table[i].length; | |
1777 | |
1778 if (start_bci >= code_length || code_data[start_bci] == 0) { | |
1779 class_format_error( | |
1780 "Illegal local variable table start_pc %d", start_bci); | |
1781 return; | |
1782 } | |
1783 u4 end_bci = (u4)(start_bci + length); | |
1784 if (end_bci != code_length) { | |
1785 if (end_bci >= code_length || code_data[end_bci] == 0) { | |
1786 class_format_error( "Illegal local variable table length %d", length); | |
1787 return; | |
1788 } | |
1789 } | |
1790 } | |
1791 } | |
1792 } | |
1793 | |
1794 u2 ClassVerifier::verify_stackmap_table(u2 stackmap_index, u2 bci, | |
1795 StackMapFrame* current_frame, | |
1796 StackMapTable* stackmap_table, | |
1797 bool no_control_flow, TRAPS) { | |
1798 if (stackmap_index < stackmap_table->get_frame_count()) { | |
1799 u2 this_offset = stackmap_table->get_offset(stackmap_index); | |
1800 if (no_control_flow && this_offset > bci) { | |
6605 | 1801 verify_error(ErrorContext::missing_stackmap(bci), |
1802 "Expecting a stack map frame"); | |
0 | 1803 return 0; |
1804 } | |
1805 if (this_offset == bci) { | |
6605 | 1806 ErrorContext ctx; |
0 | 1807 // See if current stack map can be assigned to the frame in table. |
1808 // current_frame is the stackmap frame got from the last instruction. | |
1809 // If matched, current_frame will be updated by this method. | |
6605 | 1810 bool matches = stackmap_table->match_stackmap( |
0 | 1811 current_frame, this_offset, stackmap_index, |
20740
7c9925f21c25
8051012: Regression in verifier for <init> method call from inside of a branch
hseigel
parents:
18010
diff
changeset
|
1812 !no_control_flow, true, false, &ctx, CHECK_VERIFY_(this, 0)); |
6605 | 1813 if (!matches) { |
0 | 1814 // report type error |
6605 | 1815 verify_error(ctx, "Instruction type does not match stack map"); |
0 | 1816 return 0; |
1817 } | |
1818 stackmap_index++; | |
1819 } else if (this_offset < bci) { | |
1820 // current_offset should have met this_offset. | |
1821 class_format_error("Bad stack map offset %d", this_offset); | |
1822 return 0; | |
1823 } | |
1824 } else if (no_control_flow) { | |
6605 | 1825 verify_error(ErrorContext::bad_code(bci), "Expecting a stack map frame"); |
0 | 1826 return 0; |
1827 } | |
1828 return stackmap_index; | |
1829 } | |
1830 | |
1831 void ClassVerifier::verify_exception_handler_targets(u2 bci, bool this_uninit, StackMapFrame* current_frame, | |
1832 StackMapTable* stackmap_table, TRAPS) { | |
1833 constantPoolHandle cp (THREAD, _method->constants()); | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1834 ExceptionTable exhandlers(_method()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1835 int exlength = exhandlers.length(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1836 for(int i = 0; i < exlength; i++) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1837 //reacquire the table in case a GC happened |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1838 ExceptionTable exhandlers(_method()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1839 u2 start_pc = exhandlers.start_pc(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1840 u2 end_pc = exhandlers.end_pc(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1841 u2 handler_pc = exhandlers.handler_pc(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1842 int catch_type_index = exhandlers.catch_type_index(i); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1843 if(bci >= start_pc && bci < end_pc) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1844 u1 flags = current_frame->flags(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1845 if (this_uninit) { flags |= FLAG_THIS_UNINIT; } |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1846 StackMapFrame* new_frame = current_frame->frame_in_exception_handler(flags); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1847 if (catch_type_index != 0) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1848 // We know that this index refers to a subclass of Throwable |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1849 VerificationType catch_type = cp_index_to_type( |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1850 catch_type_index, cp, CHECK_VERIFY(this)); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1851 new_frame->push_stack(catch_type, CHECK_VERIFY(this)); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1852 } else { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1853 VerificationType throwable = |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1854 VerificationType::reference_type(vmSymbols::java_lang_Throwable()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1855 new_frame->push_stack(throwable, CHECK_VERIFY(this)); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1856 } |
6605 | 1857 ErrorContext ctx; |
1858 bool matches = stackmap_table->match_stackmap( | |
20740
7c9925f21c25
8051012: Regression in verifier for <init> method call from inside of a branch
hseigel
parents:
18010
diff
changeset
|
1859 new_frame, handler_pc, true, false, true, &ctx, CHECK_VERIFY(this)); |
6605 | 1860 if (!matches) { |
1861 verify_error(ctx, "Stack map does not match the one at " | |
1862 "exception handler %d", handler_pc); | |
6213
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
6118
diff
changeset
|
1863 return; |
0 | 1864 } |
1865 } | |
1866 } | |
1867 } | |
1868 | |
6605 | 1869 void ClassVerifier::verify_cp_index( |
1870 u2 bci, constantPoolHandle cp, int index, TRAPS) { | |
0 | 1871 int nconstants = cp->length(); |
1872 if ((index <= 0) || (index >= nconstants)) { | |
6605 | 1873 verify_error(ErrorContext::bad_cp_index(bci, index), |
1874 "Illegal constant pool index %d in class %s", | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
1875 index, cp->pool_holder()->external_name()); |
0 | 1876 return; |
1877 } | |
1878 } | |
1879 | |
1880 void ClassVerifier::verify_cp_type( | |
6605 | 1881 u2 bci, int index, constantPoolHandle cp, unsigned int types, TRAPS) { |
0 | 1882 |
1883 // In some situations, bytecode rewriting may occur while we're verifying. | |
1884 // In this case, a constant pool cache exists and some indices refer to that | |
1570 | 1885 // instead. Be sure we don't pick up such indices by accident. |
1886 // We must check was_recursively_verified() before we get here. | |
1887 guarantee(cp->cache() == NULL, "not rewritten yet"); | |
0 | 1888 |
6605 | 1889 verify_cp_index(bci, cp, index, CHECK_VERIFY(this)); |
0 | 1890 unsigned int tag = cp->tag_at(index).value(); |
1891 if ((types & (1 << tag)) == 0) { | |
6605 | 1892 verify_error(ErrorContext::bad_cp_index(bci, index), |
0 | 1893 "Illegal type at constant pool entry %d in class %s", |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
1894 index, cp->pool_holder()->external_name()); |
0 | 1895 return; |
1896 } | |
1897 } | |
1898 | |
1899 void ClassVerifier::verify_cp_class_type( | |
6605 | 1900 u2 bci, int index, constantPoolHandle cp, TRAPS) { |
1901 verify_cp_index(bci, cp, index, CHECK_VERIFY(this)); | |
0 | 1902 constantTag tag = cp->tag_at(index); |
1903 if (!tag.is_klass() && !tag.is_unresolved_klass()) { | |
6605 | 1904 verify_error(ErrorContext::bad_cp_index(bci, index), |
1905 "Illegal type at constant pool entry %d in class %s", | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
1906 index, cp->pool_holder()->external_name()); |
0 | 1907 return; |
1908 } | |
1909 } | |
1910 | |
6605 | 1911 void ClassVerifier::verify_error(ErrorContext ctx, const char* msg, ...) { |
1912 stringStream ss; | |
0 | 1913 |
6605 | 1914 ctx.reset_frames(); |
0 | 1915 _exception_type = vmSymbols::java_lang_VerifyError(); |
6605 | 1916 _error_context = ctx; |
0 | 1917 va_list va; |
6605 | 1918 va_start(va, msg); |
1919 ss.vprint(msg, va); | |
0 | 1920 va_end(va); |
6605 | 1921 _message = ss.as_string(); |
1922 #ifdef ASSERT | |
1923 ResourceMark rm; | |
1924 const char* exception_name = _exception_type->as_C_string(); | |
1925 Exceptions::debug_check_abort(exception_name, NULL); | |
1926 #endif // ndef ASSERT | |
0 | 1927 } |
1928 | |
1929 void ClassVerifier::class_format_error(const char* msg, ...) { | |
6605 | 1930 stringStream ss; |
0 | 1931 _exception_type = vmSymbols::java_lang_ClassFormatError(); |
1932 va_list va; | |
1933 va_start(va, msg); | |
6605 | 1934 ss.vprint(msg, va); |
0 | 1935 va_end(va); |
6605 | 1936 if (!_method.is_null()) { |
1937 ss.print(" in method %s", _method->name_and_sig_as_C_string()); | |
1938 } | |
1939 _message = ss.as_string(); | |
0 | 1940 } |
1941 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
1942 Klass* ClassVerifier::load_class(Symbol* name, TRAPS) { |
0 | 1943 // Get current loader and protection domain first. |
1944 oop loader = current_class()->class_loader(); | |
1945 oop protection_domain = current_class()->protection_domain(); | |
1946 | |
1947 return SystemDictionary::resolve_or_fail( | |
1948 name, Handle(THREAD, loader), Handle(THREAD, protection_domain), | |
1949 true, CHECK_NULL); | |
1950 } | |
1951 | |
1952 bool ClassVerifier::is_protected_access(instanceKlassHandle this_class, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
1953 Klass* target_class, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
1954 Symbol* field_name, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
1955 Symbol* field_sig, |
0 | 1956 bool is_method) { |
1957 No_Safepoint_Verifier nosafepoint; | |
1958 | |
1959 // If target class isn't a super class of this class, we don't worry about this case | |
1960 if (!this_class->is_subclass_of(target_class)) { | |
1961 return false; | |
1962 } | |
1963 // Check if the specified method or field is protected | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
1964 InstanceKlass* target_instance = InstanceKlass::cast(target_class); |
0 | 1965 fieldDescriptor fd; |
1966 if (is_method) { | |
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
13401
diff
changeset
|
1967 Method* m = target_instance->uncached_lookup_method(field_name, field_sig, Klass::normal); |
0 | 1968 if (m != NULL && m->is_protected()) { |
1969 if (!this_class->is_same_class_package(m->method_holder())) { | |
1970 return true; | |
1971 } | |
1972 } | |
1973 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
1974 Klass* member_klass = target_instance->find_field(field_name, field_sig, &fd); |
6605 | 1975 if (member_klass != NULL && fd.is_protected()) { |
0 | 1976 if (!this_class->is_same_class_package(member_klass)) { |
1977 return true; | |
1978 } | |
1979 } | |
1980 } | |
1981 return false; | |
1982 } | |
1983 | |
1984 void ClassVerifier::verify_ldc( | |
6605 | 1985 int opcode, u2 index, StackMapFrame* current_frame, |
1986 constantPoolHandle cp, u2 bci, TRAPS) { | |
1987 verify_cp_index(bci, cp, index, CHECK_VERIFY(this)); | |
0 | 1988 constantTag tag = cp->tag_at(index); |
1989 unsigned int types; | |
1990 if (opcode == Bytecodes::_ldc || opcode == Bytecodes::_ldc_w) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
1991 if (!tag.is_unresolved_klass()) { |
0 | 1992 types = (1 << JVM_CONSTANT_Integer) | (1 << JVM_CONSTANT_Float) |
1602 | 1993 | (1 << JVM_CONSTANT_String) | (1 << JVM_CONSTANT_Class) |
1994 | (1 << JVM_CONSTANT_MethodHandle) | (1 << JVM_CONSTANT_MethodType); | |
1995 // Note: The class file parser already verified the legality of | |
1996 // MethodHandle and MethodType constants. | |
6605 | 1997 verify_cp_type(bci, index, cp, types, CHECK_VERIFY(this)); |
0 | 1998 } |
1999 } else { | |
2000 assert(opcode == Bytecodes::_ldc2_w, "must be ldc2_w"); | |
2001 types = (1 << JVM_CONSTANT_Double) | (1 << JVM_CONSTANT_Long); | |
6605 | 2002 verify_cp_type(bci, index, cp, types, CHECK_VERIFY(this)); |
0 | 2003 } |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
2004 if (tag.is_string() && cp->is_pseudo_string_at(index)) { |
1955
1070423b51f3
6865028: Illegal instructions passing verification prior to 'invokespecial Object.<init>'
kamg
parents:
1678
diff
changeset
|
2005 current_frame->push_stack(object_type(), CHECK_VERIFY(this)); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2006 } else if (tag.is_string()) { |
0 | 2007 current_frame->push_stack( |
2008 VerificationType::reference_type( | |
2009 vmSymbols::java_lang_String()), CHECK_VERIFY(this)); | |
2010 } else if (tag.is_klass() || tag.is_unresolved_klass()) { | |
2011 current_frame->push_stack( | |
2012 VerificationType::reference_type( | |
2013 vmSymbols::java_lang_Class()), CHECK_VERIFY(this)); | |
2014 } else if (tag.is_int()) { | |
2015 current_frame->push_stack( | |
2016 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2017 } else if (tag.is_float()) { | |
2018 current_frame->push_stack( | |
2019 VerificationType::float_type(), CHECK_VERIFY(this)); | |
2020 } else if (tag.is_double()) { | |
2021 current_frame->push_stack_2( | |
2022 VerificationType::double_type(), | |
2023 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
2024 } else if (tag.is_long()) { | |
2025 current_frame->push_stack_2( | |
2026 VerificationType::long_type(), | |
2027 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
1602 | 2028 } else if (tag.is_method_handle()) { |
2029 current_frame->push_stack( | |
2030 VerificationType::reference_type( | |
2460 | 2031 vmSymbols::java_lang_invoke_MethodHandle()), CHECK_VERIFY(this)); |
1602 | 2032 } else if (tag.is_method_type()) { |
2033 current_frame->push_stack( | |
2034 VerificationType::reference_type( | |
2460 | 2035 vmSymbols::java_lang_invoke_MethodType()), CHECK_VERIFY(this)); |
0 | 2036 } else { |
6605 | 2037 /* Unreachable? verify_cp_type has already validated the cp type. */ |
2038 verify_error( | |
2039 ErrorContext::bad_cp_index(bci, index), "Invalid index in ldc"); | |
0 | 2040 return; |
2041 } | |
2042 } | |
2043 | |
2044 void ClassVerifier::verify_switch( | |
2045 RawBytecodeStream* bcs, u4 code_length, char* code_data, | |
2046 StackMapFrame* current_frame, StackMapTable* stackmap_table, TRAPS) { | |
2047 int bci = bcs->bci(); | |
2048 address bcp = bcs->bcp(); | |
2049 address aligned_bcp = (address) round_to((intptr_t)(bcp + 1), jintSize); | |
2050 | |
8816
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2051 if (_klass->major_version() < NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION) { |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2052 // 4639449 & 4647081: padding bytes must be 0 |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2053 u2 padding_offset = 1; |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2054 while ((bcp + padding_offset) < aligned_bcp) { |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2055 if(*(bcp + padding_offset) != 0) { |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2056 verify_error(ErrorContext::bad_code(bci), |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2057 "Nonzero padding byte in lookswitch or tableswitch"); |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2058 return; |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2059 } |
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2060 padding_offset++; |
0 | 2061 } |
2062 } | |
8816
729be16a470b
8010667: Non-zero padding is not allowed in splitverifier for tableswitch/lookupswitch instructions.
hseigel
parents:
8060
diff
changeset
|
2063 |
0 | 2064 int default_offset = (int) Bytes::get_Java_u4(aligned_bcp); |
2065 int keys, delta; | |
2066 current_frame->pop_stack( | |
2067 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
1565 | 2068 if (bcs->raw_code() == Bytecodes::_tableswitch) { |
0 | 2069 jint low = (jint)Bytes::get_Java_u4(aligned_bcp + jintSize); |
2070 jint high = (jint)Bytes::get_Java_u4(aligned_bcp + 2*jintSize); | |
2071 if (low > high) { | |
6605 | 2072 verify_error(ErrorContext::bad_code(bci), |
2073 "low must be less than or equal to high in tableswitch"); | |
0 | 2074 return; |
2075 } | |
2076 keys = high - low + 1; | |
2077 if (keys < 0) { | |
6605 | 2078 verify_error(ErrorContext::bad_code(bci), "too many keys in tableswitch"); |
0 | 2079 return; |
2080 } | |
2081 delta = 1; | |
2082 } else { | |
2083 keys = (int)Bytes::get_Java_u4(aligned_bcp + jintSize); | |
2084 if (keys < 0) { | |
6605 | 2085 verify_error(ErrorContext::bad_code(bci), |
2086 "number of keys in lookupswitch less than 0"); | |
0 | 2087 return; |
2088 } | |
2089 delta = 2; | |
2090 // Make sure that the lookupswitch items are sorted | |
2091 for (int i = 0; i < (keys - 1); i++) { | |
2092 jint this_key = Bytes::get_Java_u4(aligned_bcp + (2+2*i)*jintSize); | |
2093 jint next_key = Bytes::get_Java_u4(aligned_bcp + (2+2*i+2)*jintSize); | |
2094 if (this_key >= next_key) { | |
6605 | 2095 verify_error(ErrorContext::bad_code(bci), |
2096 "Bad lookupswitch instruction"); | |
0 | 2097 return; |
2098 } | |
2099 } | |
2100 } | |
2101 int target = bci + default_offset; | |
2102 stackmap_table->check_jump_target(current_frame, target, CHECK_VERIFY(this)); | |
2103 for (int i = 0; i < keys; i++) { | |
6118 | 2104 // Because check_jump_target() may safepoint, the bytecode could have |
2105 // moved, which means 'aligned_bcp' is no good and needs to be recalculated. | |
2106 aligned_bcp = (address)round_to((intptr_t)(bcs->bcp() + 1), jintSize); | |
0 | 2107 target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize); |
2108 stackmap_table->check_jump_target( | |
2109 current_frame, target, CHECK_VERIFY(this)); | |
2110 } | |
6118 | 2111 NOT_PRODUCT(aligned_bcp = NULL); // no longer valid at this point |
0 | 2112 } |
2113 | |
2114 bool ClassVerifier::name_in_supers( | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2115 Symbol* ref_name, instanceKlassHandle current) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2116 Klass* super = current->super(); |
0 | 2117 while (super != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2118 if (super->name() == ref_name) { |
0 | 2119 return true; |
2120 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2121 super = super->super(); |
0 | 2122 } |
2123 return false; | |
2124 } | |
2125 | |
2126 void ClassVerifier::verify_field_instructions(RawBytecodeStream* bcs, | |
2127 StackMapFrame* current_frame, | |
2128 constantPoolHandle cp, | |
2129 TRAPS) { | |
1565 | 2130 u2 index = bcs->get_index_u2(); |
6605 | 2131 verify_cp_type(bcs->bci(), index, cp, |
2132 1 << JVM_CONSTANT_Fieldref, CHECK_VERIFY(this)); | |
0 | 2133 |
2134 // Get field name and signature | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2135 Symbol* field_name = cp->name_ref_at(index); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2136 Symbol* field_sig = cp->signature_ref_at(index); |
0 | 2137 |
2138 if (!SignatureVerifier::is_valid_type_signature(field_sig)) { | |
2139 class_format_error( | |
2140 "Invalid signature for field in class %s referenced " | |
2141 "from constant pool index %d", _klass->external_name(), index); | |
2142 return; | |
2143 } | |
2144 | |
2145 // Get referenced class type | |
2146 VerificationType ref_class_type = cp_ref_index_to_type( | |
2147 index, cp, CHECK_VERIFY(this)); | |
2148 if (!ref_class_type.is_object()) { | |
6605 | 2149 /* Unreachable? Class file parser verifies Fieldref contents */ |
2150 verify_error(ErrorContext::bad_type(bcs->bci(), | |
2151 TypeOrigin::cp(index, ref_class_type)), | |
2152 "Expecting reference to class in class %s at constant pool index %d", | |
2153 _klass->external_name(), index); | |
0 | 2154 return; |
2155 } | |
2156 VerificationType target_class_type = ref_class_type; | |
2157 | |
2158 assert(sizeof(VerificationType) == sizeof(uintptr_t), | |
2159 "buffer type must match VerificationType size"); | |
2160 uintptr_t field_type_buffer[2]; | |
2161 VerificationType* field_type = (VerificationType*)field_type_buffer; | |
2162 // If we make a VerificationType[2] array directly, the compiler calls | |
2163 // to the c-runtime library to do the allocation instead of just | |
2164 // stack allocating it. Plus it would run constructors. This shows up | |
2165 // in performance profiles. | |
2166 | |
2167 SignatureStream sig_stream(field_sig, false); | |
2168 VerificationType stack_object_type; | |
2169 int n = change_sig_to_verificationType( | |
2170 &sig_stream, field_type, CHECK_VERIFY(this)); | |
2171 u2 bci = bcs->bci(); | |
2172 bool is_assignable; | |
1565 | 2173 switch (bcs->raw_code()) { |
0 | 2174 case Bytecodes::_getstatic: { |
2175 for (int i = 0; i < n; i++) { | |
2176 current_frame->push_stack(field_type[i], CHECK_VERIFY(this)); | |
2177 } | |
2178 break; | |
2179 } | |
2180 case Bytecodes::_putstatic: { | |
2181 for (int i = n - 1; i >= 0; i--) { | |
2182 current_frame->pop_stack(field_type[i], CHECK_VERIFY(this)); | |
2183 } | |
2184 break; | |
2185 } | |
2186 case Bytecodes::_getfield: { | |
2187 stack_object_type = current_frame->pop_stack( | |
2188 target_class_type, CHECK_VERIFY(this)); | |
2189 for (int i = 0; i < n; i++) { | |
2190 current_frame->push_stack(field_type[i], CHECK_VERIFY(this)); | |
2191 } | |
2192 goto check_protected; | |
2193 } | |
2194 case Bytecodes::_putfield: { | |
2195 for (int i = n - 1; i >= 0; i--) { | |
2196 current_frame->pop_stack(field_type[i], CHECK_VERIFY(this)); | |
2197 } | |
2198 stack_object_type = current_frame->pop_stack(CHECK_VERIFY(this)); | |
2199 | |
2200 // The JVMS 2nd edition allows field initialization before the superclass | |
2201 // initializer, if the field is defined within the current class. | |
2202 fieldDescriptor fd; | |
2203 if (stack_object_type == VerificationType::uninitialized_this_type() && | |
2204 target_class_type.equals(current_type()) && | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2205 _klass->find_local_field(field_name, field_sig, &fd)) { |
0 | 2206 stack_object_type = current_type(); |
2207 } | |
2208 is_assignable = target_class_type.is_assignable_from( | |
18052 | 2209 stack_object_type, this, false, CHECK_VERIFY(this)); |
0 | 2210 if (!is_assignable) { |
6605 | 2211 verify_error(ErrorContext::bad_type(bci, |
2212 current_frame->stack_top_ctx(), | |
2213 TypeOrigin::cp(index, target_class_type)), | |
2214 "Bad type on operand stack in putfield"); | |
0 | 2215 return; |
2216 } | |
2217 } | |
2218 check_protected: { | |
2219 if (_this_type == stack_object_type) | |
2220 break; // stack_object_type must be assignable to _current_class_type | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2221 Symbol* ref_class_name = |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2222 cp->klass_name_at(cp->klass_ref_index_at(index)); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2223 if (!name_in_supers(ref_class_name, current_class())) |
0 | 2224 // stack_object_type must be assignable to _current_class_type since: |
2225 // 1. stack_object_type must be assignable to ref_class. | |
2226 // 2. ref_class must be _current_class or a subclass of it. It can't | |
2227 // be a superclass of it. See revised JVMS 5.4.4. | |
2228 break; | |
2229 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2230 Klass* ref_class_oop = load_class(ref_class_name, CHECK); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2231 if (is_protected_access(current_class(), ref_class_oop, field_name, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2232 field_sig, false)) { |
0 | 2233 // It's protected access, check if stack object is assignable to |
2234 // current class. | |
2235 is_assignable = current_type().is_assignable_from( | |
18052 | 2236 stack_object_type, this, true, CHECK_VERIFY(this)); |
0 | 2237 if (!is_assignable) { |
6605 | 2238 verify_error(ErrorContext::bad_type(bci, |
2239 current_frame->stack_top_ctx(), | |
2240 TypeOrigin::implicit(current_type())), | |
2241 "Bad access to protected data in getfield"); | |
0 | 2242 return; |
2243 } | |
2244 } | |
2245 break; | |
2246 } | |
2247 default: ShouldNotReachHere(); | |
2248 } | |
2249 } | |
2250 | |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2251 // Look at the method's handlers. If the bci is in the handler's try block |
22893
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2252 // then check if the handler_pc is already on the stack. If not, push it |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2253 // unless the handler has already been scanned. |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2254 void ClassVerifier::push_handlers(ExceptionTable* exhandlers, |
22893
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2255 GrowableArray<u4>* handler_list, |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2256 GrowableArray<u4>* handler_stack, |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2257 u4 bci) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2258 int exlength = exhandlers->length(); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2259 for(int x = 0; x < exlength; x++) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2260 if (bci >= exhandlers->start_pc(x) && bci < exhandlers->end_pc(x)) { |
22893
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2261 u4 exhandler_pc = exhandlers->handler_pc(x); |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2262 if (!handler_list->contains(exhandler_pc)) { |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2263 handler_stack->append_if_missing(exhandler_pc); |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2264 handler_list->append(exhandler_pc); |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2265 } |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2266 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2267 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2268 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2269 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2270 // Return TRUE if all code paths starting with start_bc_offset end in |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2271 // bytecode athrow or loop. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2272 bool ClassVerifier::ends_in_athrow(u4 start_bc_offset) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2273 ResourceMark rm; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2274 // Create bytecode stream. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2275 RawBytecodeStream bcs(method()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2276 u4 code_length = method()->code_size(); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2277 bcs.set_start(start_bc_offset); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2278 u4 target; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2279 // Create stack for storing bytecode start offsets for if* and *switch. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2280 GrowableArray<u4>* bci_stack = new GrowableArray<u4>(30); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2281 // Create stack for handlers for try blocks containing this handler. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2282 GrowableArray<u4>* handler_stack = new GrowableArray<u4>(30); |
22893
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2283 // Create list of handlers that have been pushed onto the handler_stack |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2284 // so that handlers embedded inside of their own TRY blocks only get |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2285 // scanned once. |
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2286 GrowableArray<u4>* handler_list = new GrowableArray<u4>(30); |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2287 // Create list of visited branch opcodes (goto* and if*). |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2288 GrowableArray<u4>* visited_branches = new GrowableArray<u4>(30); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2289 ExceptionTable exhandlers(_method()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2290 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2291 while (true) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2292 if (bcs.is_last_bytecode()) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2293 // if no more starting offsets to parse or if at the end of the |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2294 // method then return false. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2295 if ((bci_stack->is_empty()) || ((u4)bcs.end_bci() == code_length)) |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2296 return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2297 // Pop a bytecode starting offset and scan from there. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2298 bcs.set_start(bci_stack->pop()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2299 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2300 Bytecodes::Code opcode = bcs.raw_next(); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2301 u4 bci = bcs.bci(); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2302 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2303 // If the bytecode is in a TRY block, push its handlers so they |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2304 // will get parsed. |
22893
695017a614d5
8075118: JVM stuck in infinite loop during verification
hseigel
parents:
22847
diff
changeset
|
2305 push_handlers(&exhandlers, handler_list, handler_stack, bci); |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2306 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2307 switch (opcode) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2308 case Bytecodes::_if_icmpeq: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2309 case Bytecodes::_if_icmpne: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2310 case Bytecodes::_if_icmplt: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2311 case Bytecodes::_if_icmpge: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2312 case Bytecodes::_if_icmpgt: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2313 case Bytecodes::_if_icmple: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2314 case Bytecodes::_ifeq: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2315 case Bytecodes::_ifne: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2316 case Bytecodes::_iflt: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2317 case Bytecodes::_ifge: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2318 case Bytecodes::_ifgt: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2319 case Bytecodes::_ifle: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2320 case Bytecodes::_if_acmpeq: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2321 case Bytecodes::_if_acmpne: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2322 case Bytecodes::_ifnull: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2323 case Bytecodes::_ifnonnull: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2324 target = bcs.dest(); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2325 if (visited_branches->contains(bci)) { |
23938 | 2326 if (bci_stack->is_empty()) { |
2327 if (handler_stack->is_empty()) { | |
2328 return true; | |
2329 } else { | |
2330 // Parse the catch handlers for try blocks containing athrow. | |
2331 bcs.set_start(handler_stack->pop()); | |
2332 } | |
2333 } else { | |
2334 // Pop a bytecode starting offset and scan from there. | |
2335 bcs.set_start(bci_stack->pop()); | |
2336 } | |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2337 } else { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2338 if (target > bci) { // forward branch |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2339 if (target >= code_length) return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2340 // Push the branch target onto the stack. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2341 bci_stack->push(target); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2342 // then, scan bytecodes starting with next. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2343 bcs.set_start(bcs.next_bci()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2344 } else { // backward branch |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2345 // Push bytecode offset following backward branch onto the stack. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2346 bci_stack->push(bcs.next_bci()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2347 // Check bytecodes starting with branch target. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2348 bcs.set_start(target); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2349 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2350 // Record target so we don't branch here again. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2351 visited_branches->append(bci); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2352 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2353 break; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2354 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2355 case Bytecodes::_goto: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2356 case Bytecodes::_goto_w: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2357 target = (opcode == Bytecodes::_goto ? bcs.dest() : bcs.dest_w()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2358 if (visited_branches->contains(bci)) { |
23938 | 2359 if (bci_stack->is_empty()) { |
2360 if (handler_stack->is_empty()) { | |
2361 return true; | |
2362 } else { | |
2363 // Parse the catch handlers for try blocks containing athrow. | |
2364 bcs.set_start(handler_stack->pop()); | |
2365 } | |
2366 } else { | |
2367 // Been here before, pop new starting offset from stack. | |
2368 bcs.set_start(bci_stack->pop()); | |
2369 } | |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2370 } else { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2371 if (target >= code_length) return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2372 // Continue scanning from the target onward. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2373 bcs.set_start(target); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2374 // Record target so we don't branch here again. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2375 visited_branches->append(bci); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2376 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2377 break; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2378 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2379 // Check that all switch alternatives end in 'athrow' bytecodes. Since it |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2380 // is difficult to determine where each switch alternative ends, parse |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2381 // each switch alternative until either hit a 'return', 'athrow', or reach |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2382 // the end of the method's bytecodes. This is gross but should be okay |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2383 // because: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2384 // 1. tableswitch and lookupswitch byte codes in handlers for ctor explicit |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2385 // constructor invocations should be rare. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2386 // 2. if each switch alternative ends in an athrow then the parsing should be |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2387 // short. If there is no athrow then it is bogus code, anyway. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2388 case Bytecodes::_lookupswitch: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2389 case Bytecodes::_tableswitch: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2390 { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2391 address aligned_bcp = (address) round_to((intptr_t)(bcs.bcp() + 1), jintSize); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2392 u4 default_offset = Bytes::get_Java_u4(aligned_bcp) + bci; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2393 int keys, delta; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2394 if (opcode == Bytecodes::_tableswitch) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2395 jint low = (jint)Bytes::get_Java_u4(aligned_bcp + jintSize); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2396 jint high = (jint)Bytes::get_Java_u4(aligned_bcp + 2*jintSize); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2397 // This is invalid, but let the regular bytecode verifier |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2398 // report this because the user will get a better error message. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2399 if (low > high) return true; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2400 keys = high - low + 1; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2401 delta = 1; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2402 } else { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2403 keys = (int)Bytes::get_Java_u4(aligned_bcp + jintSize); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2404 delta = 2; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2405 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2406 // Invalid, let the regular bytecode verifier deal with it. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2407 if (keys < 0) return true; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2408 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2409 // Push the offset of the next bytecode onto the stack. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2410 bci_stack->push(bcs.next_bci()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2411 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2412 // Push the switch alternatives onto the stack. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2413 for (int i = 0; i < keys; i++) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2414 u4 target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2415 if (target > code_length) return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2416 bci_stack->push(target); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2417 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2418 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2419 // Start bytecode parsing for the switch at the default alternative. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2420 if (default_offset > code_length) return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2421 bcs.set_start(default_offset); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2422 break; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2423 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2424 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2425 case Bytecodes::_return: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2426 return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2427 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2428 case Bytecodes::_athrow: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2429 { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2430 if (bci_stack->is_empty()) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2431 if (handler_stack->is_empty()) { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2432 return true; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2433 } else { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2434 // Parse the catch handlers for try blocks containing athrow. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2435 bcs.set_start(handler_stack->pop()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2436 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2437 } else { |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2438 // Pop a bytecode offset and starting scanning from there. |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2439 bcs.set_start(bci_stack->pop()); |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2440 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2441 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2442 break; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2443 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2444 default: |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2445 ; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2446 } // end switch |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2447 } // end while loop |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2448 |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2449 return false; |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2450 } |
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2451 |
0 | 2452 void ClassVerifier::verify_invoke_init( |
6605 | 2453 RawBytecodeStream* bcs, u2 ref_class_index, VerificationType ref_class_type, |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2454 StackMapFrame* current_frame, u4 code_length, bool in_try_block, |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2455 bool *this_uninit, constantPoolHandle cp, StackMapTable* stackmap_table, |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2456 TRAPS) { |
0 | 2457 u2 bci = bcs->bci(); |
2458 VerificationType type = current_frame->pop_stack( | |
2459 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
2460 if (type == VerificationType::uninitialized_this_type()) { | |
6155 | 2461 // The method must be an <init> method of this class or its superclass |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2462 Klass* superk = current_class()->super(); |
1677 | 2463 if (ref_class_type.name() != current_class()->name() && |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2464 ref_class_type.name() != superk->name()) { |
6605 | 2465 verify_error(ErrorContext::bad_type(bci, |
2466 TypeOrigin::implicit(ref_class_type), | |
2467 TypeOrigin::implicit(current_type())), | |
2468 "Bad <init> method call"); | |
0 | 2469 return; |
2470 } | |
17573 | 2471 |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2472 // If this invokespecial call is done from inside of a TRY block then make |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2473 // sure that all catch clause paths end in a throw. Otherwise, this can |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2474 // result in returning an incomplete object. |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2475 if (in_try_block) { |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2476 ExceptionTable exhandlers(_method()); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2477 int exlength = exhandlers.length(); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2478 for(int i = 0; i < exlength; i++) { |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2479 u2 start_pc = exhandlers.start_pc(i); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2480 u2 end_pc = exhandlers.end_pc(i); |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2481 |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2482 if (bci >= start_pc && bci < end_pc) { |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2483 if (!ends_in_athrow(exhandlers.handler_pc(i))) { |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2484 verify_error(ErrorContext::bad_code(bci), |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2485 "Bad <init> method call from after the start of a try block"); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2486 return; |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2487 } else if (VerboseVerification) { |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2488 ResourceMark rm; |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2489 tty->print_cr( |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2490 "Survived call to ends_in_athrow(): %s", |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2491 current_class()->name()->as_C_string()); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2492 } |
18099
077483254bf6
8050485: super() in a try block in a ctor causes VerifyError
hseigel
parents:
18094
diff
changeset
|
2493 } |
17573 | 2494 } |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2495 |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2496 // Check the exception handler target stackmaps with the locals from the |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2497 // incoming stackmap (before initialize_object() changes them to outgoing |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2498 // state). |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2499 verify_exception_handler_targets(bci, true, current_frame, |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2500 stackmap_table, CHECK_VERIFY(this)); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2501 } // in_try_block |
17573 | 2502 |
0 | 2503 current_frame->initialize_object(type, current_type()); |
2504 *this_uninit = true; | |
2505 } else if (type.is_uninitialized()) { | |
2506 u2 new_offset = type.bci(); | |
2507 address new_bcp = bcs->bcp() - bci + new_offset; | |
2508 if (new_offset > (code_length - 3) || (*new_bcp) != Bytecodes::_new) { | |
6605 | 2509 /* Unreachable? Stack map parsing ensures valid type and new |
2510 * instructions have a valid BCI. */ | |
2511 verify_error(ErrorContext::bad_code(new_offset), | |
2512 "Expecting new instruction"); | |
0 | 2513 return; |
2514 } | |
2515 u2 new_class_index = Bytes::get_Java_u2(new_bcp + 1); | |
6605 | 2516 verify_cp_class_type(bci, new_class_index, cp, CHECK_VERIFY(this)); |
0 | 2517 |
2518 // The method must be an <init> method of the indicated class | |
2519 VerificationType new_class_type = cp_index_to_type( | |
2520 new_class_index, cp, CHECK_VERIFY(this)); | |
2521 if (!new_class_type.equals(ref_class_type)) { | |
6605 | 2522 verify_error(ErrorContext::bad_type(bci, |
2523 TypeOrigin::cp(new_class_index, new_class_type), | |
2524 TypeOrigin::cp(ref_class_index, ref_class_type)), | |
2525 "Call to wrong <init> method"); | |
0 | 2526 return; |
2527 } | |
2528 // According to the VM spec, if the referent class is a superclass of the | |
2529 // current class, and is in a different runtime package, and the method is | |
2530 // protected, then the objectref must be the current class or a subclass | |
2531 // of the current class. | |
2532 VerificationType objectref_type = new_class_type; | |
2533 if (name_in_supers(ref_class_type.name(), current_class())) { | |
22847
ecdf1e03db40
8064335: Null pointer dereference in hotspot/src/share/vm/classfile/verifier.cpp
hseigel
parents:
20762
diff
changeset
|
2534 Klass* ref_klass = load_class(ref_class_type.name(), CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2535 Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method( |
0 | 2536 vmSymbols::object_initializer_name(), |
18007 | 2537 cp->signature_ref_at(bcs->get_index_u2()), Klass::normal); |
17593
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2538 // Do nothing if method is not found. Let resolution detect the error. |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2539 if (m != NULL) { |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2540 instanceKlassHandle mh(THREAD, m->method_holder()); |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2541 if (m->is_protected() && !mh->is_same_class_package(_klass())) { |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2542 bool assignable = current_type().is_assignable_from( |
18060 | 2543 objectref_type, this, true, CHECK_VERIFY(this)); |
17593
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2544 if (!assignable) { |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2545 verify_error(ErrorContext::bad_type(bci, |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2546 TypeOrigin::cp(new_class_index, objectref_type), |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2547 TypeOrigin::implicit(current_type())), |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2548 "Bad access to protected <init> method"); |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2549 return; |
e6b738407432
8043454: Test case for 8037157 should not throw a VerifyError
hseigel
parents:
17583
diff
changeset
|
2550 } |
0 | 2551 } |
2552 } | |
2553 } | |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2554 // Check the exception handler target stackmaps with the locals from the |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2555 // incoming stackmap (before initialize_object() changes them to outgoing |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2556 // state). |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2557 if (in_try_block) { |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2558 verify_exception_handler_targets(bci, *this_uninit, current_frame, |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2559 stackmap_table, CHECK_VERIFY(this)); |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2560 } |
0 | 2561 current_frame->initialize_object(type, new_class_type); |
2562 } else { | |
6605 | 2563 verify_error(ErrorContext::bad_type(bci, current_frame->stack_top_ctx()), |
2564 "Bad operand type when invoking <init>"); | |
0 | 2565 return; |
2566 } | |
2567 } | |
2568 | |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2569 bool ClassVerifier::is_same_or_direct_interface( |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2570 instanceKlassHandle klass, |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2571 VerificationType klass_type, |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2572 VerificationType ref_class_type) { |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2573 if (ref_class_type.equals(klass_type)) return true; |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2574 Array<Klass*>* local_interfaces = klass->local_interfaces(); |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2575 if (local_interfaces != NULL) { |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2576 for (int x = 0; x < local_interfaces->length(); x++) { |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2577 Klass* k = local_interfaces->at(x); |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2578 assert (k != NULL && k->is_interface(), "invalid interface"); |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2579 if (ref_class_type.equals(VerificationType::reference_type(k->name()))) { |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2580 return true; |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2581 } |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2582 } |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2583 } |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2584 return false; |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2585 } |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2586 |
0 | 2587 void ClassVerifier::verify_invoke_instructions( |
2588 RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame, | |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2589 bool in_try_block, bool *this_uninit, VerificationType return_type, |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2590 constantPoolHandle cp, StackMapTable* stackmap_table, TRAPS) { |
0 | 2591 // Make sure the constant pool item is the right type |
1565 | 2592 u2 index = bcs->get_index_u2(); |
2593 Bytecodes::Code opcode = bcs->raw_code(); | |
6934 | 2594 unsigned int types; |
2595 switch (opcode) { | |
2596 case Bytecodes::_invokeinterface: | |
2597 types = 1 << JVM_CONSTANT_InterfaceMethodref; | |
2598 break; | |
2599 case Bytecodes::_invokedynamic: | |
2600 types = 1 << JVM_CONSTANT_InvokeDynamic; | |
2601 break; | |
2602 case Bytecodes::_invokespecial: | |
9066
09b0d3e9ba6c
8011671: JCK tests on static interface methods fail under b84: Illegal type at constant pool entry 5
bharadwaj
parents:
8819
diff
changeset
|
2603 case Bytecodes::_invokestatic: |
09b0d3e9ba6c
8011671: JCK tests on static interface methods fail under b84: Illegal type at constant pool entry 5
bharadwaj
parents:
8819
diff
changeset
|
2604 types = (_klass->major_version() < STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION) ? |
09b0d3e9ba6c
8011671: JCK tests on static interface methods fail under b84: Illegal type at constant pool entry 5
bharadwaj
parents:
8819
diff
changeset
|
2605 (1 << JVM_CONSTANT_Methodref) : |
09b0d3e9ba6c
8011671: JCK tests on static interface methods fail under b84: Illegal type at constant pool entry 5
bharadwaj
parents:
8819
diff
changeset
|
2606 ((1 << JVM_CONSTANT_InterfaceMethodref) | (1 << JVM_CONSTANT_Methodref)); |
09b0d3e9ba6c
8011671: JCK tests on static interface methods fail under b84: Illegal type at constant pool entry 5
bharadwaj
parents:
8819
diff
changeset
|
2607 break; |
6934 | 2608 default: |
2609 types = 1 << JVM_CONSTANT_Methodref; | |
2610 } | |
6605 | 2611 verify_cp_type(bcs->bci(), index, cp, types, CHECK_VERIFY(this)); |
0 | 2612 |
2613 // Get method name and signature | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2614 Symbol* method_name = cp->name_ref_at(index); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2615 Symbol* method_sig = cp->signature_ref_at(index); |
0 | 2616 |
2617 if (!SignatureVerifier::is_valid_method_signature(method_sig)) { | |
2618 class_format_error( | |
2619 "Invalid method signature in class %s referenced " | |
2620 "from constant pool index %d", _klass->external_name(), index); | |
2621 return; | |
2622 } | |
2623 | |
2624 // Get referenced class type | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2625 VerificationType ref_class_type; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2626 if (opcode == Bytecodes::_invokedynamic) { |
1602 | 2627 if (!EnableInvokeDynamic || |
2628 _klass->major_version() < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) { | |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2629 if (!EnableInvokeDynamic) { |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2630 class_format_error("invokedynamic instructions not enabled in this JVM"); |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2631 } else { |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2632 class_format_error("invokedynamic instructions not supported by this class file version (%d), class %s", |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2633 _klass->major_version(), _klass->external_name()); |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2634 } |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2635 return; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2636 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2637 } else { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2638 ref_class_type = cp_ref_index_to_type(index, cp, CHECK_VERIFY(this)); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2639 } |
0 | 2640 |
2641 // For a small signature length, we just allocate 128 bytes instead | |
2642 // of parsing the signature once to find its size. | |
2643 // -3 is for '(', ')' and return descriptor; multiply by 2 is for | |
2644 // longs/doubles to be consertive. | |
2645 assert(sizeof(VerificationType) == sizeof(uintptr_t), | |
2646 "buffer type must match VerificationType size"); | |
2647 uintptr_t on_stack_sig_types_buffer[128]; | |
2648 // If we make a VerificationType[128] array directly, the compiler calls | |
2649 // to the c-runtime library to do the allocation instead of just | |
2650 // stack allocating it. Plus it would run constructors. This shows up | |
2651 // in performance profiles. | |
2652 | |
2653 VerificationType* sig_types; | |
2654 int size = (method_sig->utf8_length() - 3) * 2; | |
2655 if (size > 128) { | |
2656 // Long and double occupies two slots here. | |
2657 ArgumentSizeComputer size_it(method_sig); | |
2658 size = size_it.size(); | |
2659 sig_types = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, VerificationType, size); | |
2660 } else{ | |
2661 sig_types = (VerificationType*)on_stack_sig_types_buffer; | |
2662 } | |
2663 SignatureStream sig_stream(method_sig); | |
2664 int sig_i = 0; | |
2665 while (!sig_stream.at_return_type()) { | |
2666 sig_i += change_sig_to_verificationType( | |
2667 &sig_stream, &sig_types[sig_i], CHECK_VERIFY(this)); | |
2668 sig_stream.next(); | |
2669 } | |
2670 int nargs = sig_i; | |
2671 | |
2672 #ifdef ASSERT | |
2673 { | |
2674 ArgumentSizeComputer size_it(method_sig); | |
2675 assert(nargs == size_it.size(), "Argument sizes do not match"); | |
2676 assert(nargs <= (method_sig->utf8_length() - 3) * 2, "estimate of max size isn't conservative enough"); | |
2677 } | |
2678 #endif | |
2679 | |
2680 // Check instruction operands | |
2681 u2 bci = bcs->bci(); | |
2682 if (opcode == Bytecodes::_invokeinterface) { | |
2683 address bcp = bcs->bcp(); | |
2684 // 4905268: count operand in invokeinterface should be nargs+1, not nargs. | |
2685 // JSR202 spec: The count operand of an invokeinterface instruction is valid if it is | |
2686 // the difference between the size of the operand stack before and after the instruction | |
2687 // executes. | |
2688 if (*(bcp+3) != (nargs+1)) { | |
6605 | 2689 verify_error(ErrorContext::bad_code(bci), |
2690 "Inconsistent args count operand in invokeinterface"); | |
0 | 2691 return; |
2692 } | |
2693 if (*(bcp+4) != 0) { | |
6605 | 2694 verify_error(ErrorContext::bad_code(bci), |
2695 "Fourth operand byte of invokeinterface must be zero"); | |
0 | 2696 return; |
2697 } | |
2698 } | |
2699 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2700 if (opcode == Bytecodes::_invokedynamic) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2701 address bcp = bcs->bcp(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2702 if (*(bcp+3) != 0 || *(bcp+4) != 0) { |
6605 | 2703 verify_error(ErrorContext::bad_code(bci), |
2704 "Third and fourth operand bytes of invokedynamic must be zero"); | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2705 return; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2706 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2707 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2708 |
0 | 2709 if (method_name->byte_at(0) == '<') { |
2710 // Make sure <init> can only be invoked by invokespecial | |
2711 if (opcode != Bytecodes::_invokespecial || | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2712 method_name != vmSymbols::object_initializer_name()) { |
6605 | 2713 verify_error(ErrorContext::bad_code(bci), |
2714 "Illegal call to internal method"); | |
0 | 2715 return; |
2716 } | |
2717 } else if (opcode == Bytecodes::_invokespecial | |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2718 && !is_same_or_direct_interface(current_class(), current_type(), ref_class_type) |
0 | 2719 && !ref_class_type.equals(VerificationType::reference_type( |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2720 current_class()->super()->name()))) { |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2721 bool subtype = false; |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2722 bool have_imr_indirect = cp->tag_at(index).value() == JVM_CONSTANT_InterfaceMethodref; |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2723 if (!current_class()->is_anonymous()) { |
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2724 subtype = ref_class_type.is_assignable_from( |
18052 | 2725 current_type(), this, false, CHECK_VERIFY(this)); |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2726 } else { |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2727 VerificationType host_klass_type = |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2728 VerificationType::reference_type(current_class()->host_klass()->name()); |
18052 | 2729 subtype = ref_class_type.is_assignable_from(host_klass_type, this, false, CHECK_VERIFY(this)); |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2730 |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2731 // If invokespecial of IMR, need to recheck for same or |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2732 // direct interface relative to the host class |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2733 have_imr_indirect = (have_imr_indirect && |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2734 !is_same_or_direct_interface( |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2735 InstanceKlass::cast(current_class()->host_klass()), |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2736 host_klass_type, ref_class_type)); |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2737 } |
0 | 2738 if (!subtype) { |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2739 verify_error(ErrorContext::bad_code(bci), |
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2740 "Bad invokespecial instruction: " |
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2741 "current class isn't assignable to reference class."); |
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2742 return; |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2743 } else if (have_imr_indirect) { |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2744 verify_error(ErrorContext::bad_code(bci), |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2745 "Bad invokespecial instruction: " |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2746 "interface method reference is in an indirect superinterface."); |
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2747 return; |
0 | 2748 } |
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13385
diff
changeset
|
2749 |
0 | 2750 } |
2751 // Match method descriptor with operand stack | |
2752 for (int i = nargs - 1; i >= 0; i--) { // Run backwards | |
2753 current_frame->pop_stack(sig_types[i], CHECK_VERIFY(this)); | |
2754 } | |
2755 // Check objectref on operand stack | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2756 if (opcode != Bytecodes::_invokestatic && |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
431
diff
changeset
|
2757 opcode != Bytecodes::_invokedynamic) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2758 if (method_name == vmSymbols::object_initializer_name()) { // <init> method |
6605 | 2759 verify_invoke_init(bcs, index, ref_class_type, current_frame, |
20759
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2760 code_length, in_try_block, this_uninit, cp, stackmap_table, |
4b26b980ec8d
8058982: Better verification of an exceptional invokespecial
hseigel
parents:
20742
diff
changeset
|
2761 CHECK_VERIFY(this)); |
0 | 2762 } else { // other methods |
2763 // Ensures that target class is assignable to method class. | |
2764 if (opcode == Bytecodes::_invokespecial) { | |
12827
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2765 if (!current_class()->is_anonymous()) { |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2766 current_frame->pop_stack(current_type(), CHECK_VERIFY(this)); |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2767 } else { |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2768 // anonymous class invokespecial calls: check if the |
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2769 // objectref is a subtype of the host_klass of the current class |
12827
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2770 // to allow an anonymous class to reference methods in the host_klass |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2771 VerificationType top = current_frame->pop_stack(CHECK_VERIFY(this)); |
12891
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2772 VerificationType hosttype = |
7114c4597ae3
8026365: NoClassDefinitionFound for anonymous class invokespecial.
acorn
parents:
12827
diff
changeset
|
2773 VerificationType::reference_type(current_class()->host_klass()->name()); |
18052 | 2774 bool subtype = hosttype.is_assignable_from(top, this, false, CHECK_VERIFY(this)); |
12827
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2775 if (!subtype) { |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2776 verify_error( ErrorContext::bad_type(current_frame->offset(), |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2777 current_frame->stack_top_ctx(), |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2778 TypeOrigin::implicit(top)), |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2779 "Bad type on operand stack"); |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2780 return; |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2781 } |
c72075c2883e
8026022: Verifier: allow anon classes to invokespecial host class/intf methods.
acorn
parents:
12154
diff
changeset
|
2782 } |
0 | 2783 } else if (opcode == Bytecodes::_invokevirtual) { |
2784 VerificationType stack_object_type = | |
2785 current_frame->pop_stack(ref_class_type, CHECK_VERIFY(this)); | |
2786 if (current_type() != stack_object_type) { | |
2787 assert(cp->cache() == NULL, "not rewritten yet"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2788 Symbol* ref_class_name = |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2789 cp->klass_name_at(cp->klass_ref_index_at(index)); |
0 | 2790 // See the comments in verify_field_instructions() for |
2791 // the rationale behind this. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2792 if (name_in_supers(ref_class_name, current_class())) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6608
diff
changeset
|
2793 Klass* ref_class = load_class(ref_class_name, CHECK); |
0 | 2794 if (is_protected_access( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2795 _klass, ref_class, method_name, method_sig, true)) { |
0 | 2796 // It's protected access, check if stack object is |
2797 // assignable to current class. | |
2798 bool is_assignable = current_type().is_assignable_from( | |
18052 | 2799 stack_object_type, this, true, CHECK_VERIFY(this)); |
0 | 2800 if (!is_assignable) { |
2801 if (ref_class_type.name() == vmSymbols::java_lang_Object() | |
2802 && stack_object_type.is_array() | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2803 && method_name == vmSymbols::clone_name()) { |
0 | 2804 // Special case: arrays pretend to implement public Object |
2805 // clone(). | |
2806 } else { | |
6605 | 2807 verify_error(ErrorContext::bad_type(bci, |
2808 current_frame->stack_top_ctx(), | |
2809 TypeOrigin::implicit(current_type())), | |
2810 "Bad access to protected data in invokevirtual"); | |
0 | 2811 return; |
2812 } | |
2813 } | |
2814 } | |
2815 } | |
2816 } | |
2817 } else { | |
2818 assert(opcode == Bytecodes::_invokeinterface, "Unexpected opcode encountered"); | |
2819 current_frame->pop_stack(ref_class_type, CHECK_VERIFY(this)); | |
2820 } | |
2821 } | |
2822 } | |
2823 // Push the result type. | |
2824 if (sig_stream.type() != T_VOID) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2825 if (method_name == vmSymbols::object_initializer_name()) { |
0 | 2826 // <init> method must have a void return type |
6605 | 2827 /* Unreachable? Class file parser verifies that methods with '<' have |
2828 * void return */ | |
2829 verify_error(ErrorContext::bad_code(bci), | |
2830 "Return type must be void in <init> method"); | |
0 | 2831 return; |
2832 } | |
2833 VerificationType return_type[2]; | |
2834 int n = change_sig_to_verificationType( | |
2835 &sig_stream, return_type, CHECK_VERIFY(this)); | |
2836 for (int i = 0; i < n; i++) { | |
2837 current_frame->push_stack(return_type[i], CHECK_VERIFY(this)); // push types backwards | |
2838 } | |
2839 } | |
2840 } | |
2841 | |
2842 VerificationType ClassVerifier::get_newarray_type( | |
2843 u2 index, u2 bci, TRAPS) { | |
2844 const char* from_bt[] = { | |
2845 NULL, NULL, NULL, NULL, "[Z", "[C", "[F", "[D", "[B", "[S", "[I", "[J", | |
2846 }; | |
2847 if (index < T_BOOLEAN || index > T_LONG) { | |
6605 | 2848 verify_error(ErrorContext::bad_code(bci), "Illegal newarray instruction"); |
0 | 2849 return VerificationType::bogus_type(); |
2850 } | |
2851 | |
2852 // from_bt[index] contains the array signature which has a length of 2 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2853 Symbol* sig = create_temporary_symbol( |
0 | 2854 from_bt[index], 2, CHECK_(VerificationType::bogus_type())); |
2855 return VerificationType::reference_type(sig); | |
2856 } | |
2857 | |
2858 void ClassVerifier::verify_anewarray( | |
6605 | 2859 u2 bci, u2 index, constantPoolHandle cp, |
2860 StackMapFrame* current_frame, TRAPS) { | |
2861 verify_cp_class_type(bci, index, cp, CHECK_VERIFY(this)); | |
0 | 2862 current_frame->pop_stack( |
2863 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2864 | |
2865 VerificationType component_type = | |
2866 cp_index_to_type(index, cp, CHECK_VERIFY(this)); | |
2867 int length; | |
2868 char* arr_sig_str; | |
2869 if (component_type.is_array()) { // it's an array | |
2870 const char* component_name = component_type.name()->as_utf8(); | |
2871 // add one dimension to component | |
2872 length = (int)strlen(component_name) + 1; | |
2873 arr_sig_str = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, length); | |
2874 arr_sig_str[0] = '['; | |
2875 strncpy(&arr_sig_str[1], component_name, length - 1); | |
2876 } else { // it's an object or interface | |
2877 const char* component_name = component_type.name()->as_utf8(); | |
2878 // add one dimension to component with 'L' prepended and ';' postpended. | |
2879 length = (int)strlen(component_name) + 3; | |
2880 arr_sig_str = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, length); | |
2881 arr_sig_str[0] = '['; | |
2882 arr_sig_str[1] = 'L'; | |
2883 strncpy(&arr_sig_str[2], component_name, length - 2); | |
2884 arr_sig_str[length - 1] = ';'; | |
2885 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2886 Symbol* arr_sig = create_temporary_symbol( |
0 | 2887 arr_sig_str, length, CHECK_VERIFY(this)); |
2888 VerificationType new_array_type = VerificationType::reference_type(arr_sig); | |
2889 current_frame->push_stack(new_array_type, CHECK_VERIFY(this)); | |
2890 } | |
2891 | |
2892 void ClassVerifier::verify_iload(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2893 current_frame->get_local( | |
2894 index, VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2895 current_frame->push_stack( | |
2896 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2897 } | |
2898 | |
2899 void ClassVerifier::verify_lload(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2900 current_frame->get_local_2( | |
2901 index, VerificationType::long_type(), | |
2902 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
2903 current_frame->push_stack_2( | |
2904 VerificationType::long_type(), | |
2905 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
2906 } | |
2907 | |
2908 void ClassVerifier::verify_fload(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2909 current_frame->get_local( | |
2910 index, VerificationType::float_type(), CHECK_VERIFY(this)); | |
2911 current_frame->push_stack( | |
2912 VerificationType::float_type(), CHECK_VERIFY(this)); | |
2913 } | |
2914 | |
2915 void ClassVerifier::verify_dload(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2916 current_frame->get_local_2( | |
2917 index, VerificationType::double_type(), | |
2918 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
2919 current_frame->push_stack_2( | |
2920 VerificationType::double_type(), | |
2921 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
2922 } | |
2923 | |
2924 void ClassVerifier::verify_aload(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2925 VerificationType type = current_frame->get_local( | |
2926 index, VerificationType::reference_check(), CHECK_VERIFY(this)); | |
2927 current_frame->push_stack(type, CHECK_VERIFY(this)); | |
2928 } | |
2929 | |
2930 void ClassVerifier::verify_istore(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2931 current_frame->pop_stack( | |
2932 VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2933 current_frame->set_local( | |
2934 index, VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2935 } | |
2936 | |
2937 void ClassVerifier::verify_lstore(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2938 current_frame->pop_stack_2( | |
2939 VerificationType::long2_type(), | |
2940 VerificationType::long_type(), CHECK_VERIFY(this)); | |
2941 current_frame->set_local_2( | |
2942 index, VerificationType::long_type(), | |
2943 VerificationType::long2_type(), CHECK_VERIFY(this)); | |
2944 } | |
2945 | |
2946 void ClassVerifier::verify_fstore(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2947 current_frame->pop_stack(VerificationType::float_type(), CHECK_VERIFY(this)); | |
2948 current_frame->set_local( | |
2949 index, VerificationType::float_type(), CHECK_VERIFY(this)); | |
2950 } | |
2951 | |
2952 void ClassVerifier::verify_dstore(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2953 current_frame->pop_stack_2( | |
2954 VerificationType::double2_type(), | |
2955 VerificationType::double_type(), CHECK_VERIFY(this)); | |
2956 current_frame->set_local_2( | |
2957 index, VerificationType::double_type(), | |
2958 VerificationType::double2_type(), CHECK_VERIFY(this)); | |
2959 } | |
2960 | |
2961 void ClassVerifier::verify_astore(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2962 VerificationType type = current_frame->pop_stack( | |
2963 VerificationType::reference_check(), CHECK_VERIFY(this)); | |
2964 current_frame->set_local(index, type, CHECK_VERIFY(this)); | |
2965 } | |
2966 | |
2967 void ClassVerifier::verify_iinc(u2 index, StackMapFrame* current_frame, TRAPS) { | |
2968 VerificationType type = current_frame->get_local( | |
2969 index, VerificationType::integer_type(), CHECK_VERIFY(this)); | |
2970 current_frame->set_local(index, type, CHECK_VERIFY(this)); | |
2971 } | |
2972 | |
2973 void ClassVerifier::verify_return_value( | |
6605 | 2974 VerificationType return_type, VerificationType type, u2 bci, |
2975 StackMapFrame* current_frame, TRAPS) { | |
0 | 2976 if (return_type == VerificationType::bogus_type()) { |
6605 | 2977 verify_error(ErrorContext::bad_type(bci, |
2978 current_frame->stack_top_ctx(), TypeOrigin::signature(return_type)), | |
2979 "Method expects a return value"); | |
0 | 2980 return; |
2981 } | |
18052 | 2982 bool match = return_type.is_assignable_from(type, this, false, CHECK_VERIFY(this)); |
0 | 2983 if (!match) { |
6605 | 2984 verify_error(ErrorContext::bad_type(bci, |
2985 current_frame->stack_top_ctx(), TypeOrigin::signature(return_type)), | |
2986 "Bad return type"); | |
0 | 2987 return; |
2988 } | |
2989 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2990 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2991 // The verifier creates symbols which are substrings of Symbols. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2992 // These are stored in the verifier until the end of verification so that |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2993 // they can be reference counted. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2994 Symbol* ClassVerifier::create_temporary_symbol(const Symbol *s, int begin, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2995 int end, TRAPS) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2996 Symbol* sym = SymbolTable::new_symbol(s, begin, end, CHECK_NULL); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2997 _symbols->push(sym); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2998 return sym; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
2999 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
3000 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
3001 Symbol* ClassVerifier::create_temporary_symbol(const char *s, int length, TRAPS) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
3002 Symbol* sym = SymbolTable::new_symbol(s, length, CHECK_NULL); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
3003 _symbols->push(sym); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
3004 return sym; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1980
diff
changeset
|
3005 } |