diff src/share/vm/graal/graalCodeInstaller.cpp @ 18043:f55f2d400797

Fix some format strings
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 20:34:55 +0200
parents 9a804ec7f707
children c59612b9d110
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -155,20 +155,20 @@
   if (obj->is_a(HotSpotResolvedObjectType::klass())) {
     Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaClass(obj));
     if (compressed) {
-      assert(Klass::decode_klass((narrowKlass) prim) == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim));
+      assert(Klass::decode_klass((narrowKlass) prim) == klass, err_msg("%s @ " INTPTR_FORMAT " != " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass), prim));
     } else {
-      assert((Klass*) prim == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim));
+      assert((Klass*) prim == klass, err_msg("%s @ " INTPTR_FORMAT " != " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass), prim));
     }
     int index = oop_recorder->find_index(klass);
     TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), klass->name()->as_C_string());
   } else if (obj->is_a(HotSpotResolvedJavaMethod::klass())) {
     Method* method = (Method*) (address) HotSpotResolvedJavaMethod::metaspaceMethod(obj);
-    assert(!compressed, err_msg("unexpected compressed method pointer %s @ %p = %p", method->name()->as_C_string(), method, prim));
+    assert(!compressed, err_msg("unexpected compressed method pointer %s @ " INTPTR_FORMAT " = " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method), prim));
     int index = oop_recorder->find_index(method);
     TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), method->name()->as_C_string());
   } else {
     assert(java_lang_String::is_instance(obj),
-        err_msg("unexpected metadata reference (%s) for constant %ld (%p)", obj->klass()->name()->as_C_string(), prim, prim));
+        err_msg("unexpected metadata reference (%s) for constant " JLONG_FORMAT " (" INTPTR_FORMAT ")", obj->klass()->name()->as_C_string(), prim, prim));
   }
 }
 
@@ -451,7 +451,7 @@
 
   if (cb != NULL) {
     // Make sure the pre-calculated constants section size was correct.
-    guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", cb->code_begin() - cb->content_begin(), _constants_size));
+    guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", (int)(cb->code_begin() - cb->content_begin()), _constants_size));
   }
   return result;
 }