src/share/vm/oops/klassVtable.cpp

rev 9019 : [mq]: format.patch

@@ -36,12 +36,10 @@
 #include "prims/jvmtiRedefineClassesTrace.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/handles.inline.hpp"
 #include "utilities/copy.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 inline InstanceKlass* klassVtable::ik() const {
   Klass* k = _klass();
   assert(k->oop_is_instance(), "not an InstanceKlass");
   return (InstanceKlass*)k;
 }

@@ -1503,21 +1501,21 @@
   // we sub_type, because it could be a miranda method
   if (!vt->klass()->is_subtype_of(method()->method_holder())) {
 #ifndef PRODUCT
     print();
 #endif
-    fatal("vtableEntry " PTR_FORMAT ": method is from subclass", this);
+    fatal("vtableEntry " PTR_FORMAT ": method is from subclass", p2i(this));
   }
 }
 
 #ifndef PRODUCT
 
 void vtableEntry::print() {
   ResourceMark rm;
   tty->print("vtableEntry %s: ", method()->name()->as_C_string());
   if (Verbose) {
-    tty->print("m %#lx ", (address)method());
+    tty->print("m " INTPTR_FORMAT_W(#) " ", p2i(method()));
   }
 }
 
 class VtableStats : AllStatic {
  public:

@@ -1584,9 +1582,9 @@
 long klassItable::_total_size;      // Total no. of bytes used for itables
 
 void klassItable::print_statistics() {
  tty->print_cr("itable statistics:");
  tty->print_cr("%6d classes with itables", _total_classes);
- tty->print_cr("%6d K uses for itables (average by class: %d bytes)", _total_size / K, _total_size / _total_classes);
+ tty->print_cr("%6ld K uses for itables (average by class: %ld bytes)", _total_size / K, _total_size / _total_classes);
 }
 
 #endif // PRODUCT