--- old/src/share/vm/opto/valuetypenode.hpp	2017-02-13 17:39:04.047392449 +0100
+++ new/src/share/vm/opto/valuetypenode.hpp	2017-02-13 17:39:03.975392452 +0100
@@ -49,7 +49,7 @@
   // Get the klass defining the field layout of the value type
   ciValueKlass* value_klass() const { return type()->is_valuetype()->value_klass(); }
   // Initialize the value type by loading its field values from memory
-  void load_values(PhaseGVN& gvn, Node* mem, Node* base, Node* ptr, ciKlass* holder = NULL, int f_offset = 0);
+  void load_values(PhaseGVN& gvn, Node* mem, Node* base, Node* ptr, ciInstanceKlass* holder, int holder_offset = 0);
 
   enum { Control,   // Control input
          Oop,       // Oop of TypeValueTypePtr
@@ -66,7 +66,7 @@
   // Create a new ValueTypeNode and load its values from an oop
   static Node* make(PhaseGVN& gvn, Node* mem, Node* oop);
   // Create a new ValueTypeNode and load its values from a flattened value type field or array
-  static Node* make(PhaseGVN& gvn, ciValueKlass* vk, Node* mem, Node* obj, Node* ptr, ciKlass* holder, int field_offset = 0);
+  static Node* make(PhaseGVN& gvn, ciValueKlass* vk, Node* mem, Node* obj, Node* ptr, ciInstanceKlass* holder = NULL, int holder_offset = 0);
 
   // Support for control flow merges
   ValueTypeNode* clone_with_phis(PhaseGVN& gvn, Node* region);
@@ -75,10 +75,10 @@
 
   // Store the value type to memory if not yet allocated and returns the oop
   Node* store_to_memory(GraphKit* kit);
-  // Store the value type in a field of an object
-  void store_to_field(GraphKit* kit, Node* obj, Node* ptr, ciInstanceKlass* instance_type, int field_offset) const;
+  // Store the value type to a flattened value type field or array
+  void store(GraphKit* kit, Node* obj, Node* ptr, ciInstanceKlass* holder = NULL, int holder_offset = 0) const;
   // Store the field values to memory
-  void store_values(GraphKit* kit, Node* base, Node* ptr, ciKlass* holder = NULL, int holder_offset = 0) const;
+  void store_values(GraphKit* kit, Node* base, Node* ptr, ciInstanceKlass* holder, int holder_offset = 0) const;
 
   // Get oop for heap allocated value type (may be TypePtr::NULL_PTR)
   Node* get_oop() const    { return in(Oop); }