Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 836a62f43af9 e0c9a1d29eb4
children 3cce976666d9
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
796 } 796 }
797 797
798 if (!g1->is_obj_dead_cond(obj, this, vo)) { 798 if (!g1->is_obj_dead_cond(obj, this, vo)) {
799 if (obj->is_oop()) { 799 if (obj->is_oop()) {
800 Klass* klass = obj->klass(); 800 Klass* klass = obj->klass();
801 if (!klass->is_metadata()) { 801 if (!klass->is_metaspace_object()) {
802 gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " 802 gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
803 "not metadata", klass, obj); 803 "not metadata", klass, obj);
804 *failures = true; 804 *failures = true;
805 return; 805 return;
806 } else if (!klass->is_klass()) { 806 } else if (!klass->is_klass()) {