comparison src/share/vm/oops/constantPool.cpp @ 14704:b51e29501f30

Merged with jdk9/dev/hotspot changeset 9486a41de3b7
author twisti
date Tue, 18 Mar 2014 20:19:10 -0700
parents d8041d695d19 4c76be9856fc
children 92aa6797d639
comparison
equal deleted inserted replaced
14647:8f483e200405 14704:b51e29501f30
1293 jint si = from_cp->string_index_at(from_i); 1293 jint si = from_cp->string_index_at(from_i);
1294 to_cp->string_index_at_put(to_i, si); 1294 to_cp->string_index_at_put(to_i, si);
1295 } break; 1295 } break;
1296 1296
1297 case JVM_CONSTANT_UnresolvedClass: 1297 case JVM_CONSTANT_UnresolvedClass:
1298 case JVM_CONSTANT_UnresolvedClassInError:
1298 { 1299 {
1299 // Can be resolved after checking tag, so check the slot first. 1300 // Can be resolved after checking tag, so check the slot first.
1300 CPSlot entry = from_cp->slot_at(from_i); 1301 CPSlot entry = from_cp->slot_at(from_i);
1301 if (entry.is_resolved()) { 1302 if (entry.is_resolved()) {
1302 assert(entry.get_klass()->is_klass(), "must be"); 1303 assert(entry.get_klass()->is_klass(), "must be");