--- old/src/share/vm/opto/macro.cpp	2016-11-24 11:13:28.556573001 +0100
+++ new/src/share/vm/opto/macro.cpp	2016-11-24 11:13:28.485573409 +0100
@@ -71,8 +71,8 @@
 
 void PhaseMacroExpand::copy_call_debug_info(CallNode *oldcall, CallNode * newcall) {
   // Copy debug information and adjust JVMState information
-  uint old_dbg_start = oldcall->tf()->domain()->cnt();
-  uint new_dbg_start = newcall->tf()->domain()->cnt();
+  uint old_dbg_start = oldcall->tf()->domain_sig()->cnt();
+  uint new_dbg_start = newcall->tf()->domain_sig()->cnt();
   int jvms_adj  = new_dbg_start - old_dbg_start;
   assert (new_dbg_start == newcall->req(), "argument count mismatch");