Mercurial > hg > graal-compiler
diff src/share/vm/graal/graalRuntime.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Fri, 11 Oct 2013 15:41:33 +0200 |
| parents | 97e282186b5b |
| children | 2dfccd93510a |
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp Fri Oct 11 10:38:03 2013 +0200 +++ b/src/share/vm/graal/graalRuntime.cpp Fri Oct 11 15:41:33 2013 +0200 @@ -344,14 +344,14 @@ JRT_ENTRY(void, GraalRuntime::log_object(JavaThread* thread, oop obj, jint flags)) bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING); - bool address = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); + bool addr = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); if (!string) { - if (!address && obj->is_oop_or_null(true)) { + if (!addr && obj->is_oop_or_null(true)) { char buf[O_BUFLEN]; - tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), obj); + tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), (address)obj); } else { - tty->print("%p", obj); + tty->print("%p", (address)obj); } } else { ResourceMark rm; @@ -372,7 +372,7 @@ thread->dirty_card_queue().enqueue(card_addr); JRT_END -JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread,oopDesc* parent, oopDesc* child)) +JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child)) bool ret = true; if(!Universe::heap()->is_in_closed_subset(parent)) { tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent);