--- a/hotspot/src/share/vm/opto/graphKit.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/share/vm/opto/graphKit.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -1528,7 +1528,6 @@
     case BarrierSet::ModRef:
       break;
 
-    case BarrierSet::Other:
     default      :
       ShouldNotReachHere();
 
@@ -1547,7 +1546,6 @@
     case BarrierSet::ModRef:
       return true; // There is no pre-barrier
 
-    case BarrierSet::Other:
     default      :
       ShouldNotReachHere();
   }
@@ -1578,7 +1576,6 @@
     case BarrierSet::ModRef:
       break;
 
-    case BarrierSet::Other:
     default      :
       ShouldNotReachHere();