--- old/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2017-02-13 21:50:15.093743067 +0100
+++ new/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2017-02-13 21:50:15.033743239 +0100
@@ -1664,6 +1664,10 @@
 
     case g1_post_barrier_slow_id:
       {
+        // avoid touching CardTableModRefBS if not G1
+        // FIXME: This looks like an upstream bug.
+        if (!UseG1GC) break;
+
         StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);