Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/klassVtable.cpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | 08236d966eea |
children | b2e698d2276c |
line wrap: on
line diff
--- a/src/share/vm/oops/klassVtable.cpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/oops/klassVtable.cpp Wed Jun 19 10:45:56 2013 +0200 @@ -519,6 +519,9 @@ // check if a method is a miranda method, given a class's methods table and it's super // the caller must make sure that the method belongs to an interface implemented by the class bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods, Klass* super) { + if (m->is_static()) { + return false; + } Symbol* name = m->name(); Symbol* signature = m->signature(); if (InstanceKlass::find_method(class_methods, name, signature) == NULL) {