提交 8e423f31 编写于 作者: H hseigel

8043454: Test case for 8037157 should not throw a VerifyError

Summary: Don't throw VerifyError if method is NULL.
Reviewed-by: acorn, lfoltan, mschoene
上级 065aff1a
...@@ -2307,21 +2307,19 @@ void ClassVerifier::verify_invoke_init( ...@@ -2307,21 +2307,19 @@ void ClassVerifier::verify_invoke_init(
Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method( Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
vmSymbols::object_initializer_name(), vmSymbols::object_initializer_name(),
cp->signature_ref_at(bcs->get_index_u2())); cp->signature_ref_at(bcs->get_index_u2()));
if (m == NULL) { // Do nothing if method is not found. Let resolution detect the error.
verify_error(ErrorContext::bad_code(bci), if (m != NULL) {
"Call to missing <init> method"); instanceKlassHandle mh(THREAD, m->method_holder());
return; if (m->is_protected() && !mh->is_same_class_package(_klass())) {
} bool assignable = current_type().is_assignable_from(
instanceKlassHandle mh(THREAD, m->method_holder()); objectref_type, this, true, CHECK_VERIFY(this));
if (m->is_protected() && !mh->is_same_class_package(_klass())) { if (!assignable) {
bool assignable = current_type().is_assignable_from( verify_error(ErrorContext::bad_type(bci,
objectref_type, this, true, CHECK_VERIFY(this)); TypeOrigin::cp(new_class_index, objectref_type),
if (!assignable) { TypeOrigin::implicit(current_type())),
verify_error(ErrorContext::bad_type(bci, "Bad access to protected <init> method");
TypeOrigin::cp(new_class_index, objectref_type), return;
TypeOrigin::implicit(current_type())), }
"Bad access to protected <init> method");
return;
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册