Mercurial > hg > truffle

comparison src/share/vm/oops/instanceKlass.cpp @ 14447:2da20f966936

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Thu, 12 Dec 2013 11:05:39 -0800
parents 3205e78d8193 816c89d5957d
children abec000618bf 5da8bb64b370
comparison
equal deleted inserted replaced
14446:b4e19a1e459f 14447:2da20f966936
1429 // find_method looks up the name/signature in the local methods array 1429 // find_method looks up the name/signature in the local methods array
1430 Method* InstanceKlass::find_method(Symbol* name, Symbol* signature) const { 1430 Method* InstanceKlass::find_method(Symbol* name, Symbol* signature) const {
1431 return InstanceKlass::find_method(methods(), name, signature); 1431 return InstanceKlass::find_method(methods(), name, signature);
1432 } 1432 }
1433 1433
1434 // find_instance_method looks up the name/signature in the local methods array
1435 // and skips over static methods
1436 Method* InstanceKlass::find_instance_method(
1437 Array<Method*>* methods, Symbol* name, Symbol* signature) {
1438 Method* meth = InstanceKlass::find_method(methods, name, signature);
1439 if (meth != NULL && meth->is_static()) {
1440 meth = NULL;
1441 }
1442 return meth;
1443 }
1444
1434 // find_method looks up the name/signature in the local methods array 1445 // find_method looks up the name/signature in the local methods array
1435 Method* InstanceKlass::find_method( 1446 Method* InstanceKlass::find_method(
1436 Array<Method*>* methods, Symbol* name, Symbol* signature) { 1447 Array<Method*>* methods, Symbol* name, Symbol* signature) {
1437 int hit = find_method_index(methods, name, signature); 1448 int hit = find_method_index(methods, name, signature);
1438 return hit >= 0 ? methods->at(hit): NULL; 1449 return hit >= 0 ? methods->at(hit): NULL;
2171 int size = size_helper(); 2182 int size = size_helper();
2172 InstanceKlass_OOP_MAP_ITERATE( \ 2183 InstanceKlass_OOP_MAP_ITERATE( \
2173 obj, \ 2184 obj, \
2174 MarkSweep::adjust_pointer(p), \ 2185 MarkSweep::adjust_pointer(p), \
2175 assert_is_in) 2186 assert_is_in)
2176 MarkSweep::adjust_klass(obj->klass());
2177 return size; 2187 return size;
2178 } 2188 }
2179 2189
2180 #if INCLUDE_ALL_GCS 2190 #if INCLUDE_ALL_GCS
2181 void InstanceKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 2191 void InstanceKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {