src/share/vm/code/vtableStubs.cpp

rev 9019 : [mq]: format.patch

@@ -38,12 +38,10 @@
 #include "runtime/sharedRuntime.hpp"
 #ifdef COMPILER2
 #include "opto/matcher.hpp"
 #endif
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // -----------------------------------------------------------------------------------------
 // Implementation of VtableStub
 
 address VtableStub::_chunk             = NULL;
 address VtableStub::_chunk_end         = NULL;

@@ -77,12 +75,14 @@
  return res;
 }
 
 
 void VtableStub::print_on(outputStream* st) const {
-  st->print("vtable stub (index = %d, receiver_location = %d, code = [" INTPTR_FORMAT ", " INTPTR_FORMAT "[)",
-             index(), receiver_location(), code_begin(), code_end());
+  st->print("vtable stub (index = %d, receiver_location = %s/" INTX_FORMAT ", code = "
+            "[" INTPTR_FORMAT ", " INTPTR_FORMAT "[)",
+            index(), receiver_location()->name(), receiver_location()->value(),
+            p2i(code_begin()), p2i(code_end()));
 }
 
 
 // -----------------------------------------------------------------------------------------
 // Implementation of VtableStubs

@@ -124,12 +124,13 @@
       return NULL;
     }
 
     enter(is_vtable_stub, vtable_index, s);
     if (PrintAdapterHandlers) {
-      tty->print_cr("Decoding VtableStub %s[%d]@%d",
-                    is_vtable_stub? "vtbl": "itbl", vtable_index, VtableStub::receiver_location());
+      tty->print_cr("Decoding VtableStub %s[%d]@%s/" INTX_FORMAT "",
+                    is_vtable_stub? "vtbl": "itbl", vtable_index, 
+                    VtableStub::receiver_location()->name(), VtableStub::receiver_location()->value());
       Disassembler::decode(s->code_begin(), s->code_end());
     }
     // Notify JVMTI about this stub. The event will be recorded by the enclosing
     // JvmtiDynamicCodeEventCollector and posted when this thread has released
     // all locks.

@@ -222,9 +223,9 @@
   InstanceKlass* ik = InstanceKlass::cast(klass);
   klassVtable* vt = ik->vtable();
   ik->print();
   fatal("bad compiled vtable dispatch: receiver " INTPTR_FORMAT ", "
         "index %d (vtable length %d)",
-        (address)receiver, index, vt->length());
+        p2i(receiver), index, vt->length());
 }
 
 #endif // PRODUCT