Mercurial > hg > truffle
changeset 12873:4e7f99b70d9d
Merge
author | adlertz |
---|---|
date | Wed, 09 Oct 2013 05:03:34 -0700 |
parents | 98692a2d36d7 (diff) 6171eb9da4fd (current diff) |
children | 46ef27bcacb3 |
files | test/testlibrary/AssertsTest.java test/testlibrary/OutputAnalyzerReportingTest.java test/testlibrary/OutputAnalyzerTest.java |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/reg_split.cpp Tue Oct 08 19:57:28 2013 -0700 +++ b/src/share/vm/opto/reg_split.cpp Wed Oct 09 05:03:34 2013 -0700 @@ -375,6 +375,7 @@ } if (lidx < _lrg_map.max_lrg_id() && lrgs(lidx).reg() >= LRG::SPILL_REG) { + assert(Reachblock != NULL, "Reachblock must be non-NULL"); Node *rdef = Reachblock[lrg2reach[lidx]]; if (rdef) { spill->set_req(i, rdef); @@ -1336,7 +1337,8 @@ _lrg_map.find(pred->get_node(insert - 1)) >= lrgs_before_phi_split) { insert--; } - def = split_Rematerialize(def, pred, insert, maxlrg, splits, slidx, lrg2reach, Reachblock, false); + // since the def cannot contain any live range input, we can pass in NULL as Reachlock parameter + def = split_Rematerialize(def, pred, insert, maxlrg, splits, slidx, lrg2reach, NULL, false); if (!def) { return 0; // Bail out }