src/hotspot/share/opto/matcher.cpp

@@ -2090,15 +2090,11 @@
      }
      else if (nstate == Post_Visit) {
        mstack.pop(); // Remove node from stack
  
        // Now hack a few special opcodes
-       uint opcode = n->Opcode();
-       bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->matcher_find_shared_post_visit(this, n, opcode);
-       if (!gc_handled) {
-         find_shared_post_visit(n, opcode);
-       }
+       find_shared_post_visit(n, n->Opcode());
      }
      else {
        ShouldNotReachHere();
      }
    } // end of while (mstack.is_nonempty())

@@ -2799,12 +2795,11 @@
          xop == Op_CompareAndSwapB ||
          xop == Op_CompareAndSwapS ||
          xop == Op_CompareAndSwapL ||
          xop == Op_CompareAndSwapP ||
          xop == Op_CompareAndSwapN ||
-         xop == Op_CompareAndSwapI ||
-         BarrierSet::barrier_set()->barrier_set_c2()->matcher_is_store_load_barrier(x, xop)) {
+         xop == Op_CompareAndSwapI) {
        return true;
      }
  
      // Op_FastLock previously appeared in the Op_* list above.
      if (xop == Op_FastLock) {