Mercurial > hg > graal-compiler
diff src/share/vm/opto/chaitin.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | 2aff40cb4703 |
children | 8373c19be854 |
line wrap: on
line diff
--- a/src/share/vm/opto/chaitin.cpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/share/vm/opto/chaitin.cpp Fri Dec 07 01:09:03 2012 -0800 @@ -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