--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp	Tue Mar 13 15:29:55 2018 -0700
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp	Wed Mar 14 10:38:02 2018 +0100
@@ -1632,6 +1632,13 @@
       {
         StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
 
+        BarrierSet* bs = Universe::heap()->barrier_set();
+        if (bs->kind() != BarrierSet::G1BarrierSet) {
+          __ movptr(rax, (int)id);
+          __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);
+          __ should_not_reach_here();
+          break;
+        }
 
         // arg0: store_address
         Address store_addr(rbp, 2*BytesPerWord);