1.1 --- a/src/share/vm/oops/instanceKlass.cpp Wed Dec 11 12:28:09 2013 +0100
1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Thu Dec 12 11:05:39 2013 -0800
1.3 @@ -1431,6 +1431,17 @@
1.4 return InstanceKlass::find_method(methods(), name, signature);
1.5 }
1.6
1.7 +// find_instance_method looks up the name/signature in the local methods array
1.8 +// and skips over static methods
1.9 +Method* InstanceKlass::find_instance_method(
1.10 + Array<Method*>* methods, Symbol* name, Symbol* signature) {
1.11 + Method* meth = InstanceKlass::find_method(methods, name, signature);
1.12 + if (meth != NULL && meth->is_static()) {
1.13 + meth = NULL;
1.14 + }
1.15 + return meth;
1.16 +}
1.17 +
1.18 // find_method looks up the name/signature in the local methods array
1.19 Method* InstanceKlass::find_method(
1.20 Array<Method*>* methods, Symbol* name, Symbol* signature) {
1.21 @@ -2173,7 +2184,6 @@
1.22 obj, \
1.23 MarkSweep::adjust_pointer(p), \
1.24 assert_is_in)
1.25 - MarkSweep::adjust_klass(obj->klass());
1.26 return size;
1.27 }
1.28
