Mercurial > hg > truffle

diff src/share/vm/opto/chaitin.cpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 2aff40cb4703
children 8373c19be854
line wrap: on
line diff
--- a/src/share/vm/opto/chaitin.cpp	Fri Dec 14 10:20:54 2012 +0100
+++ b/src/share/vm/opto/chaitin.cpp	Fri Dec 14 14:35:13 2012 +0100
@@ -1495,7 +1495,7 @@
             cisc->ins_req(1,src);         // Requires a memory edge
           }
           b->_nodes.map(j,cisc);          // Insert into basic block
-          n->subsume_by(cisc); // Correct graph
+          n->subsume_by(cisc, C); // Correct graph
           //
           ++_used_cisc_instructions;
 #ifndef PRODUCT