--- old/src/share/vm/opto/callnode.hpp	2016-11-24 11:13:25.760589074 +0100
+++ new/src/share/vm/opto/callnode.hpp	2016-11-24 11:13:25.692589466 +0100
@@ -572,7 +572,7 @@
   const char *_name;           // Printable name, if _method is NULL
 
   CallNode(const TypeFunc* tf, address addr, const TypePtr* adr_type)
-    : SafePointNode(tf->domain()->cnt(), NULL, adr_type),
+    : SafePointNode(tf->domain_cc()->cnt(), NULL, adr_type),
       _tf(tf),
       _entry_point(addr),
       _cnt(COUNT_UNKNOWN),
@@ -853,7 +853,7 @@
 
     const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+1, fields);
 
-    return TypeFunc::make(domain, range);
+    return TypeFunc::make(domain, domain, range);
   }
 
   // Result of Escape Analysis
@@ -1069,7 +1069,7 @@
 
     const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0,fields);
 
-    return TypeFunc::make(domain,range);
+    return TypeFunc::make(domain, domain, range);
   }
 
   virtual int Opcode() const;