--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Fri Jan 29 20:57:09 2016 -0500
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Sat Jan 30 11:02:29 2016 -0500
@@ -2909,10 +2909,10 @@
 void InstanceKlass::collect_statistics(KlassSizeStats *sz) const {
   Klass::collect_statistics(sz);
 
-  sz->_inst_size  = HeapWordSize * size_helper();
-  sz->_vtab_bytes = HeapWordSize * vtable_length();
-  sz->_itab_bytes = HeapWordSize * itable_length();
-  sz->_nonstatic_oopmap_bytes = HeapWordSize * nonstatic_oop_map_size();
+  sz->_inst_size  = wordSize * size_helper();
+  sz->_vtab_bytes = wordSize * vtable_length();
+  sz->_itab_bytes = wordSize * itable_length();
+  sz->_nonstatic_oopmap_bytes = wordSize * nonstatic_oop_map_size();
 
   int n = 0;
   n += (sz->_methods_array_bytes         = sz->count_array(methods()));