--- old/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	2018-06-13 21:56:46.293777639 +0200
+++ new/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	2018-06-13 21:56:45.955781883 +0200
@@ -33,6 +33,7 @@
 #include "opto/phaseX.hpp"
 #include "opto/rootnode.hpp"
 #include "opto/runtime.hpp"
+#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/c2/shenandoahSupport.hpp"
 #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
 #include "opto/subnode.hpp"
@@ -2532,12 +2533,12 @@
             } else {
               if (n->is_Proj()) {
                 if (n->in(0)->Opcode() == Op_CallLeafNoFP) {
-                  if (n->in(0)->as_Call()->entry_point() != StubRoutines::shenandoah_wb_C()) {
+                  if (n->in(0)->as_Call()->entry_point() != ShenandoahBarrierSetAssembler::shenandoah_wb_C()) {
                     const_oop = NULL;
                     break;
                   }
                 } else if (n->in(0)->is_MachCallLeaf()) {
-                  if (n->in(0)->as_MachCall()->entry_point() != StubRoutines::shenandoah_wb_C()) {
+                  if (n->in(0)->as_MachCall()->entry_point() != ShenandoahBarrierSetAssembler::shenandoah_wb_C()) {
                     const_oop = NULL;
                     break;
                   }
@@ -3976,7 +3977,7 @@
   mm->set_memory_at(Compile::AliasIdxRaw, raw_mem);
   phase->register_new_node(mm, c);
 
-  Node* call = new CallLeafNoFPNode(ShenandoahBarrierSetC2::shenandoah_write_barrier_Type(), StubRoutines::shenandoah_wb_C(), "shenandoah_write_barrier", TypeRawPtr::BOTTOM);
+  Node* call = new CallLeafNoFPNode(ShenandoahBarrierSetC2::shenandoah_write_barrier_Type(), ShenandoahBarrierSetAssembler::shenandoah_wb_C(), "shenandoah_write_barrier", TypeRawPtr::BOTTOM);
   call->init_req(TypeFunc::Control, c);
   call->init_req(TypeFunc::I_O, phase->C->top());
   call->init_req(TypeFunc::Memory, mm);
@@ -4390,7 +4391,7 @@
   nodes.push(root);
   for (uint next = 0; next < nodes.size(); next++) {
     Node *n  = nodes.at(next);
-    if (n->Opcode() == Op_CallLeafNoFP && n->as_Call()->_entry_point == StubRoutines::shenandoah_wb_C()) {
+    if (n->Opcode() == Op_CallLeafNoFP && n->as_Call()->_entry_point == ShenandoahBarrierSetAssembler::shenandoah_wb_C()) {
       controls.push(n);
       if (trace) { tty->print("XXXXXX verifying"); n->dump(); }
       for (uint next2 = 0; next2 < controls.size(); next2++) {