*** old/src/share/vm/opto/valuetypenode.hpp	Fri Dec  2 14:22:05 2016
--- new/src/share/vm/opto/valuetypenode.hpp	Fri Dec  2 14:22:05 2016

*** 33,43 ****
--- 33,43 ----
  //------------------------------ValueTypeNode-------------------------------------
  // Node representing a value type in C2 IR
  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);
    }
  
    // Get the klass defining the field layout of the value type

*** 48,57 ****
--- 48,59 ----
    void store_values(GraphKit* kit, ciInstanceKlass* holder, Node* base, int base_offset = 0) const;
  
    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:
    // Create a new ValueTypeNode with uninitialized values
    static Node* make(PhaseGVN& gvn, ciValueKlass* klass);