--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Mon Mar 12 12:28:43 2018 +0100
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Mon Mar 12 16:53:47 2018 +0100
@@ -706,9 +706,10 @@
            __ bind(filtered);
          }
         break;
+      case BarrierSet::Epsilon:
+        break;
 #endif // INCLUDE_ALL_GCS
       case BarrierSet::CardTableModRef:
-      case BarrierSet::Epsilon:
         break;
       default      :
         ShouldNotReachHere();
@@ -738,6 +739,8 @@
           __ popa();
         }
         break;
+      case BarrierSet::Epsilon:
+        break;
 #endif // INCLUDE_ALL_GCS
 
       case BarrierSet::CardTableModRef:
@@ -763,7 +766,6 @@
         }
         break;
       case BarrierSet::ModRef:
-      case BarrierSet::Epsilon:
         break;
       default      :
         ShouldNotReachHere();