Mercurial > hg > graal-compiler
comparison src/share/vm/oops/constantPool.cpp @ 17805:bbfbe9b06038
Merge
author | kvn |
---|---|
date | Thu, 13 Mar 2014 14:57:01 -0700 |
parents | 53094b350323 |
children | 9428a0b94204 |
comparison
equal
deleted
inserted
replaced
17804:fd1b9f02cc91 | 17805:bbfbe9b06038 |
---|---|
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"); |