archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Vladimir Kozlov 2013-12-12 11:05:39 -08:00
commit 3b4f167e54
332 changed files with 5475 additions and 3385 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/oops/instanceKlass.cpp
View file

@ -1431,6 +1431,17 @@ Method* InstanceKlass::find_method(Symbol* name, Symbol* signature) const {
return InstanceKlass::find_method(methods(), name, signature);
}
// find_instance_method looks up the name/signature in the local methods array
// and skips over static methods
Method* InstanceKlass::find_instance_method(
Array<Method*>* methods, Symbol* name, Symbol* signature) {
Method* meth = InstanceKlass::find_method(methods, name, signature);
if (meth != NULL && meth->is_static()) {
meth = NULL;
}
return meth;
}
// find_method looks up the name/signature in the local methods array
Method* InstanceKlass::find_method(
Array<Method*>* methods, Symbol* name, Symbol* signature) {
@ -2173,7 +2184,6 @@ int InstanceKlass::oop_adjust_pointers(oop obj) {
obj, \
MarkSweep::adjust_pointer(p), \
assert_is_in)
MarkSweep::adjust_klass(obj->klass());
return size;
}