--- old/src/share/vm/opto/parseHelper.cpp	2016-11-16 09:06:13.430498615 +0100
+++ new/src/share/vm/opto/parseHelper.cpp	2016-11-16 09:06:13.358498613 +0100
@@ -329,9 +329,9 @@
 
   // Pop values from stack (last argument is first) and
   // connect them to the ValueTypeNode in reverse order.
-  for (int i = vk->field_count() - 1; i >= 0 ; --i) {
-    BasicType bt = vk->get_field_type_by_index(i);
-    Node* value = type2size[bt] == 1 ? pop() : pop_pair();
+  for (int i = vk->param_count() - 1; i >= 0 ; --i) {
+    ciType* field_type = vt->get_field_type(i);
+    Node* value = field_type->size() == 1 ? pop() : pop_pair();
     vt->set_field_value(i, value);
   }
   push(_gvn.transform(vt));