--- old/src/hotspot/share/opto/escape.cpp	2018-11-15 00:08:35.571326720 +0100
+++ new/src/hotspot/share/opto/escape.cpp	2018-11-15 00:08:35.408328009 +0100
@@ -667,11 +667,6 @@
     case Op_WeakCompareAndSwapN:
     case Op_GetAndSetP:
     case Op_GetAndSetN: {
-      Node* adr = n->in(MemNode::Address);
-      if (opcode == Op_GetAndSetP || opcode == Op_GetAndSetN ||
-          opcode == Op_CompareAndExchangeN || opcode == Op_CompareAndExchangeP) {
-        add_local_var_and_edge(n, PointsToNode::NoEscape, adr, NULL);
-      }
       if (add_final_edges_unsafe_access(n, opcode)) {
         break;
       }