--- old/src/share/vm/adlc/formssel.cpp	2017-08-04 21:17:14.153561137 +0200
+++ new/src/share/vm/adlc/formssel.cpp	2017-08-04 21:17:06.796574323 +0200
@@ -890,7 +890,8 @@
       strcmp(_matrule->_opType,"TailCall"  )==0 ||
       strcmp(_matrule->_opType,"TailJump"  )==0 ||
       strcmp(_matrule->_opType,"SafePoint" )==0 ||
-      strcmp(_matrule->_opType,"Halt"      )==0 )
+      strcmp(_matrule->_opType,"Halt"      )==0 ||
+      strcmp(_matrule->_opType,"CallLeafNoFP")==0)
     return AdlcVMDeps::Parms;   // Skip the machine-state edges
 
   if( _matrule->_rChild &&