--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	Wed Jan 16 11:43:51 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	Mon Jan 14 13:53:42 2019 +0100
@@ -97,7 +97,7 @@
     return false;
   }
 
-  if (n->is_CallJava() || n->Opcode() == Op_CallLeafNoFP) {
+  if (n->is_Call()) {
     return true;
   }