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