Mercurial > hg > graal-compiler
comparison src/share/vm/opto/chaitin.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | 2aff40cb4703 |
children | 8373c19be854 |
comparison
equal
deleted
inserted
replaced
7191:816b7e5bf2ed | 7206:d2f8c38e543d |
---|---|
1493 if( cisc->oper_input_base() > 1 && mach->oper_input_base() <= 1 ) { | 1493 if( cisc->oper_input_base() > 1 && mach->oper_input_base() <= 1 ) { |
1494 assert( cisc->oper_input_base() == 2, "Only adding one edge"); | 1494 assert( cisc->oper_input_base() == 2, "Only adding one edge"); |
1495 cisc->ins_req(1,src); // Requires a memory edge | 1495 cisc->ins_req(1,src); // Requires a memory edge |
1496 } | 1496 } |
1497 b->_nodes.map(j,cisc); // Insert into basic block | 1497 b->_nodes.map(j,cisc); // Insert into basic block |
1498 n->subsume_by(cisc); // Correct graph | 1498 n->subsume_by(cisc, C); // Correct graph |
1499 // | 1499 // |
1500 ++_used_cisc_instructions; | 1500 ++_used_cisc_instructions; |
1501 #ifndef PRODUCT | 1501 #ifndef PRODUCT |
1502 if( TraceCISCSpill ) { | 1502 if( TraceCISCSpill ) { |
1503 tty->print(" cisc-instr: "); | 1503 tty->print(" cisc-instr: "); |