Mercurial > hg > truffle

diff src/share/vm/opto/superword.cpp @ 985:685e959d09ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6877254: Server vm crashes with no branches off of store slice" when run with CMS and UseSuperWord(default) Summary: design StoreCMNode::Ideal to promote its oopStore input if the input is a MergeMem node Reviewed-by: kvn, never
author cfang
date Mon, 14 Sep 2009 09:49:54 -0700
parents ace8397c8563
children 00977607da34
line wrap: on
line diff
--- a/src/share/vm/opto/superword.cpp	Thu Sep 10 18:18:06 2009 -0700
+++ b/src/share/vm/opto/superword.cpp	Mon Sep 14 09:49:54 2009 -0700
@@ -457,10 +457,6 @@
         } else if (out->Opcode() == Op_StoreCM && out->in(MemNode::OopStore) == n) {
           // StoreCM has an input edge used as a precedence edge.
           // Maybe an issue when oop stores are vectorized.
-        } else if( out->is_MergeMem() && prev &&
-                   prev->Opcode() == Op_StoreCM && out == prev->in(MemNode::OopStore)) {
-          // Oop store is a MergeMem! This should not happen. Temporarily remove the assertion
-          // for this case because it could not be superwordized anyway.
         } else {
           assert(out == prev || prev == NULL, "no branches off of store slice");
         }