--- old/src/share/vm/opto/generateOptoStub.cpp	2016-11-24 11:13:27.576578635 +0100
+++ new/src/share/vm/opto/generateOptoStub.cpp	2016-11-24 11:13:27.508579026 +0100
@@ -46,7 +46,7 @@
                         bool return_pc) {
   ResourceMark rm;
 
-  const TypeTuple *jdomain = C->tf()->domain();
+  const TypeTuple *jdomain = C->tf()->domain_sig();
   const TypeTuple *jrange  = C->tf()->range();
 
   // The procedure start
@@ -166,7 +166,7 @@
   const TypeTuple* range = TypeTuple::make(jrange->cnt(), rfields);
 
   // Final C signature
-  const TypeFunc *c_sig = TypeFunc::make(domain, range);
+  const TypeFunc *c_sig = TypeFunc::make(domain, domain, range);
 
   //-----------------------------
   // Make the call node.