Mercurial > hg > graal-compiler
changeset 14231:303c352ba1a8
8029446: assert(_cfg.get_block_for_node(proj) == borig) failed: incorrect block for kill projections
Summary: Added loadConP0 projection node to block in case of re-materialization of the loadConP0. x86_64 only.
Reviewed-by: kvn
| author | adlertz |
|---|---|
| date | Wed, 08 Jan 2014 12:05:19 +0100 |
| parents | b9b6934ad75c |
| children | 183bd5c00828 |
| files | src/share/vm/opto/chaitin.cpp |
| diffstat | 1 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/chaitin.cpp Wed Jan 08 09:49:31 2014 +0100 +++ b/src/share/vm/opto/chaitin.cpp Wed Jan 08 12:05:19 2014 +0100 @@ -1682,9 +1682,21 @@ // (where top() node is placed). base->init_req(0, _cfg.get_root_node()); Block *startb = _cfg.get_block_for_node(C->top()); - startb->insert_node(base, startb->find_node(C->top())); + uint node_pos = startb->find_node(C->top()); + startb->insert_node(base, node_pos); _cfg.map_node_to_block(base, startb); assert(_lrg_map.live_range_id(base) == 0, "should not have LRG yet"); + + // The loadConP0 might have projection nodes depending on architecture + // Add the projection nodes to the CFG + for (DUIterator_Fast imax, i = base->fast_outs(imax); i < imax; i++) { + Node* use = base->fast_out(i); + if (use->is_MachProj()) { + startb->insert_node(use, ++node_pos); + _cfg.map_node_to_block(use, startb); + new_lrg(use, maxlrg++); + } + } } if (_lrg_map.live_range_id(base) == 0) { new_lrg(base, maxlrg++);