--- old/src/share/vm/opto/type.cpp	2016-12-02 14:22:05.895886116 +0100
+++ new/src/share/vm/opto/type.cpp	2016-12-02 14:22:05.427886101 +0100
@@ -2210,9 +2210,9 @@
 //------------------------------dump2------------------------------------------
 #ifndef PRODUCT
 void TypeValueType::dump2(Dict &d, uint depth, outputStream* st) const {
-  st->print("valuetype[%d]:{", _vk->param_count());
+  st->print("valuetype[%d]:{", _vk->nof_declared_nonstatic_fields());
   st->print("%s", _vk->get_field_type_by_index(0)->name());
-  for (int i = 1; i < _vk->param_count(); ++i) {
+  for (int i = 1; i < _vk->nof_declared_nonstatic_fields(); ++i) {
     st->print(", %s", _vk->get_field_type_by_index(i)->name());
   }
   st->print("}");