< prev index next >

src/share/vm/interpreter/linkResolver.cpp

Print this page

        

*** 53,70 **** //------------------------------------------------------------------------------------------------------------------------ // Implementation of CallInfo ! void CallInfo::set_static(KlassHandle resolved_klass, const methodHandle& resolved_method, TRAPS) { int vtable_index = Method::nonvirtual_vtable_index; set_common(resolved_klass, resolved_klass, resolved_method, resolved_method, CallInfo::direct_call, vtable_index, CHECK); } ! void CallInfo::set_interface(KlassHandle resolved_klass, ! KlassHandle selected_klass, const methodHandle& resolved_method, const methodHandle& selected_method, int itable_index, TRAPS) { // This is only called for interface methods. If the resolved_method // comes from java/lang/Object, it can be the subject of a virtual call, so --- 53,70 ---- //------------------------------------------------------------------------------------------------------------------------ // Implementation of CallInfo ! void CallInfo::set_static(Klass* resolved_klass, const methodHandle& resolved_method, TRAPS) { int vtable_index = Method::nonvirtual_vtable_index; set_common(resolved_klass, resolved_klass, resolved_method, resolved_method, CallInfo::direct_call, vtable_index, CHECK); } ! void CallInfo::set_interface(Klass* resolved_klass, ! Klass* selected_klass, const methodHandle& resolved_method, const methodHandle& selected_method, int itable_index, TRAPS) { // This is only called for interface methods. If the resolved_method // comes from java/lang/Object, it can be the subject of a virtual call, so
*** 73,84 **** assert(resolved_method->method_holder()->is_interface(), ""); assert(itable_index == resolved_method()->itable_index(), ""); set_common(resolved_klass, selected_klass, resolved_method, selected_method, CallInfo::itable_call, itable_index, CHECK); } ! void CallInfo::set_virtual(KlassHandle resolved_klass, ! KlassHandle selected_klass, const methodHandle& resolved_method, const methodHandle& selected_method, int vtable_index, TRAPS) { assert(vtable_index >= 0 || vtable_index == Method::nonvirtual_vtable_index, "valid index"); assert(vtable_index < 0 || !resolved_method->has_vtable_index() || vtable_index == resolved_method->vtable_index(), ""); --- 73,84 ---- assert(resolved_method->method_holder()->is_interface(), ""); assert(itable_index == resolved_method()->itable_index(), ""); set_common(resolved_klass, selected_klass, resolved_method, selected_method, CallInfo::itable_call, itable_index, CHECK); } ! void CallInfo::set_virtual(Klass* resolved_klass, ! Klass* selected_klass, const methodHandle& resolved_method, const methodHandle& selected_method, int vtable_index, TRAPS) { assert(vtable_index >= 0 || vtable_index == Method::nonvirtual_vtable_index, "valid index"); assert(vtable_index < 0 || !resolved_method->has_vtable_index() || vtable_index == resolved_method->vtable_index(), "");
*** 91,101 **** Handle resolved_appendix, Handle resolved_method_type, TRAPS) { set_handle(SystemDictionary::MethodHandle_klass(), resolved_method, resolved_appendix, resolved_method_type, CHECK); } ! void CallInfo::set_handle(KlassHandle resolved_klass, const methodHandle& resolved_method, Handle resolved_appendix, Handle resolved_method_type, TRAPS) { if (resolved_method.is_null()) { THROW_MSG(vmSymbols::java_lang_InternalError(), "resolved method is null"); --- 91,101 ---- Handle resolved_appendix, Handle resolved_method_type, TRAPS) { set_handle(SystemDictionary::MethodHandle_klass(), resolved_method, resolved_appendix, resolved_method_type, CHECK); } ! void CallInfo::set_handle(Klass* resolved_klass, const methodHandle& resolved_method, Handle resolved_appendix, Handle resolved_method_type, TRAPS) { if (resolved_method.is_null()) { THROW_MSG(vmSymbols::java_lang_InternalError(), "resolved method is null");
*** 108,119 **** set_common(resolved_klass, resolved_klass, resolved_method, resolved_method, CallInfo::direct_call, vtable_index, CHECK); _resolved_appendix = resolved_appendix; _resolved_method_type = resolved_method_type; } ! void CallInfo::set_common(KlassHandle resolved_klass, ! KlassHandle selected_klass, const methodHandle& resolved_method, const methodHandle& selected_method, CallKind kind, int index, TRAPS) { --- 108,119 ---- set_common(resolved_klass, resolved_klass, resolved_method, resolved_method, CallInfo::direct_call, vtable_index, CHECK); _resolved_appendix = resolved_appendix; _resolved_method_type = resolved_method_type; } ! void CallInfo::set_common(Klass* resolved_klass, ! Klass* selected_klass, const methodHandle& resolved_method, const methodHandle& selected_method, CallKind kind, int index, TRAPS) {
*** 160,171 **** } else if (resolved_method->has_vtable_index()) { // Can occur if an interface redeclares a method of Object. #ifdef ASSERT // Ensure that this is really the case. ! KlassHandle object_klass = SystemDictionary::Object_klass(); ! Method * object_resolved_method = object_klass()->vtable()->method_at(index); assert(object_resolved_method->name() == resolved_method->name(), "Object and interface method names should match at vtable index %d, %s != %s", index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string()); assert(object_resolved_method->signature() == resolved_method->signature(), "Object and interface method signatures should match at vtable index %d, %s != %s", --- 160,171 ---- } else if (resolved_method->has_vtable_index()) { // Can occur if an interface redeclares a method of Object. #ifdef ASSERT // Ensure that this is really the case. ! Klass* object_klass = SystemDictionary::Object_klass(); ! Method * object_resolved_method = object_klass->vtable()->method_at(index); assert(object_resolved_method->name() == resolved_method->name(), "Object and interface method names should match at vtable index %d, %s != %s", index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string()); assert(object_resolved_method->signature() == resolved_method->signature(), "Object and interface method signatures should match at vtable index %d, %s != %s",
*** 223,287 **** //------------------------------------------------------------------------------------------------------------------------ // Implementation of LinkInfo LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, methodHandle current_method, TRAPS) { // resolve klass ! Klass* result = pool->klass_ref_at(index, CHECK); ! _resolved_klass = KlassHandle(THREAD, result); // Get name, signature, and static klass _name = pool->name_ref_at(index); _signature = pool->signature_ref_at(index); _tag = pool->tag_ref_at(index); ! _current_klass = KlassHandle(THREAD, pool->pool_holder()); _current_method = current_method; // Coming from the constant pool always checks access _check_access = true; } LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, TRAPS) { // resolve klass ! Klass* result = pool->klass_ref_at(index, CHECK); ! _resolved_klass = KlassHandle(THREAD, result); // Get name, signature, and static klass _name = pool->name_ref_at(index); _signature = pool->signature_ref_at(index); _tag = pool->tag_ref_at(index); ! _current_klass = KlassHandle(THREAD, pool->pool_holder()); _current_method = methodHandle(); // Coming from the constant pool always checks access _check_access = true; } char* LinkInfo::method_string() const { ! return Method::name_and_sig_as_C_string(_resolved_klass(), _name, _signature); } #ifndef PRODUCT void LinkInfo::print() { ResourceMark rm; tty->print_cr("Link resolved_klass=%s name=%s signature=%s current_klass=%s check_access=%s", _resolved_klass->name()->as_C_string(), _name->as_C_string(), _signature->as_C_string(), ! _current_klass.is_null() ? "(none)" : _current_klass->name()->as_C_string(), _check_access ? "true" : "false"); } #endif // PRODUCT //------------------------------------------------------------------------------------------------------------------------ // Klass resolution ! void LinkResolver::check_klass_accessability(KlassHandle ref_klass, KlassHandle sel_klass, TRAPS) { Reflection::VerifyClassAccessResults vca_result = ! Reflection::verify_class_access(ref_klass(), InstanceKlass::cast(sel_klass()), true); if (vca_result != Reflection::ACCESS_OK) { ResourceMark rm(THREAD); ! char* msg = Reflection::verify_class_access_msg(ref_klass(), ! InstanceKlass::cast(sel_klass()), vca_result); if (msg == NULL) { Exceptions::fthrow( THREAD_AND_LOCATION, vmSymbols::java_lang_IllegalAccessError(), --- 223,285 ---- //------------------------------------------------------------------------------------------------------------------------ // Implementation of LinkInfo LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, methodHandle current_method, TRAPS) { // resolve klass ! _resolved_klass = pool->klass_ref_at(index, CHECK); // Get name, signature, and static klass _name = pool->name_ref_at(index); _signature = pool->signature_ref_at(index); _tag = pool->tag_ref_at(index); ! _current_klass = pool->pool_holder(); _current_method = current_method; // Coming from the constant pool always checks access _check_access = true; } LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, TRAPS) { // resolve klass ! _resolved_klass = pool->klass_ref_at(index, CHECK); // Get name, signature, and static klass _name = pool->name_ref_at(index); _signature = pool->signature_ref_at(index); _tag = pool->tag_ref_at(index); ! _current_klass = pool->pool_holder(); _current_method = methodHandle(); // Coming from the constant pool always checks access _check_access = true; } char* LinkInfo::method_string() const { ! return Method::name_and_sig_as_C_string(_resolved_klass, _name, _signature); } #ifndef PRODUCT void LinkInfo::print() { ResourceMark rm; tty->print_cr("Link resolved_klass=%s name=%s signature=%s current_klass=%s check_access=%s", _resolved_klass->name()->as_C_string(), _name->as_C_string(), _signature->as_C_string(), ! _current_klass == NULL ? "(none)" : _current_klass->name()->as_C_string(), _check_access ? "true" : "false"); } #endif // PRODUCT //------------------------------------------------------------------------------------------------------------------------ // Klass resolution ! void LinkResolver::check_klass_accessability(Klass* ref_klass, Klass* sel_klass, TRAPS) { Reflection::VerifyClassAccessResults vca_result = ! Reflection::verify_class_access(ref_klass, InstanceKlass::cast(sel_klass), true); if (vca_result != Reflection::ACCESS_OK) { ResourceMark rm(THREAD); ! char* msg = Reflection::verify_class_access_msg(ref_klass, ! InstanceKlass::cast(sel_klass), vca_result); if (msg == NULL) { Exceptions::fthrow( THREAD_AND_LOCATION, vmSymbols::java_lang_IllegalAccessError(),
*** 306,316 **** // Look up method in klasses, including static methods // Then look up local default methods methodHandle LinkResolver::lookup_method_in_klasses(const LinkInfo& link_info, bool checkpolymorphism, bool in_imethod_resolve, TRAPS) { ! KlassHandle klass = link_info.resolved_klass(); Symbol* name = link_info.name(); Symbol* signature = link_info.signature(); // Ignore overpasses so statics can be found during resolution Method* result = klass->uncached_lookup_method(name, signature, Klass::skip_overpass); --- 304,314 ---- // Look up method in klasses, including static methods // Then look up local default methods methodHandle LinkResolver::lookup_method_in_klasses(const LinkInfo& link_info, bool checkpolymorphism, bool in_imethod_resolve, TRAPS) { ! Klass* klass = link_info.resolved_klass(); Symbol* name = link_info.name(); Symbol* signature = link_info.signature(); // Ignore overpasses so statics can be found during resolution Method* result = klass->uncached_lookup_method(name, signature, Klass::skip_overpass);
*** 318,328 **** if (klass->is_array_klass()) { // Only consider klass and super klass for arrays return methodHandle(THREAD, result); } ! InstanceKlass* ik = InstanceKlass::cast(klass()); // JDK 8, JVMS 5.4.3.4: Interface method resolution should // ignore static and non-public methods of java.lang.Object, // like clone, finalize, registerNatives. if (in_imethod_resolve && --- 316,326 ---- if (klass->is_array_klass()) { // Only consider klass and super klass for arrays return methodHandle(THREAD, result); } ! InstanceKlass* ik = InstanceKlass::cast(klass); // JDK 8, JVMS 5.4.3.4: Interface method resolution should // ignore static and non-public methods of java.lang.Object, // like clone, finalize, registerNatives. if (in_imethod_resolve &&
*** 356,366 **** return methodHandle(THREAD, result); } // returns first instance method // Looks up method in classes, then looks up local default methods ! methodHandle LinkResolver::lookup_instance_method_in_klasses(KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) { Method* result = klass->uncached_lookup_method(name, signature, Klass::find_overpass); while (result != NULL && result->is_static() && result->method_holder()->super() != NULL) { --- 354,364 ---- return methodHandle(THREAD, result); } // returns first instance method // Looks up method in classes, then looks up local default methods ! methodHandle LinkResolver::lookup_instance_method_in_klasses(Klass* klass, Symbol* name, Symbol* signature, TRAPS) { Method* result = klass->uncached_lookup_method(name, signature, Klass::find_overpass); while (result != NULL && result->is_static() && result->method_holder()->super() != NULL) {
*** 372,397 **** // Only consider klass and super klass for arrays return methodHandle(THREAD, result); } if (result == NULL) { ! Array<Method*>* default_methods = InstanceKlass::cast(klass())->default_methods(); if (default_methods != NULL) { result = InstanceKlass::find_method(default_methods, name, signature); assert(result == NULL || !result->is_static(), "static defaults not allowed"); } } return methodHandle(THREAD, result); } ! int LinkResolver::vtable_index_of_interface_method(KlassHandle klass, const methodHandle& resolved_method) { int vtable_index = Method::invalid_vtable_index; Symbol* name = resolved_method->name(); Symbol* signature = resolved_method->signature(); ! InstanceKlass* ik = InstanceKlass::cast(klass()); // First check in default method array if (!resolved_method->is_abstract() && ik->default_methods() != NULL) { int index = InstanceKlass::find_method_index(ik->default_methods(), name, signature, Klass::find_overpass, --- 370,395 ---- // Only consider klass and super klass for arrays return methodHandle(THREAD, result); } if (result == NULL) { ! Array<Method*>* default_methods = InstanceKlass::cast(klass)->default_methods(); if (default_methods != NULL) { result = InstanceKlass::find_method(default_methods, name, signature); assert(result == NULL || !result->is_static(), "static defaults not allowed"); } } return methodHandle(THREAD, result); } ! int LinkResolver::vtable_index_of_interface_method(Klass* klass, const methodHandle& resolved_method) { int vtable_index = Method::invalid_vtable_index; Symbol* name = resolved_method->name(); Symbol* signature = resolved_method->signature(); ! InstanceKlass* ik = InstanceKlass::cast(klass); // First check in default method array if (!resolved_method->is_abstract() && ik->default_methods() != NULL) { int index = InstanceKlass::find_method_index(ik->default_methods(), name, signature, Klass::find_overpass,
*** 408,418 **** } return vtable_index; } methodHandle LinkResolver::lookup_method_in_interfaces(const LinkInfo& cp_info, TRAPS) { ! InstanceKlass *ik = InstanceKlass::cast(cp_info.resolved_klass()()); // Specify 'true' in order to skip default methods when searching the // interfaces. Function lookup_method_in_klasses() already looked for // the method in the default methods table. return methodHandle(THREAD, --- 406,416 ---- } return vtable_index; } methodHandle LinkResolver::lookup_method_in_interfaces(const LinkInfo& cp_info, TRAPS) { ! InstanceKlass *ik = InstanceKlass::cast(cp_info.resolved_klass()); // Specify 'true' in order to skip default methods when searching the // interfaces. Function lookup_method_in_klasses() already looked for // the method in the default methods table. return methodHandle(THREAD,
*** 423,445 **** methodHandle LinkResolver::lookup_polymorphic_method( const LinkInfo& link_info, Handle *appendix_result_or_null, Handle *method_type_result, TRAPS) { ! KlassHandle klass = link_info.resolved_klass(); Symbol* name = link_info.name(); Symbol* full_signature = link_info.signature(); vmIntrinsics::ID iid = MethodHandles::signature_polymorphic_name_id(name); if (TraceMethodHandles) { ResourceMark rm(THREAD); tty->print_cr("lookup_polymorphic_method iid=%s %s.%s%s", vmIntrinsics::name_at(iid), klass->external_name(), name->as_C_string(), full_signature->as_C_string()); } ! if ((klass() == SystemDictionary::MethodHandle_klass() || ! klass() == SystemDictionary::VarHandle_klass()) && iid != vmIntrinsics::_none) { if (MethodHandles::is_signature_polymorphic_intrinsic(iid)) { // Most of these do not need an up-call to Java to resolve, so can be done anywhere. // Do not erase last argument type (MemberName) if it is a static linkTo method. bool keep_last_arg = MethodHandles::is_signature_polymorphic_static(iid); --- 421,443 ---- methodHandle LinkResolver::lookup_polymorphic_method( const LinkInfo& link_info, Handle *appendix_result_or_null, Handle *method_type_result, TRAPS) { ! Klass* klass = link_info.resolved_klass(); Symbol* name = link_info.name(); Symbol* full_signature = link_info.signature(); vmIntrinsics::ID iid = MethodHandles::signature_polymorphic_name_id(name); if (TraceMethodHandles) { ResourceMark rm(THREAD); tty->print_cr("lookup_polymorphic_method iid=%s %s.%s%s", vmIntrinsics::name_at(iid), klass->external_name(), name->as_C_string(), full_signature->as_C_string()); } ! if ((klass == SystemDictionary::MethodHandle_klass() || ! klass == SystemDictionary::VarHandle_klass()) && iid != vmIntrinsics::_none) { if (MethodHandles::is_signature_polymorphic_intrinsic(iid)) { // Most of these do not need an up-call to Java to resolve, so can be done anywhere. // Do not erase last argument type (MemberName) if it is a static linkTo method. bool keep_last_arg = MethodHandles::is_signature_polymorphic_static(iid);
*** 529,541 **** } } return NULL; } ! void LinkResolver::check_method_accessability(KlassHandle ref_klass, ! KlassHandle resolved_klass, ! KlassHandle sel_klass, const methodHandle& sel_method, TRAPS) { AccessFlags flags = sel_method->access_flags(); --- 527,539 ---- } } return NULL; } ! void LinkResolver::check_method_accessability(Klass* ref_klass, ! Klass* resolved_klass, ! Klass* sel_klass, const methodHandle& sel_method, TRAPS) { AccessFlags flags = sel_method->access_flags();
*** 545,568 **** // to public. // // We'll check for the method name first, as that's most likely // to be false (so we'll short-circuit out of these tests). if (sel_method->name() == vmSymbols::clone_name() && ! sel_klass() == SystemDictionary::Object_klass() && resolved_klass->is_array_klass()) { // We need to change "protected" to "public". assert(flags.is_protected(), "clone not protected?"); jint new_flags = flags.as_int(); new_flags = new_flags & (~JVM_ACC_PROTECTED); new_flags = new_flags | JVM_ACC_PUBLIC; flags.set_flags(new_flags); } // assert(extra_arg_result_or_null != NULL, "must be able to return extra argument"); ! if (!Reflection::verify_field_access(ref_klass(), ! resolved_klass(), ! sel_klass(), flags, true)) { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION, --- 543,566 ---- // to public. // // We'll check for the method name first, as that's most likely // to be false (so we'll short-circuit out of these tests). if (sel_method->name() == vmSymbols::clone_name() && ! sel_klass == SystemDictionary::Object_klass() && resolved_klass->is_array_klass()) { // We need to change "protected" to "public". assert(flags.is_protected(), "clone not protected?"); jint new_flags = flags.as_int(); new_flags = new_flags & (~JVM_ACC_PROTECTED); new_flags = new_flags | JVM_ACC_PUBLIC; flags.set_flags(new_flags); } // assert(extra_arg_result_or_null != NULL, "must be able to return extra argument"); ! if (!Reflection::verify_field_access(ref_klass, ! resolved_klass, ! sel_klass, flags, true)) { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION,
*** 584,609 **** // and // (2) in Bytecode_invoke::static_target // It appears to fail when applied to an invokeinterface call site. // FIXME: Remove this method and ciMethod::check_call; refactor to use the other LinkResolver entry points. // resolve klass - KlassHandle resolved_klass; if (code == Bytecodes::_invokedynamic) { ! resolved_klass = SystemDictionary::MethodHandle_klass(); Symbol* method_name = vmSymbols::invoke_name(); Symbol* method_signature = pool->signature_ref_at(index); ! KlassHandle current_klass(THREAD, pool->pool_holder()); LinkInfo link_info(resolved_klass, method_name, method_signature, current_klass); return resolve_method(link_info, code, THREAD); } LinkInfo link_info(pool, index, methodHandle(), CHECK_NULL); ! resolved_klass = link_info.resolved_klass(); if (pool->has_preresolution() ! || (resolved_klass() == SystemDictionary::MethodHandle_klass() && ! MethodHandles::is_signature_polymorphic_name(resolved_klass(), link_info.name()))) { Method* result = ConstantPool::method_at_if_loaded(pool, index); if (result != NULL) { return methodHandle(THREAD, result); } } --- 582,606 ---- // and // (2) in Bytecode_invoke::static_target // It appears to fail when applied to an invokeinterface call site. // FIXME: Remove this method and ciMethod::check_call; refactor to use the other LinkResolver entry points. // resolve klass if (code == Bytecodes::_invokedynamic) { ! Klass* resolved_klass = SystemDictionary::MethodHandle_klass(); Symbol* method_name = vmSymbols::invoke_name(); Symbol* method_signature = pool->signature_ref_at(index); ! Klass* current_klass = pool->pool_holder(); LinkInfo link_info(resolved_klass, method_name, method_signature, current_klass); return resolve_method(link_info, code, THREAD); } LinkInfo link_info(pool, index, methodHandle(), CHECK_NULL); ! Klass* resolved_klass = link_info.resolved_klass(); if (pool->has_preresolution() ! || (resolved_klass == SystemDictionary::MethodHandle_klass() && ! MethodHandles::is_signature_polymorphic_name(resolved_klass, link_info.name()))) { Method* result = ConstantPool::method_at_if_loaded(pool, index); if (result != NULL) { return methodHandle(THREAD, result); } }
*** 650,661 **** THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); } } void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig, ! KlassHandle current_klass, ! KlassHandle sel_klass, TRAPS) { Handle ref_loader(THREAD, current_klass->class_loader()); Handle sel_loader(THREAD, sel_klass->class_loader()); ResourceMark rm(THREAD); // needed for check_signature_loaders Symbol* failed_type_symbol = --- 647,658 ---- THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); } } void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig, ! Klass* current_klass, ! Klass* sel_klass, TRAPS) { Handle ref_loader(THREAD, current_klass->class_loader()); Handle sel_loader(THREAD, sel_klass->class_loader()); ResourceMark rm(THREAD); // needed for check_signature_loaders Symbol* failed_type_symbol =
*** 684,701 **** methodHandle LinkResolver::resolve_method(const LinkInfo& link_info, Bytecodes::Code code, TRAPS) { Handle nested_exception; ! KlassHandle resolved_klass = link_info.resolved_klass(); // 1. For invokevirtual, cannot call an interface method if (code == Bytecodes::_invokevirtual && resolved_klass->is_interface()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected", ! resolved_klass()->external_name()); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // 2. check constant pool tag for called method - must be JVM_CONSTANT_Methodref if (!link_info.tag().is_invalid() && !link_info.tag().is_method()) { --- 681,698 ---- methodHandle LinkResolver::resolve_method(const LinkInfo& link_info, Bytecodes::Code code, TRAPS) { Handle nested_exception; ! Klass* resolved_klass = link_info.resolved_klass(); // 1. For invokevirtual, cannot call an interface method if (code == Bytecodes::_invokevirtual && resolved_klass->is_interface()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected", ! resolved_klass->external_name()); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // 2. check constant pool tag for called method - must be JVM_CONSTANT_Methodref if (!link_info.tag().is_invalid() && !link_info.tag().is_method()) {
*** 725,749 **** // 5. method lookup failed if (resolved_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG_CAUSE_(vmSymbols::java_lang_NoSuchMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass(), link_info.name(), link_info.signature()), nested_exception, NULL); } ! // 6. access checks, access checking may be turned off when calling from within the VM. ! KlassHandle current_klass = link_info.current_klass(); if (link_info.check_access()) { ! assert(current_klass.not_null() , "current_klass should not be null"); // check if method can be accessed by the referring class check_method_accessability(current_klass, resolved_klass, ! KlassHandle(THREAD, resolved_method->method_holder()), resolved_method, CHECK_NULL); // check loader constraints check_method_loader_constraints(link_info, resolved_method, "method", CHECK_NULL); --- 722,746 ---- // 5. method lookup failed if (resolved_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG_CAUSE_(vmSymbols::java_lang_NoSuchMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass, link_info.name(), link_info.signature()), nested_exception, NULL); } ! // 5. access checks, access checking may be turned off when calling from within the VM. ! Klass* current_klass = link_info.current_klass(); if (link_info.check_access()) { ! assert(current_klass != NULL , "current_klass should not be null"); // check if method can be accessed by the referring class check_method_accessability(current_klass, resolved_klass, ! resolved_method->method_holder(), resolved_method, CHECK_NULL); // check loader constraints check_method_loader_constraints(link_info, resolved_method, "method", CHECK_NULL);
*** 751,762 **** return resolved_method; } static void trace_method_resolution(const char* prefix, ! KlassHandle klass, ! KlassHandle resolved_klass, const methodHandle& method, bool logitables, int index = -1) { #ifndef PRODUCT ResourceMark rm; --- 748,759 ---- return resolved_method; } static void trace_method_resolution(const char* prefix, ! Klass* klass, ! Klass* resolved_klass, const methodHandle& method, bool logitables, int index = -1) { #ifndef PRODUCT ResourceMark rm;
*** 766,778 **** } else { st = Log(vtables)::trace_stream(); } st->print("%s%s, compile-time-class:%s, method:%s, method_holder:%s, access_flags: ", prefix, ! (klass.is_null() ? "<NULL>" : klass->internal_name()), ! (resolved_klass.is_null() ? "<NULL>" : resolved_klass->internal_name()), ! Method::name_and_sig_as_C_string(resolved_klass(), method->name(), method->signature()), method->method_holder()->internal_name()); method->print_linkage_flags(st); if (index != -1) { --- 763,775 ---- } else { st = Log(vtables)::trace_stream(); } st->print("%s%s, compile-time-class:%s, method:%s, method_holder:%s, access_flags: ", prefix, ! (klass == NULL ? "<NULL>" : klass->internal_name()), ! (resolved_klass == NULL ? "<NULL>" : resolved_klass->internal_name()), ! Method::name_and_sig_as_C_string(resolved_klass, method->name(), method->signature()), method->method_holder()->internal_name()); method->print_linkage_flags(st); if (index != -1) {
*** 783,799 **** } // Do linktime resolution of a method in the interface within the context of the specied bytecode. methodHandle LinkResolver::resolve_interface_method(const LinkInfo& link_info, Bytecodes::Code code, TRAPS) { ! KlassHandle resolved_klass = link_info.resolved_klass(); // check if klass is interface if (!resolved_klass->is_interface()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Found class %s, but interface was expected", resolved_klass()->external_name()); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // check constant pool tag for called method - must be JVM_CONSTANT_InterfaceMethodref if (!link_info.tag().is_invalid() && !link_info.tag().is_interface_method()) { --- 780,796 ---- } // Do linktime resolution of a method in the interface within the context of the specied bytecode. methodHandle LinkResolver::resolve_interface_method(const LinkInfo& link_info, Bytecodes::Code code, TRAPS) { ! Klass* resolved_klass = link_info.resolved_klass(); // check if klass is interface if (!resolved_klass->is_interface()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Found class %s, but interface was expected", resolved_klass->external_name()); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // check constant pool tag for called method - must be JVM_CONSTANT_InterfaceMethodref if (!link_info.tag().is_invalid() && !link_info.tag().is_interface_method()) {
*** 814,863 **** if (resolved_method.is_null()) { // no method found ResourceMark rm(THREAD); THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass(), link_info.name(), link_info.signature())); } if (link_info.check_access()) { // JDK8 adds non-public interface methods, and accessability check requirement ! KlassHandle current_klass = link_info.current_klass(); ! assert(current_klass.not_null() , "current_klass should not be null"); // check if method can be accessed by the referring class check_method_accessability(current_klass, resolved_klass, ! KlassHandle(THREAD, resolved_method->method_holder()), resolved_method, CHECK_NULL); check_method_loader_constraints(link_info, resolved_method, "interface method", CHECK_NULL); } if (code != Bytecodes::_invokestatic && resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Expected instance not static method %s", ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } if (code == Bytecodes::_invokeinterface && resolved_method->is_private()) { ResourceMark rm(THREAD); char buf[200]; ! KlassHandle current_klass = link_info.current_klass(); jio_snprintf(buf, sizeof(buf), "private interface method requires invokespecial, not invokeinterface: method %s, caller-class:%s", ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature()), ! (current_klass.is_null() ? "<NULL>" : current_klass->internal_name())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } if (log_develop_is_enabled(Trace, itables)) { char buf[200]; --- 811,860 ---- if (resolved_method.is_null()) { // no method found ResourceMark rm(THREAD); THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass, link_info.name(), link_info.signature())); } if (link_info.check_access()) { // JDK8 adds non-public interface methods, and accessability check requirement ! Klass* current_klass = link_info.current_klass(); ! assert(current_klass != NULL , "current_klass should not be null"); // check if method can be accessed by the referring class check_method_accessability(current_klass, resolved_klass, ! resolved_method->method_holder(), resolved_method, CHECK_NULL); check_method_loader_constraints(link_info, resolved_method, "interface method", CHECK_NULL); } if (code != Bytecodes::_invokestatic && resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Expected instance not static method %s", ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } if (code == Bytecodes::_invokeinterface && resolved_method->is_private()) { ResourceMark rm(THREAD); char buf[200]; ! Klass* current_klass = link_info.current_klass(); jio_snprintf(buf, sizeof(buf), "private interface method requires invokespecial, not invokeinterface: method %s, caller-class:%s", ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature()), ! (current_klass == NULL ? "<NULL>" : current_klass->internal_name())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } if (log_develop_is_enabled(Trace, itables)) { char buf[200];
*** 871,888 **** } //------------------------------------------------------------------------------------------------------------------------ // Field resolution ! void LinkResolver::check_field_accessability(KlassHandle ref_klass, ! KlassHandle resolved_klass, ! KlassHandle sel_klass, const fieldDescriptor& fd, TRAPS) { ! if (!Reflection::verify_field_access(ref_klass(), ! resolved_klass(), ! sel_klass(), fd.access_flags(), true)) { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION, --- 868,885 ---- } //------------------------------------------------------------------------------------------------------------------------ // Field resolution ! void LinkResolver::check_field_accessability(Klass* ref_klass, ! Klass* resolved_klass, ! Klass* sel_klass, const fieldDescriptor& fd, TRAPS) { ! if (!Reflection::verify_field_access(ref_klass, ! resolved_klass, ! sel_klass, fd.access_flags(), true)) { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION,
*** 911,950 **** (byte == Bytecodes::_nop && !link_info.check_access()), "bad field access bytecode"); bool is_static = (byte == Bytecodes::_getstatic || byte == Bytecodes::_putstatic); bool is_put = (byte == Bytecodes::_putfield || byte == Bytecodes::_putstatic || byte == Bytecodes::_nofast_putfield); // Check if there's a resolved klass containing the field ! KlassHandle resolved_klass = link_info.resolved_klass(); Symbol* field = link_info.name(); Symbol* sig = link_info.signature(); ! if (resolved_klass.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string()); } // Resolve instance field ! KlassHandle sel_klass(THREAD, resolved_klass->find_field(field, sig, &fd)); // check if field exists; i.e., if a klass containing the field def has been selected ! if (sel_klass.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string()); } if (!link_info.check_access()) // Access checking may be turned off when calling from within the VM. return; // check access ! KlassHandle current_klass = link_info.current_klass(); check_field_accessability(current_klass, resolved_klass, sel_klass, fd, CHECK); // check for errors if (is_static != fd.is_static()) { ResourceMark rm(THREAD); char msg[200]; ! jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string()); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg); } // A final field can be modified only // (1) by methods declared in the class declaring the field and --- 908,947 ---- (byte == Bytecodes::_nop && !link_info.check_access()), "bad field access bytecode"); bool is_static = (byte == Bytecodes::_getstatic || byte == Bytecodes::_putstatic); bool is_put = (byte == Bytecodes::_putfield || byte == Bytecodes::_putstatic || byte == Bytecodes::_nofast_putfield); // Check if there's a resolved klass containing the field ! Klass* resolved_klass = link_info.resolved_klass(); Symbol* field = link_info.name(); Symbol* sig = link_info.signature(); ! if (resolved_klass == NULL) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string()); } // Resolve instance field ! Klass* sel_klass = resolved_klass->find_field(field, sig, &fd); // check if field exists; i.e., if a klass containing the field def has been selected ! if (sel_klass == NULL) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string()); } if (!link_info.check_access()) // Access checking may be turned off when calling from within the VM. return; // check access ! Klass* current_klass = link_info.current_klass(); check_field_accessability(current_klass, resolved_klass, sel_klass, fd, CHECK); // check for errors if (is_static != fd.is_static()) { ResourceMark rm(THREAD); char msg[200]; ! jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", resolved_klass->external_name(), fd.name()->as_C_string()); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg); } // A final field can be modified only // (1) by methods declared in the class declaring the field and
*** 952,965 **** // or by the <init> method (in case of an instance field). if (is_put && fd.access_flags().is_final()) { ResourceMark rm(THREAD); stringStream ss; ! if (sel_klass() != current_klass()) { ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class", ! is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string(), ! current_klass()->external_name()); THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ss.as_string()); } if (fd.constants()->pool_holder()->major_version() >= 53) { methodHandle m = link_info.current_method(); --- 949,962 ---- // or by the <init> method (in case of an instance field). if (is_put && fd.access_flags().is_final()) { ResourceMark rm(THREAD); stringStream ss; ! if (sel_klass != current_klass) { ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class", ! is_static ? "static" : "non-static", resolved_klass->external_name(), fd.name()->as_C_string(), ! current_klass->external_name()); THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ss.as_string()); } if (fd.constants()->pool_holder()->major_version() >= 53) { methodHandle m = link_info.current_method();
*** 971,981 **** !fd.is_static() && !m->is_object_initializer()); if (is_initialized_static_final_update || is_initialized_instance_final_update) { ss.print("Update to %s final field %s.%s attempted from a different method (%s) than the initializer method %s ", ! is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string(), m()->name()->as_C_string(), is_static ? "<clinit>" : "<init>"); THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ss.as_string()); } } --- 968,978 ---- !fd.is_static() && !m->is_object_initializer()); if (is_initialized_static_final_update || is_initialized_instance_final_update) { ss.print("Update to %s final field %s.%s attempted from a different method (%s) than the initializer method %s ", ! is_static ? "static" : "non-static", resolved_klass->external_name(), fd.name()->as_C_string(), m()->name()->as_C_string(), is_static ? "<clinit>" : "<init>"); THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ss.as_string()); } }
*** 989,999 **** // if the field access is legal; e.g., during compilation if (is_static && initialize_class) { sel_klass->initialize(CHECK); } ! if (sel_klass() != current_klass()) { check_field_loader_constraints(field, sig, current_klass, sel_klass, CHECK); } // return information. note that the klass is set to the actual klass containing the // field, otherwise access of static fields in superclasses will not work. --- 986,996 ---- // if the field access is legal; e.g., during compilation if (is_static && initialize_class) { sel_klass->initialize(CHECK); } ! if (sel_klass != current_klass) { check_field_loader_constraints(field, sig, current_klass, sel_klass, CHECK); } // return information. note that the klass is set to the actual klass containing the // field, otherwise access of static fields in superclasses will not work.
*** 1015,1025 **** const LinkInfo& link_info, bool initialize_class, TRAPS) { methodHandle resolved_method = linktime_resolve_static_method(link_info, CHECK); // The resolved class can change as a result of this resolution. ! KlassHandle resolved_klass(THREAD, resolved_method->method_holder()); // Initialize klass (this should only happen if everything is ok) if (initialize_class && resolved_klass->should_be_initialized()) { resolved_klass->initialize(CHECK); // Use updated LinkInfo to reresolve with resolved method holder --- 1012,1022 ---- const LinkInfo& link_info, bool initialize_class, TRAPS) { methodHandle resolved_method = linktime_resolve_static_method(link_info, CHECK); // The resolved class can change as a result of this resolution. ! Klass* resolved_klass = resolved_method->method_holder(); // Initialize klass (this should only happen if everything is ok) if (initialize_class && resolved_klass->should_be_initialized()) { resolved_klass->initialize(CHECK); // Use updated LinkInfo to reresolve with resolved method holder
*** 1034,1044 **** } // throws linktime exceptions methodHandle LinkResolver::linktime_resolve_static_method(const LinkInfo& link_info, TRAPS) { ! KlassHandle resolved_klass = link_info.resolved_klass(); methodHandle resolved_method; if (!resolved_klass->is_interface()) { resolved_method = resolve_method(link_info, Bytecodes::_invokestatic, CHECK_NULL); } else { resolved_method = resolve_interface_method(link_info, Bytecodes::_invokestatic, CHECK_NULL); --- 1031,1041 ---- } // throws linktime exceptions methodHandle LinkResolver::linktime_resolve_static_method(const LinkInfo& link_info, TRAPS) { ! Klass* resolved_klass = link_info.resolved_klass(); methodHandle resolved_method; if (!resolved_klass->is_interface()) { resolved_method = resolve_method(link_info, Bytecodes::_invokestatic, CHECK_NULL); } else { resolved_method = resolve_interface_method(link_info, Bytecodes::_invokestatic, CHECK_NULL);
*** 1047,1057 **** // check if static if (!resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Expected static method %s", Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } return resolved_method; --- 1044,1054 ---- // check if static if (!resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Expected static method %s", Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } return resolved_method;
*** 1076,1097 **** // <init> // local private method invocation, for classes and interfaces // superclass.method, which can also resolve to a default method // and the selected method is recalculated relative to the direct superclass // superinterface.method, which explicitly does not check shadowing ! KlassHandle resolved_klass = link_info.resolved_klass(); methodHandle resolved_method; if (!resolved_klass->is_interface()) { resolved_method = resolve_method(link_info, Bytecodes::_invokespecial, CHECK_NULL); } else { resolved_method = resolve_interface_method(link_info, Bytecodes::_invokespecial, CHECK_NULL); } // check if method name is <init>, that it is found in same klass as static type if (resolved_method->name() == vmSymbols::object_initializer_name() && ! resolved_method->method_holder() != resolved_klass()) { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION, vmSymbols::java_lang_NoSuchMethodError(), "%s: method %s%s not found", --- 1073,1094 ---- // <init> // local private method invocation, for classes and interfaces // superclass.method, which can also resolve to a default method // and the selected method is recalculated relative to the direct superclass // superinterface.method, which explicitly does not check shadowing ! Klass* resolved_klass = link_info.resolved_klass(); methodHandle resolved_method; if (!resolved_klass->is_interface()) { resolved_method = resolve_method(link_info, Bytecodes::_invokespecial, CHECK_NULL); } else { resolved_method = resolve_interface_method(link_info, Bytecodes::_invokespecial, CHECK_NULL); } // check if method name is <init>, that it is found in same klass as static type if (resolved_method->name() == vmSymbols::object_initializer_name() && ! resolved_method->method_holder() != resolved_klass) { ResourceMark rm(THREAD); Exceptions::fthrow( THREAD_AND_LOCATION, vmSymbols::java_lang_NoSuchMethodError(), "%s: method %s%s not found",
*** 1101,1126 **** ); return NULL; } // check if invokespecial's interface method reference is in an indirect superinterface ! KlassHandle current_klass = link_info.current_klass(); ! if (!current_klass.is_null() && resolved_klass->is_interface()) { ! Klass *klass_to_check = !InstanceKlass::cast(current_klass())->is_anonymous() ? ! current_klass() : ! InstanceKlass::cast(current_klass())->host_klass(); // Disable verification for the dynamically-generated reflection bytecodes. bool is_reflect = klass_to_check->is_subclass_of( SystemDictionary::reflect_MagicAccessorImpl_klass()); if (!is_reflect && ! !InstanceKlass::cast(klass_to_check)->is_same_or_direct_interface(resolved_klass())) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Interface method reference: %s, is in an indirect superinterface of %s", ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature()), current_klass->external_name()); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } --- 1098,1124 ---- ); return NULL; } // check if invokespecial's interface method reference is in an indirect superinterface ! Klass* current_klass = link_info.current_klass(); ! if (current_klass != NULL && resolved_klass->is_interface()) { ! InstanceKlass* ck = InstanceKlass::cast(current_klass); ! InstanceKlass *klass_to_check = !ck->is_anonymous() ? ! ck : ! InstanceKlass::cast(ck->host_klass()); // Disable verification for the dynamically-generated reflection bytecodes. bool is_reflect = klass_to_check->is_subclass_of( SystemDictionary::reflect_MagicAccessorImpl_klass()); if (!is_reflect && ! !klass_to_check->is_same_or_direct_interface(resolved_klass)) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Interface method reference: %s, is in an indirect superinterface of %s", ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature()), current_klass->external_name()); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); }
*** 1130,1140 **** if (resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } --- 1128,1138 ---- if (resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); }
*** 1147,1212 **** } // throws runtime exceptions void LinkResolver::runtime_resolve_special_method(CallInfo& result, const methodHandle& resolved_method, ! KlassHandle resolved_klass, ! KlassHandle current_klass, bool check_access, TRAPS) { // resolved method is selected method unless we have an old-style lookup // for a superclass method // Invokespecial for a superinterface, resolved method is selected method, // no checks for shadowing methodHandle sel_method(THREAD, resolved_method()); // check if this is an old-style super call and do a new lookup if so - { KlassHandle method_klass = KlassHandle(THREAD, - resolved_method->method_holder()); - if (check_access && // a) check if ACC_SUPER flag is set for the current class (current_klass->is_super() || !AllowNonVirtualCalls) && // b) check if the class of the resolved_klass is a superclass // (not supertype in order to exclude interface classes) of the current class. // This check is not performed for super.invoke for interface methods // in super interfaces. ! current_klass->is_subclass_of(resolved_klass()) && ! current_klass() != resolved_klass() && // c) check if the method is not <init> resolved_method->name() != vmSymbols::object_initializer_name()) { // Lookup super method ! KlassHandle super_klass(THREAD, current_klass->super()); sel_method = lookup_instance_method_in_klasses(super_klass, resolved_method->name(), resolved_method->signature(), CHECK); // check if found if (sel_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); } } - } // check if not static if (sel_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // check if abstract if (sel_method->is_abstract()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass(), sel_method->name(), sel_method->signature())); } if (log_develop_is_enabled(Trace, itables)) { --- 1145,1206 ---- } // throws runtime exceptions void LinkResolver::runtime_resolve_special_method(CallInfo& result, const methodHandle& resolved_method, ! Klass* resolved_klass, ! Klass* current_klass, bool check_access, TRAPS) { // resolved method is selected method unless we have an old-style lookup // for a superclass method // Invokespecial for a superinterface, resolved method is selected method, // no checks for shadowing methodHandle sel_method(THREAD, resolved_method()); // check if this is an old-style super call and do a new lookup if so if (check_access && // a) check if ACC_SUPER flag is set for the current class (current_klass->is_super() || !AllowNonVirtualCalls) && // b) check if the class of the resolved_klass is a superclass // (not supertype in order to exclude interface classes) of the current class. // This check is not performed for super.invoke for interface methods // in super interfaces. ! current_klass->is_subclass_of(resolved_klass) && ! current_klass != resolved_klass && // c) check if the method is not <init> resolved_method->name() != vmSymbols::object_initializer_name()) { // Lookup super method ! Klass* super_klass = current_klass->super(); sel_method = lookup_instance_method_in_klasses(super_klass, resolved_method->name(), resolved_method->signature(), CHECK); // check if found if (sel_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); } } // check if not static if (sel_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // check if abstract if (sel_method->is_abstract()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass, sel_method->name(), sel_method->signature())); } if (log_develop_is_enabled(Trace, itables)) {
*** 1216,1226 **** // setup result result.set_static(resolved_klass, sel_method, CHECK); } ! void LinkResolver::resolve_virtual_call(CallInfo& result, Handle recv, KlassHandle receiver_klass, const LinkInfo& link_info, bool check_null_and_abstract, TRAPS) { methodHandle resolved_method = linktime_resolve_virtual_method(link_info, CHECK); runtime_resolve_virtual_method(result, resolved_method, link_info.resolved_klass(), --- 1210,1220 ---- // setup result result.set_static(resolved_klass, sel_method, CHECK); } ! void LinkResolver::resolve_virtual_call(CallInfo& result, Handle recv, Klass* receiver_klass, const LinkInfo& link_info, bool check_null_and_abstract, TRAPS) { methodHandle resolved_method = linktime_resolve_virtual_method(link_info, CHECK); runtime_resolve_virtual_method(result, resolved_method, link_info.resolved_klass(),
*** 1236,1265 **** assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier"); assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier"); // check if private interface method ! KlassHandle resolved_klass = link_info.resolved_klass(); ! KlassHandle current_klass = link_info.current_klass(); // This is impossible, if resolve_klass is an interface, we've thrown icce in resolve_method if (resolved_klass->is_interface() && resolved_method->is_private()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "private interface method requires invokespecial, not invokevirtual: method %s, caller-class:%s", ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature()), ! (current_klass.is_null() ? "<NULL>" : current_klass->internal_name())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // check if not static if (resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } --- 1230,1259 ---- assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier"); assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier"); // check if private interface method ! Klass* resolved_klass = link_info.resolved_klass(); ! Klass* current_klass = link_info.current_klass(); // This is impossible, if resolve_klass is an interface, we've thrown icce in resolve_method if (resolved_klass->is_interface() && resolved_method->is_private()) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "private interface method requires invokespecial, not invokevirtual: method %s, caller-class:%s", ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature()), ! (current_klass == NULL ? "<NULL>" : current_klass->internal_name())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // check if not static if (resolved_method->is_static()) { ResourceMark rm(THREAD); char buf[200]; ! jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); }
*** 1272,1284 **** } // throws runtime exceptions void LinkResolver::runtime_resolve_virtual_method(CallInfo& result, const methodHandle& resolved_method, ! KlassHandle resolved_klass, Handle recv, ! KlassHandle recv_klass, bool check_null_and_abstract, TRAPS) { // setup default return values int vtable_index = Method::invalid_vtable_index; --- 1266,1278 ---- } // throws runtime exceptions void LinkResolver::runtime_resolve_virtual_method(CallInfo& result, const methodHandle& resolved_method, ! Klass* resolved_klass, Handle recv, ! Klass* recv_klass, bool check_null_and_abstract, TRAPS) { // setup default return values int vtable_index = Method::invalid_vtable_index;
*** 1323,1342 **** // check if method exists if (selected_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass(), resolved_method->name(), resolved_method->signature())); } // check if abstract if (check_null_and_abstract && selected_method->is_abstract()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass(), selected_method->name(), selected_method->signature())); } if (log_develop_is_enabled(Trace, vtables)) { --- 1317,1336 ---- // check if method exists if (selected_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass, resolved_method->name(), resolved_method->signature())); } // check if abstract if (check_null_and_abstract && selected_method->is_abstract()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(resolved_klass, selected_method->name(), selected_method->signature())); } if (log_develop_is_enabled(Trace, vtables)) {
*** 1346,1356 **** } // setup result result.set_virtual(resolved_klass, recv_klass, resolved_method, selected_method, vtable_index, CHECK); } ! void LinkResolver::resolve_interface_call(CallInfo& result, Handle recv, KlassHandle recv_klass, const LinkInfo& link_info, bool check_null_and_abstract, TRAPS) { // throws linktime exceptions methodHandle resolved_method = linktime_resolve_interface_method(link_info, CHECK); runtime_resolve_interface_method(result, resolved_method,link_info.resolved_klass(), --- 1340,1350 ---- } // setup result result.set_virtual(resolved_klass, recv_klass, resolved_method, selected_method, vtable_index, CHECK); } ! void LinkResolver::resolve_interface_call(CallInfo& result, Handle recv, Klass* recv_klass, const LinkInfo& link_info, bool check_null_and_abstract, TRAPS) { // throws linktime exceptions methodHandle resolved_method = linktime_resolve_interface_method(link_info, CHECK); runtime_resolve_interface_method(result, resolved_method,link_info.resolved_klass(),
*** 1368,1393 **** } // throws runtime exceptions void LinkResolver::runtime_resolve_interface_method(CallInfo& result, const methodHandle& resolved_method, ! KlassHandle resolved_klass, Handle recv, ! KlassHandle recv_klass, bool check_null_and_abstract, TRAPS) { // check if receiver exists if (check_null_and_abstract && recv.is_null()) { THROW(vmSymbols::java_lang_NullPointerException()); } // check if receiver klass implements the resolved interface ! if (!recv_klass->is_subtype_of(resolved_klass())) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Class %s does not implement the requested interface %s", ! recv_klass()->external_name(), ! resolved_klass()->external_name()); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // do lookup based on receiver klass // This search must match the linktime preparation search for itable initialization --- 1362,1387 ---- } // throws runtime exceptions void LinkResolver::runtime_resolve_interface_method(CallInfo& result, const methodHandle& resolved_method, ! Klass* resolved_klass, Handle recv, ! Klass* recv_klass, bool check_null_and_abstract, TRAPS) { // check if receiver exists if (check_null_and_abstract && recv.is_null()) { THROW(vmSymbols::java_lang_NullPointerException()); } // check if receiver klass implements the resolved interface ! if (!recv_klass->is_subtype_of(resolved_klass)) { ResourceMark rm(THREAD); char buf[200]; jio_snprintf(buf, sizeof(buf), "Class %s does not implement the requested interface %s", ! recv_klass->external_name(), ! resolved_klass->external_name()); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); } // do lookup based on receiver klass // This search must match the linktime preparation search for itable initialization
*** 1403,1430 **** } // check if method exists if (sel_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(recv_klass(), resolved_method->name(), resolved_method->signature())); } // check access // Throw Illegal Access Error if sel_method is not public. if (!sel_method->is_public()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ! Method::name_and_sig_as_C_string(recv_klass(), sel_method->name(), sel_method->signature())); } // check if abstract if (check_null_and_abstract && sel_method->is_abstract()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(recv_klass(), sel_method->name(), sel_method->signature())); } if (log_develop_is_enabled(Trace, itables)) { --- 1397,1424 ---- } // check if method exists if (sel_method.is_null()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(recv_klass, resolved_method->name(), resolved_method->signature())); } // check access // Throw Illegal Access Error if sel_method is not public. if (!sel_method->is_public()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ! Method::name_and_sig_as_C_string(recv_klass, sel_method->name(), sel_method->signature())); } // check if abstract if (check_null_and_abstract && sel_method->is_abstract()) { ResourceMark rm(THREAD); THROW_MSG(vmSymbols::java_lang_AbstractMethodError(), ! Method::name_and_sig_as_C_string(recv_klass, sel_method->name(), sel_method->signature())); } if (log_develop_is_enabled(Trace, itables)) {
*** 1466,1476 **** return method_result; } } methodHandle LinkResolver::resolve_virtual_call_or_null( ! KlassHandle receiver_klass, const LinkInfo& link_info) { EXCEPTION_MARK; CallInfo info; resolve_virtual_call(info, Handle(), receiver_klass, link_info, false, THREAD); if (HAS_PENDING_EXCEPTION) { --- 1460,1470 ---- return method_result; } } methodHandle LinkResolver::resolve_virtual_call_or_null( ! Klass* receiver_klass, const LinkInfo& link_info) { EXCEPTION_MARK; CallInfo info; resolve_virtual_call(info, Handle(), receiver_klass, link_info, false, THREAD); if (HAS_PENDING_EXCEPTION) {
*** 1479,1489 **** } return info.selected_method(); } methodHandle LinkResolver::resolve_interface_call_or_null( ! KlassHandle receiver_klass, const LinkInfo& link_info) { EXCEPTION_MARK; CallInfo info; resolve_interface_call(info, Handle(), receiver_klass, link_info, false, THREAD); if (HAS_PENDING_EXCEPTION) { --- 1473,1483 ---- } return info.selected_method(); } methodHandle LinkResolver::resolve_interface_call_or_null( ! Klass* receiver_klass, const LinkInfo& link_info) { EXCEPTION_MARK; CallInfo info; resolve_interface_call(info, Handle(), receiver_klass, link_info, false, THREAD); if (HAS_PENDING_EXCEPTION) {
*** 1491,1501 **** return methodHandle(); } return info.selected_method(); } ! int LinkResolver::resolve_virtual_vtable_index(KlassHandle receiver_klass, const LinkInfo& link_info) { EXCEPTION_MARK; CallInfo info; resolve_virtual_call(info, Handle(), receiver_klass, link_info, /*check_null_or_abstract*/false, THREAD); --- 1485,1495 ---- return methodHandle(); } return info.selected_method(); } ! int LinkResolver::resolve_virtual_vtable_index(Klass* receiver_klass, const LinkInfo& link_info) { EXCEPTION_MARK; CallInfo info; resolve_virtual_call(info, Handle(), receiver_klass, link_info, /*check_null_or_abstract*/false, THREAD);
*** 1546,1556 **** } void LinkResolver::resolve_invoke(CallInfo& result, Handle& recv, const methodHandle& attached_method, Bytecodes::Code byte, TRAPS) { ! KlassHandle defc = attached_method->method_holder(); Symbol* name = attached_method->name(); Symbol* type = attached_method->signature(); LinkInfo link_info(defc, name, type); switch(byte) { case Bytecodes::_invokevirtual: --- 1540,1550 ---- } void LinkResolver::resolve_invoke(CallInfo& result, Handle& recv, const methodHandle& attached_method, Bytecodes::Code byte, TRAPS) { ! Klass* defc = attached_method->method_holder(); Symbol* name = attached_method->name(); Symbol* type = attached_method->signature(); LinkInfo link_info(defc, name, type); switch(byte) { case Bytecodes::_invokevirtual:
*** 1587,1604 **** void LinkResolver::resolve_invokevirtual(CallInfo& result, Handle recv, const constantPoolHandle& pool, int index, TRAPS) { LinkInfo link_info(pool, index, CHECK); ! KlassHandle recvrKlass (THREAD, recv.is_null() ? (Klass*)NULL : recv->klass()); resolve_virtual_call(result, recv, recvrKlass, link_info, /*check_null_or_abstract*/true, CHECK); } void LinkResolver::resolve_invokeinterface(CallInfo& result, Handle recv, const constantPoolHandle& pool, int index, TRAPS) { LinkInfo link_info(pool, index, CHECK); ! KlassHandle recvrKlass (THREAD, recv.is_null() ? (Klass*)NULL : recv->klass()); resolve_interface_call(result, recv, recvrKlass, link_info, true, CHECK); } void LinkResolver::resolve_invokehandle(CallInfo& result, const constantPoolHandle& pool, int index, TRAPS) { --- 1581,1598 ---- void LinkResolver::resolve_invokevirtual(CallInfo& result, Handle recv, const constantPoolHandle& pool, int index, TRAPS) { LinkInfo link_info(pool, index, CHECK); ! Klass* recvrKlass = recv.is_null() ? (Klass*)NULL : recv->klass(); resolve_virtual_call(result, recv, recvrKlass, link_info, /*check_null_or_abstract*/true, CHECK); } void LinkResolver::resolve_invokeinterface(CallInfo& result, Handle recv, const constantPoolHandle& pool, int index, TRAPS) { LinkInfo link_info(pool, index, CHECK); ! Klass* recvrKlass = recv.is_null() ? (Klass*)NULL : recv->klass(); resolve_interface_call(result, recv, recvrKlass, link_info, true, CHECK); } void LinkResolver::resolve_invokehandle(CallInfo& result, const constantPoolHandle& pool, int index, TRAPS) {
*** 1614,1626 **** void LinkResolver::resolve_handle_call(CallInfo& result, const LinkInfo& link_info, TRAPS) { // JSR 292: this must be an implicitly generated method MethodHandle.invokeExact(*...) or similar ! KlassHandle resolved_klass = link_info.resolved_klass(); ! assert(resolved_klass() == SystemDictionary::MethodHandle_klass() || ! resolved_klass() == SystemDictionary::VarHandle_klass(), ""); assert(MethodHandles::is_signature_polymorphic_name(link_info.name()), ""); Handle resolved_appendix; Handle resolved_method_type; methodHandle resolved_method = lookup_polymorphic_method(link_info, &resolved_appendix, &resolved_method_type, CHECK); --- 1608,1620 ---- void LinkResolver::resolve_handle_call(CallInfo& result, const LinkInfo& link_info, TRAPS) { // JSR 292: this must be an implicitly generated method MethodHandle.invokeExact(*...) or similar ! Klass* resolved_klass = link_info.resolved_klass(); ! assert(resolved_klass == SystemDictionary::MethodHandle_klass() || ! resolved_klass == SystemDictionary::VarHandle_klass(), ""); assert(MethodHandles::is_signature_polymorphic_name(link_info.name()), ""); Handle resolved_appendix; Handle resolved_method_type; methodHandle resolved_method = lookup_polymorphic_method(link_info, &resolved_appendix, &resolved_method_type, CHECK);
*** 1653,1663 **** } void LinkResolver::resolve_invokedynamic(CallInfo& result, const constantPoolHandle& pool, int index, TRAPS) { Symbol* method_name = pool->name_ref_at(index); Symbol* method_signature = pool->signature_ref_at(index); ! KlassHandle current_klass = KlassHandle(THREAD, pool->pool_holder()); // Resolve the bootstrap specifier (BSM + optional arguments). Handle bootstrap_specifier; // Check if CallSite has been bound already: ConstantPoolCacheEntry* cpce = pool->invokedynamic_cp_cache_entry_at(index); --- 1647,1657 ---- } void LinkResolver::resolve_invokedynamic(CallInfo& result, const constantPoolHandle& pool, int index, TRAPS) { Symbol* method_name = pool->name_ref_at(index); Symbol* method_signature = pool->signature_ref_at(index); ! Klass* current_klass = pool->pool_holder(); // Resolve the bootstrap specifier (BSM + optional arguments). Handle bootstrap_specifier; // Check if CallSite has been bound already: ConstantPoolCacheEntry* cpce = pool->invokedynamic_cp_cache_entry_at(index);
*** 1691,1701 **** } void LinkResolver::resolve_dynamic_call(CallInfo& result, Handle bootstrap_specifier, Symbol* method_name, Symbol* method_signature, ! KlassHandle current_klass, TRAPS) { // JSR 292: this must resolve to an implicitly generated method MH.linkToCallSite(*...) // The appendix argument is likely to be a freshly-created CallSite. Handle resolved_appendix; Handle resolved_method_type; --- 1685,1695 ---- } void LinkResolver::resolve_dynamic_call(CallInfo& result, Handle bootstrap_specifier, Symbol* method_name, Symbol* method_signature, ! Klass* current_klass, TRAPS) { // JSR 292: this must resolve to an implicitly generated method MH.linkToCallSite(*...) // The appendix argument is likely to be a freshly-created CallSite. Handle resolved_appendix; Handle resolved_method_type;
< prev index next >