truffle: src/share/vm/interpreter/linkResolver.cpp comparison

comparison src/share/vm/interpreter/linkResolver.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Tue, 01 Apr 2014 13:57:07 +0200
parents	d8041d695d19
children	a20be10ad437

comparison

equal deleted inserted replaced

-:8db6e76cb658
+:4ca6dc0799b6
 /*
-* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 int vtable_index = Method::invalid_vtable_index;
 Symbol* name = resolved_method->name();
 Symbol* signature = resolved_method->signature();
 // First check in default method array
-if (!resolved_method->is_abstract() &&
+if (!resolved_method->is_abstract()  &&
 (InstanceKlass::cast(klass())->default_methods() != NULL)) {
 int index = InstanceKlass::find_method_index(InstanceKlass::cast(klass())->default_methods(), name, signature);
 if (index >= 0 ) {
 vtable_index = InstanceKlass::cast(klass())->default_vtable_indices()->at(index);
 }
 return vtable_index;
 }
 void LinkResolver::lookup_method_in_interfaces(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
 InstanceKlass *ik = InstanceKlass::cast(klass());
+result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name, signature));
-// 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.
-result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name, signature, true));
 }
 void LinkResolver::lookup_polymorphic_method(methodHandle& result,
 KlassHandle klass, Symbol* name, Symbol* full_signature,
 KlassHandle current_klass,
 method_signature),
 nested_exception);
 }
 }
-// 5. access checks, access checking may be turned off when calling from within the VM.
+// 5. check if method is concrete
+if (resolved_method->is_abstract() && !resolved_klass->is_abstract()) {
+ResourceMark rm(THREAD);
+THROW_MSG(vmSymbols::java_lang_AbstractMethodError(),
+Method::name_and_sig_as_C_string(resolved_klass(),
+method_name,
+method_signature));
+}
+// 6. access checks, access checking may be turned off when calling from within the VM.
 if (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,
 Symbol* method_signature,
 KlassHandle current_klass,
 bool check_access,
 bool nostatics, TRAPS) {
 // 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(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
 Method::name_and_sig_as_C_string(resolved_klass(),
 method_name,
 method_signature));
 }
 }
+if (nostatics && 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(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+}
 if (check_access) {
 // JDK8 adds non-public interface methods, and accessability check requirement
 assert(current_klass.not_null() , "current_klass should not be null");
 THROW_MSG(vmSymbols::java_lang_LinkageError(), buf);
 }
 }
 }
-if (nostatics && 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(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
-}
 if (TraceItables && Verbose) {
 ResourceMark rm(THREAD);
 tty->print("invokeinterface resolved method: caller-class:%s, compile-time-class:%s, method:%s, method_holder:%s, access_flags: ",
 (current_klass.is_null() ? "<NULL>" : current_klass->internal_name()),
 (resolved_klass.is_null() ? "<NULL>" : resolved_klass->internal_name()),
 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
 methodHandle sel_method;
-// This search must match the linktime preparation search for itable initialization
-// to correctly enforce loader constraints for interface method inheritance
 lookup_instance_method_in_klasses(sel_method, recv_klass,
 resolved_method->name(),
 resolved_method->signature(), CHECK);
 if (sel_method.is_null() && !check_null_and_abstract) {
 // In theory this is a harmless placeholder value, but

Mercurial > hg > truffle

comparison src/share/vm/interpreter/linkResolver.cpp @ 14909:4ca6dc0799b6