--- old/src/hotspot/share/opto/matcher.cpp	2018-11-12 21:39:21.134226137 +0100
+++ new/src/hotspot/share/opto/matcher.cpp	2018-11-12 21:39:20.976227437 +0100
@@ -2071,12 +2071,10 @@
       bool mem_op = false;
       int mem_addr_idx = MemNode::Address;
       bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->matcher_find_shared_visit(this, mstack, n, nop, mem_op, mem_addr_idx);
-      bool cont = false;
       if (!gc_handled) {
-        cont = find_shared_visit(mstack, n, nop, mem_op, mem_addr_idx);
-      }
-      if (cont) {
-        continue;
+        if (find_shared_visit(mstack, n, nop, mem_op, mem_addr_idx)) {
+          continue;
+        }
       }
       for(int i = n->req() - 1; i >= 0; --i) { // For my children
         Node *m = n->in(i); // Get ith input