--- old/src/share/vm/opto/compile.cpp	2016-11-24 11:13:26.484584913 +0100
+++ new/src/share/vm/opto/compile.cpp	2016-11-24 11:13:26.413585321 +0100
@@ -746,7 +746,7 @@
     if (is_osr_compilation()) {
       const TypeTuple *domain = StartOSRNode::osr_domain();
       const TypeTuple *range = TypeTuple::make_range(method()->signature());
-      init_tf(TypeFunc::make(domain, range));
+      init_tf(TypeFunc::make(domain, domain, range));
       StartNode* s = new StartOSRNode(root(), domain);
       initial_gvn()->set_type_bottom(s);
       init_start(s);
@@ -754,7 +754,7 @@
     } else {
       // Normal case.
       init_tf(TypeFunc::make(method()));
-      StartNode* s = new StartNode(root(), tf()->domain());
+      StartNode* s = new StartNode(root(), tf()->domain_cc());
       initial_gvn()->set_type_bottom(s);
       init_start(s);
       if (method()->intrinsic_id() == vmIntrinsics::_Reference_get && UseG1GC) {