Mercurial > hg > truffle
diff src/share/vm/opto/output.cpp @ 7212:291ffc492eb6
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 | e522a00b91aa 2aff40cb4703 |
| children | f78ac2ce44ef |
line wrap: on
line diff
--- a/src/share/vm/opto/output.cpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/share/vm/opto/output.cpp Fri Dec 14 14:35:13 2012 +0100 @@ -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; @@ -1428,7 +1428,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; }