diff src/share/vm/graal/graalRuntime.cpp @ 12372:2dfccd93510a

Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Fri, 11 Oct 2013 21:41:42 +0200
parents 0991c12c4186 359f7e70ae7f
children 370b5f07f9e2 808348377021
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp	Fri Oct 11 17:21:14 2013 +0200
+++ b/src/share/vm/graal/graalRuntime.cpp	Fri Oct 11 21:41:42 2013 +0200
@@ -350,14 +350,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;
@@ -378,7 +378,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);