--- old/src/share/vm/opto/graphKit.cpp	2017-02-13 21:50:17.181737087 +0100
+++ new/src/share/vm/opto/graphKit.cpp	2017-02-13 21:50:17.117737271 +0100
@@ -1538,6 +1538,7 @@
     case BarrierSet::CardTableForRS:
     case BarrierSet::CardTableExtension:
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       break;
 
     default      :
@@ -1555,6 +1556,7 @@
     case BarrierSet::CardTableForRS:
     case BarrierSet::CardTableExtension:
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       return true; // There is no pre-barrier
 
     default      :
@@ -1584,6 +1586,7 @@
       break;
 
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       break;
 
     default      :