Mercurial > hg > graal-compiler

diff src/share/vm/opto/lcm.cpp @ 1100:f96a1a986f7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6895383: JCK test throws NPE for method compiled with Escape Analysis Summary: Add missing checks for MemBar nodes in EA. Reviewed-by: never
author kvn
date Wed, 09 Dec 2009 16:40:45 -0800
parents fbde8ec322d0
children 97125851f396
line wrap: on
line diff
--- a/src/share/vm/opto/lcm.cpp	Tue Dec 08 16:27:21 2009 -0800
+++ b/src/share/vm/opto/lcm.cpp	Wed Dec 09 16:40:45 2009 -0800
@@ -616,8 +616,9 @@
           assert(cfg->_bbs[oop_store->_idx]->_dom_depth <= this->_dom_depth, "oop_store must dominate card-mark");
         }
       }
-      if( n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_MemBarAcquire &&
-          n->req() > TypeFunc::Parms ) {
+      if( n->is_Mach() && n->req() > TypeFunc::Parms &&
+          (n->as_Mach()->ideal_Opcode() == Op_MemBarAcquire ||
+           n->as_Mach()->ideal_Opcode() == Op_MemBarVolatile) ) {
         // MemBarAcquire could be created without Precedent edge.
         // del_req() replaces the specified edge with the last input edge
         // and then removes the last edge. If the specified edge > number of