--- old/src/hotspot/share/opto/lcm.cpp	2018-06-13 21:56:47.657760513 +0200
+++ new/src/hotspot/share/opto/lcm.cpp	2018-06-13 21:56:47.319764757 +0200
@@ -34,6 +34,9 @@
 #include "opto/runtime.hpp"
 #include "opto/chaitin.hpp"
 #include "runtime/sharedRuntime.hpp"
+#if INCLUDE_SHENANDOAHGC
+#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+#endif
 
 // Optimization - Graph Style
 
@@ -893,12 +896,13 @@
       proj->_rout.OR(Matcher::method_handle_invoke_SP_save_mask());
   }
 
-  if (UseShenandoahGC && mcall->entry_point() == StubRoutines::shenandoah_wb_C()) {
+#if INCLUDE_SHENANDOAHGC
+  if (UseShenandoahGC && mcall->entry_point() == ShenandoahBarrierSetAssembler::shenandoah_wb_C()) {
     assert(op == Op_CallLeafNoFP, "shenandoah_wb_C should be called with Op_CallLeafNoFP");
     add_call_kills(proj, regs, save_policy, exclude_soe, true);
-  } else {
+  } else
+#endif
     add_call_kills(proj, regs, save_policy, exclude_soe, false);
-  }
 
   return node_cnt;
 }