Mercurial > hg > truffle

comparison src/share/vm/prims/jvmtiTagMap.cpp @ 6856:9855b7e559ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author collins
date Fri, 12 Oct 2012 10:49:39 -0700
parents d8ce2825b193 bbeecede56dd
children 045cb62046a7
comparison
equal deleted inserted replaced
6842:b9a9ed0f8eeb 6856:9855b7e559ae
2860 constantTag tag = pool->tag_at(i).value(); 2860 constantTag tag = pool->tag_at(i).value();
2861 if (tag.is_string() || tag.is_klass()) { 2861 if (tag.is_string() || tag.is_klass()) {
2862 oop entry; 2862 oop entry;
2863 if (tag.is_string()) { 2863 if (tag.is_string()) {
2864 entry = pool->resolved_string_at(i); 2864 entry = pool->resolved_string_at(i);
2865 // If the entry is non-null it it resolved. 2865 // If the entry is non-null it is resolved.
2866 if (entry == NULL) continue; 2866 if (entry == NULL) continue;
2867 assert(java_lang_String::is_instance(entry), "must be string");
2868 } else { 2867 } else {
2869 entry = Klass::cast(pool->resolved_klass_at(i))->java_mirror(); 2868 entry = Klass::cast(pool->resolved_klass_at(i))->java_mirror();
2870 } 2869 }
2871 if (!CallbackInvoker::report_constant_pool_reference(mirror, entry, (jint)i)) { 2870 if (!CallbackInvoker::report_constant_pool_reference(mirror, entry, (jint)i)) {
2872 return false; 2871 return false;