src/share/vm/adlc/formssel.cpp

rev 10701 : [backport] Remove ShWB from formssel.cpp
rev 10719 : [backport] Fix up superfluous changes against upstream

@@ -765,12 +765,11 @@
         !strcmp(_matrule->_rChild->_opType,"LoadNKlass")   ||
         !strcmp(_matrule->_rChild->_opType,"CreateEx")     ||  // type of exception
         !strcmp(_matrule->_rChild->_opType,"CheckCastPP")  ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetP")   ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetN")   ||
-        !strcmp(_matrule->_rChild->_opType,"ShenandoahReadBarrier") ||
-        !strcmp(_matrule->_rChild->_opType,"ShenandoahWriteBarrier")) )  return true;
+        !strcmp(_matrule->_rChild->_opType,"ShenandoahReadBarrier"))) return true;
   else if ( is_ideal_load() == Form::idealP )                return true;
   else if ( is_ideal_store() != Form::none  )                return true;
 
   if (needs_base_oop_edge(globals)) return true;
 

@@ -1141,11 +1140,11 @@
     return "MachFastLockNode";
   }
   else if (is_ideal_nop()) {
     return "MachNopNode";
   }
-  else if( is_ideal_membar()) {
+  else if (is_ideal_membar()) {
     return "MachMemBarNode";
   }
   else if (is_mach_constant()) {
     return "MachConstantNode";
   }

@@ -3474,11 +3473,11 @@
     "CompareAndSwapI", "CompareAndSwapL", "CompareAndSwapP", "CompareAndSwapN",
     "StoreCM",
     "ClearArray",
     "GetAndAddI", "GetAndSetI", "GetAndSetP",
     "GetAndAddL", "GetAndSetL", "GetAndSetN",
-    "ShenandoahReadBarrier", "ShenandoahWriteBarrier",
+    "ShenandoahReadBarrier",
   };
   int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*);
   if( strcmp(_opType,"PrefetchRead")==0 ||
       strcmp(_opType,"PrefetchWrite")==0 ||
       strcmp(_opType,"PrefetchAllocation")==0 )