diff src/share/vm/opto/lcm.cpp @ 365:5f44674206d3

Merge
author apetrusenko
date Wed, 24 Sep 2008 15:34:06 -0400
parents c792b641b8bd 1ee8caae33af
children 3b5ac9e7e6ea
line wrap: on
line diff
--- a/src/share/vm/opto/lcm.cpp	Wed Sep 17 18:11:40 2008 -0700
+++ b/src/share/vm/opto/lcm.cpp	Wed Sep 24 15:34:06 2008 -0400
@@ -595,7 +595,7 @@
 
       // A few node types require changing a required edge to a precedence edge
       // before allocation.
-      if( UseConcMarkSweepGC ) {
+      if( UseConcMarkSweepGC || UseG1GC ) {
         if( n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_StoreCM ) {
           // Note: Required edges with an index greater than oper_input_base
           // are not supported by the allocator.