equal
deleted
inserted
replaced
2224 Thread* THREAD) { |
2224 Thread* THREAD) { |
2225 ClassLoaderData* loader_data1 = class_loader_data(class_loader1); |
2225 ClassLoaderData* loader_data1 = class_loader_data(class_loader1); |
2226 ClassLoaderData* loader_data2 = class_loader_data(class_loader2); |
2226 ClassLoaderData* loader_data2 = class_loader_data(class_loader2); |
2227 |
2227 |
2228 Symbol* constraint_name = NULL; |
2228 Symbol* constraint_name = NULL; |
|
2229 // Needs to be in same scope as constraint_name in case a Symbol is created and |
|
2230 // assigned to constraint_name. |
|
2231 FieldArrayInfo fd; |
2229 if (!FieldType::is_array(class_name)) { |
2232 if (!FieldType::is_array(class_name)) { |
2230 constraint_name = class_name; |
2233 constraint_name = class_name; |
2231 } else { |
2234 } else { |
2232 // For array classes, their Klass*s are not kept in the |
2235 // For array classes, their Klass*s are not kept in the |
2233 // constraint table. The element classes are. |
2236 // constraint table. The element classes are. |
2234 FieldArrayInfo fd; |
|
2235 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(false)); |
2237 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(false)); |
2236 // primitive types always pass |
2238 // primitive types always pass |
2237 if (t != T_OBJECT) { |
2239 if (t != T_OBJECT) { |
2238 return true; |
2240 return true; |
2239 } else { |
2241 } else { |