--- old/src/share/vm/opto/valuetypenode.hpp	2016-12-02 14:22:05.987886119 +0100
+++ new/src/share/vm/opto/valuetypenode.hpp	2016-12-02 14:22:05.431886101 +0100
@@ -35,7 +35,7 @@
 class ValueTypeNode : public TypeNode {
 private:
   ValueTypeNode(const TypeValueType* t, Node* oop)
-    : TypeNode(t, Values + t->value_klass()->param_count()) {
+    : TypeNode(t, Values + t->value_klass()->nof_declared_nonstatic_fields()) {
     init_class_id(Class_ValueType);
     init_req(Oop, oop);
   }
@@ -50,6 +50,8 @@
   enum { Control,   // Control input
          Oop,       // Oop of TypeValueTypePtr
          Values     // Nodes corresponding to field values
+                    // Field values are connected in increasing order of the index of their VM-internal field
+                    // representation (the index returned by fieldDescriptor::index() for a field).
   };
 
 public: