# HG changeset patch
# User jprovino
# Date 1423063108 18000
# Node ID fda2ab61011903e739e84252ac6ad0b6e1e4b314
# Parent  d9c497544bf3cc58bbe35db7ffc846626ae341e9
8071805: BarrierSet::Other is not used and should be removed.
Summary: Remove all occurences of BarrierSet::Other because the barrier set kind is never set to Other.
Reviewed-by: tschatzl, kbarrett

diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
--- a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -143,7 +143,6 @@
       }
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Other:
       ShouldNotReachHere();
       break;
     default:
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -115,7 +115,6 @@
       }
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Other:
       ShouldNotReachHere();
       break;
     default      :
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -185,7 +185,6 @@
       }
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Other:
       if (val == noreg) {
         __ movptr(obj, NULL_WORD);
       } else {
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -189,7 +189,6 @@
       }
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Other:
       if (val == noreg) {
         __ store_heap_oop_null(obj);
       } else {
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -1432,7 +1432,6 @@
       // No pre barriers
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Other:
       // No pre barriers
       break;
     default      :
@@ -1454,7 +1453,6 @@
       CardTableModRef_post_barrier(addr,  new_val);
       break;
     case BarrierSet::ModRef:
-    case BarrierSet::Other:
       // No post barriers
       break;
     default      :
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/share/vm/memory/barrierSet.hpp
--- a/hotspot/src/share/vm/memory/barrierSet.hpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/share/vm/memory/barrierSet.hpp	Wed Feb 04 10:18:28 2015 -0500
@@ -39,8 +39,7 @@
     CardTableModRef,
     CardTableExtension,
     G1SATBCT,
-    G1SATBCTLogging,
-    Other
+    G1SATBCTLogging
   };
 
   enum Flags {
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/share/vm/opto/graphKit.cpp
--- 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();
 
diff -r d9c497544bf3 -r fda2ab610119 hotspot/src/share/vm/runtime/vmStructs.cpp
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed Feb 04 22:21:08 2015 +0900
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed Feb 04 10:18:28 2015 -0500
@@ -2213,7 +2213,6 @@
   declare_constant(BarrierSet::CardTableExtension)                        \
   declare_constant(BarrierSet::G1SATBCT)                                  \
   declare_constant(BarrierSet::G1SATBCTLogging)                           \
-  declare_constant(BarrierSet::Other)                                     \
                                                                           \
   declare_constant(BlockOffsetSharedArray::LogN)                          \
   declare_constant(BlockOffsetSharedArray::LogN_words)                    \