--- old/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2018-06-13 21:56:41.252840932 +0200
+++ new/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2018-06-13 21:56:40.910845226 +0200
@@ -5313,8 +5313,8 @@
     xchgptr(dst, rax); // Move obj into rax and save rax into obj.
   }
 
-  assert(StubRoutines::x86::shenandoah_wb() != NULL, "need write barrier stub");
-  call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::x86::shenandoah_wb())));
+  assert(ShenandoahBarrierSetAssembler::shenandoah_wb() != NULL, "need write barrier stub");
+  call(RuntimeAddress(CAST_FROM_FN_PTR(address, ShenandoahBarrierSetAssembler::shenandoah_wb())));
 
   if (dst != rax) {
     xchgptr(rax, dst); // Swap back obj with rax.