Mercurial > hg > graal-compiler

diff src/share/vm/opto/output.cpp @ 7206:d2f8c38e543d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents 2aff40cb4703
children 291ffc492eb6 f15df3af32c5
line wrap: on
line diff
--- a/src/share/vm/opto/output.cpp	Fri Nov 30 17:00:32 2012 -0800
+++ b/src/share/vm/opto/output.cpp	Fri Dec 07 01:09:03 2012 -0800
@@ -513,7 +513,7 @@
           }
           adjust_block_start += diff;
           b->_nodes.map(idx, replacement);
-          mach->subsume_by(replacement);
+          mach->subsume_by(replacement, C);
           mach = replacement;
           progress = true;
 
@@ -1425,7 +1425,7 @@
               jmp_rule[i]   = mach->rule();
 #endif
               b->_nodes.map(j, replacement);
-              mach->subsume_by(replacement);
+              mach->subsume_by(replacement, C);
               n    = replacement;
               mach = replacement;
             }