# HG changeset patch
# User kvn
# Date 1339479508 25200
# Node ID d5dded5d1e0d06d376bc1d5807fb3142859b0abf
# Parent  ccaa67adfe5b2878ba7a885aa520782a6359a697# Parent  0919b2e7895d8b43f7531ab1d3981f669b460e15
Merge

diff -r ccaa67adfe5b -r d5dded5d1e0d src/share/vm/opto/memnode.cpp
--- a/src/share/vm/opto/memnode.cpp	Mon Jun 11 16:47:41 2012 -0700
+++ b/src/share/vm/opto/memnode.cpp	Mon Jun 11 22:38:28 2012 -0700
@@ -717,6 +717,22 @@
         adr = adr->in(1);
         continue;
 
+      case Op_EncodeP:
+        // EncodeP node's control edge could be set by this method
+        // when EncodeP node depends on CastPP node.
+        //
+        // Use its control edge for memory op because EncodeP may go away
+        // later when it is folded with following or preceding DecodeN node.
+        if (adr->in(0) == NULL) {
+          // Keep looking for cast nodes.
+          adr = adr->in(1);
+          continue;
+        }
+        ccp->hash_delete(n);
+        n->set_req(MemNode::Control, adr->in(0));
+        ccp->hash_insert(n);
+        return n;
+
       case Op_CastPP:
         // If the CastPP is useless, just peek on through it.
         if( ccp->type(adr) == ccp->type(adr->in(1)) ) {