--- old/src/share/vm/opto/matcher.cpp	2015-10-14 13:54:23.188672571 +0200
+++ new/src/share/vm/opto/matcher.cpp	2015-10-14 13:54:23.076675279 +0200
@@ -2156,6 +2156,11 @@
       case Op_SafePoint:
         mem_op = true;
         break;
+      case Op_ShenandoahReadBarrier:
+      case Op_ShenandoahWriteBarrier:
+        mem_op = true;
+        set_shared(n);
+        break;
       default:
         if( n->is_Store() ) {
           // Do match stores, despite no ideal reg