--- old/src/share/vm/opto/graphKit.cpp	2017-07-18 14:43:54.683960689 +0200
+++ new/src/share/vm/opto/graphKit.cpp	2017-07-18 14:43:50.514969875 +0200
@@ -1681,7 +1681,7 @@
       const Type* t = range_sig->field_at(TypeFunc::Parms);
       assert(t->isa_valuetypeptr(), "only value types for multiple return values");
       ciValueKlass* vk = t->is_valuetypeptr()->value_type()->value_klass();
-      ret = C->create_vt_node(call, vk, vk, 0, TypeFunc::Parms+1, false);
+      ret = ValueTypeNode::make(_gvn, call, vk, TypeFunc::Parms+1, false);
     }
   }
 
@@ -3353,7 +3353,7 @@
   // The layout_helper also encodes (in a low bit) the need for a slow path.
   jint  layout_con = Klass::_lh_neutral_value;
   Node* layout_val = get_layout_helper(klass_node, layout_con);
-  int   layout_is_con = (layout_val == NULL);
+  bool  layout_is_con = (layout_val == NULL);
 
   if (extra_slow_test == NULL)  extra_slow_test = intcon(0);
   // Generate the initial go-slow test.  It's either ALWAYS (return a
@@ -3427,7 +3427,7 @@
                           bool deoptimize_on_exception) {
   jint  layout_con = Klass::_lh_neutral_value;
   Node* layout_val = get_layout_helper(klass_node, layout_con);
-  int   layout_is_con = (layout_val == NULL);
+  bool  layout_is_con = (layout_val == NULL);
 
   if (!layout_is_con && !StressReflectiveCode &&
       !too_many_traps(Deoptimization::Reason_class_check)) {