Mercurial > hg > truffle

diff src/share/vm/oops/klass.cpp @ 17889:386dd1c71858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults. Summary: A static method should be preferred during method resolution over an overpass, search the current class as well as its superclasses. Reviewed-by: acorn, coleenp, kamg
author lfoltan
date Mon, 14 Apr 2014 14:27:45 -0400
parents 9428a0b94204
children 34862ced4a87
line wrap: on
line diff
--- a/src/share/vm/oops/klass.cpp	Tue Apr 15 14:34:48 2014 -0700
+++ b/src/share/vm/oops/klass.cpp	Mon Apr 14 14:27:45 2014 -0400
@@ -129,7 +129,7 @@
 }
 
 
-Method* Klass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
+Method* Klass::uncached_lookup_method(Symbol* name, Symbol* signature, MethodLookupMode mode) const {
 #ifdef ASSERT
   tty->print_cr("Error: uncached_lookup_method called on a klass oop."
                 " Likely error: reflection method does not correctly"