--- old/src/share/vm/opto/runtime.cpp	2016-11-24 11:13:29.878565401 +0100
+++ new/src/share/vm/opto/runtime.cpp	2016-11-24 11:13:29.811565786 +0100
@@ -478,7 +478,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 
@@ -493,7 +493,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 
@@ -510,7 +510,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::multianewarray_Type(int ndim) {
@@ -527,7 +527,7 @@
   fields[TypeFunc::Parms+0] = TypeRawPtr::NOTNULL; // Returned oop
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::multianewarray2_Type() {
@@ -558,7 +558,7 @@
   fields[TypeFunc::Parms+0] = TypeRawPtr::NOTNULL; // Returned oop
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::g1_wb_pre_Type() {
@@ -571,7 +571,7 @@
   fields = TypeTuple::fields(0);
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::g1_wb_post_Type() {
@@ -585,7 +585,7 @@
   fields = TypeTuple::fields(0);
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::uncommon_trap_Type() {
@@ -598,7 +598,7 @@
   fields = TypeTuple::fields(0);
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 //-----------------------------------------------------------------------------
@@ -615,7 +615,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0,fields);
 
-  return TypeFunc::make(domain,range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 
@@ -633,7 +633,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::monitor_notify_Type() {
@@ -645,7 +645,7 @@
   // create result type (range)
   fields = TypeTuple::fields(0);
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::flush_windows_Type() {
@@ -659,7 +659,7 @@
   fields[TypeFunc::Parms+0] = NULL; // void
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::l2f_Type() {
@@ -674,7 +674,7 @@
   fields[TypeFunc::Parms+0] = Type::FLOAT;
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::modf_Type() {
@@ -689,7 +689,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::Math_D_D_Type() {
@@ -706,7 +706,7 @@
   fields[TypeFunc::Parms+1] = Type::HALF;
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+2, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::Math_DD_D_Type() {
@@ -723,7 +723,7 @@
   fields[TypeFunc::Parms+1] = Type::HALF;
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+2, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 //-------------- currentTimeMillis, currentTimeNanos, etc
@@ -739,7 +739,7 @@
   fields[TypeFunc::Parms+1] = Type::HALF;
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+2, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 // arraycopy stub variations:
@@ -785,7 +785,7 @@
   else
     fields[TypeFunc::Parms+0] = TypeInt::INT; // status result, if needed
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+retcnt, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::fast_arraycopy_Type() {
@@ -826,7 +826,7 @@
   fields[TypeFunc::Parms+0] = NULL; // void
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 // for aescrypt encrypt/decrypt operations, just three pointers returning void (length is constant)
@@ -852,7 +852,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = NULL; // void
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 /**
@@ -874,7 +874,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = TypeInt::INT; // crc result
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 /**
@@ -897,7 +897,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = TypeInt::INT; // crc result
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 /**
@@ -919,7 +919,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = TypeInt::INT; // crc result
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 // for cipherBlockChaining calls of aescrypt encrypt/decrypt, four pointers and a length, returning int
@@ -947,7 +947,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = TypeInt::INT;
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 //for counterMode calls of aescrypt encrypt/decrypt, four pointers and a length, returning int
@@ -976,7 +976,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms + 0] = TypeInt::INT;
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 /*
@@ -997,7 +997,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = NULL; // void
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 /*
@@ -1020,7 +1020,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = TypeInt::INT; // ofs
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::multiplyToLen_Type() {
@@ -1042,7 +1042,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = NULL;
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::squareToLen_Type() {
@@ -1062,7 +1062,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = NULL;
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 // for mulAdd calls, 2 pointers and 3 ints, returning int
@@ -1084,7 +1084,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = TypeInt::INT;
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms+1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::montgomeryMultiply_Type() {
@@ -1108,7 +1108,7 @@
   fields[TypeFunc::Parms+0] = TypePtr::NOTNULL;
 
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::montgomerySquare_Type() {
@@ -1131,7 +1131,7 @@
   fields[TypeFunc::Parms+0] = TypePtr::NOTNULL;
 
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc* OptoRuntime::vectorizedMismatch_Type() {
@@ -1151,7 +1151,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms + 0] = TypeInt::INT;
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 // GHASH block processing
@@ -1171,7 +1171,7 @@
     fields = TypeTuple::fields(1);
     fields[TypeFunc::Parms+0] = NULL; // void
     const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
-    return TypeFunc::make(domain, range);
+    return TypeFunc::make(domain, domain, range);
 }
 
 //------------- Interpreter state access for on stack replacement
@@ -1186,7 +1186,7 @@
   // fields[TypeFunc::Parms+0] = TypeInstPtr::NOTNULL; // locked oop
   fields[TypeFunc::Parms+0] = NULL; // void
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 //-------------- methodData update helpers
@@ -1202,7 +1202,7 @@
   fields = TypeTuple::fields(1);
   fields[TypeFunc::Parms+0] = NULL; // void
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms, fields);
-  return TypeFunc::make(domain,range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 JRT_LEAF(void, OptoRuntime::profile_receiver_type_C(DataLayout* data, oopDesc* receiver))
@@ -1466,7 +1466,7 @@
   fields[TypeFunc::Parms+0] = TypeInstPtr::NOTNULL; // Exception oop
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-  return TypeFunc::make(domain, range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 
@@ -1513,7 +1513,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0,fields);
 
-  return TypeFunc::make(domain,range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 
@@ -1531,7 +1531,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0,fields);
 
-  return TypeFunc::make(domain,range);
+  return TypeFunc::make(domain, domain, range);
 }
 
 const TypeFunc *OptoRuntime::dtrace_object_alloc_Type() {
@@ -1547,7 +1547,7 @@
 
   const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0,fields);
 
-  return TypeFunc::make(domain,range);
+  return TypeFunc::make(domain, domain, range);
 }