Mercurial > hg > truffle

comparison src/share/vm/oops/instanceKlass.cpp @ 6831:d8ce2825b193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass Summary: Capitalize these metadata types (and objArrayKlass) Reviewed-by: stefank, twisti, kvn
author coleenp
date Sat, 29 Sep 2012 06:40:00 -0400
parents aed758eda82a
children 4735d2c84362
comparison
equal deleted inserted replaced
6811:1b582b1bf7cb 6831:d8ce2825b193
987 MutexLocker mc(Compile_lock, THREAD); // for vtables 987 MutexLocker mc(Compile_lock, THREAD); // for vtables
988 MutexLocker ma(MultiArray_lock, THREAD); 988 MutexLocker ma(MultiArray_lock, THREAD);
989 989
990 // Check if update has already taken place 990 // Check if update has already taken place
991 if (this_oop->array_klasses() == NULL) { 991 if (this_oop->array_klasses() == NULL) {
992 Klass* k = objArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL); 992 Klass* k = ObjArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL);
993 this_oop->set_array_klasses(k); 993 this_oop->set_array_klasses(k);
994 } 994 }
995 } 995 }
996 } 996 }
997 // _this will always be set at this point 997 // _this will always be set at this point
998 objArrayKlass* oak = (objArrayKlass*)this_oop->array_klasses(); 998 ObjArrayKlass* oak = (ObjArrayKlass*)this_oop->array_klasses();
999 if (or_null) { 999 if (or_null) {
1000 return oak->array_klass_or_null(n); 1000 return oak->array_klass_or_null(n);
1001 } 1001 }
1002 return oak->array_klass(n, CHECK_NULL); 1002 return oak->array_klass(n, CHECK_NULL);
1003 } 1003 }
1222 } 1222 }
1223 1223
1224 1224
1225 void InstanceKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) { 1225 void InstanceKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) {
1226 if (array_klasses() != NULL) 1226 if (array_klasses() != NULL)
1227 arrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD); 1227 ArrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD);
1228 } 1228 }
1229 1229
1230 void InstanceKlass::array_klasses_do(void f(Klass* k)) { 1230 void InstanceKlass::array_klasses_do(void f(Klass* k)) {
1231 if (array_klasses() != NULL) 1231 if (array_klasses() != NULL)
1232 arrayKlass::cast(array_klasses())->array_klasses_do(f); 1232 ArrayKlass::cast(array_klasses())->array_klasses_do(f);
1233 } 1233 }
1234 1234
1235 1235
1236 void InstanceKlass::with_array_klasses_do(void f(Klass* k)) { 1236 void InstanceKlass::with_array_klasses_do(void f(Klass* k)) {
1237 f(this); 1237 f(this);
2308 Klass* class1 = this; 2308 Klass* class1 = this;
2309 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); 2309 oop classloader1 = InstanceKlass::cast(class1)->class_loader();
2310 Symbol* classname1 = Klass::cast(class1)->name(); 2310 Symbol* classname1 = Klass::cast(class1)->name();
2311 2311
2312 if (Klass::cast(class2)->oop_is_objArray()) { 2312 if (Klass::cast(class2)->oop_is_objArray()) {
2313 class2 = objArrayKlass::cast(class2)->bottom_klass(); 2313 class2 = ObjArrayKlass::cast(class2)->bottom_klass();
2314 } 2314 }
2315 oop classloader2; 2315 oop classloader2;
2316 if (Klass::cast(class2)->oop_is_instance()) { 2316 if (Klass::cast(class2)->oop_is_instance()) {
2317 classloader2 = InstanceKlass::cast(class2)->class_loader(); 2317 classloader2 = InstanceKlass::cast(class2)->class_loader();
2318 } else { 2318 } else {