Mercurial > hg > graal-compiler

comparison src/share/vm/opto/output.cpp @ 7206:d2f8c38e543d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents 2aff40cb4703
children 291ffc492eb6 f15df3af32c5
comparison
equal deleted inserted replaced
7191:816b7e5bf2ed 7206:d2f8c38e543d
511 jmp_offset[i] += nop_size; 511 jmp_offset[i] += nop_size;
512 diff -= nop_size; 512 diff -= nop_size;
513 } 513 }
514 adjust_block_start += diff; 514 adjust_block_start += diff;
515 b->_nodes.map(idx, replacement); 515 b->_nodes.map(idx, replacement);
516 mach->subsume_by(replacement); 516 mach->subsume_by(replacement, C);
517 mach = replacement; 517 mach = replacement;
518 progress = true; 518 progress = true;
519 519
520 jmp_size[i] = new_size; 520 jmp_size[i] = new_size;
521 DEBUG_ONLY( jmp_target[i] = bnum; ); 521 DEBUG_ONLY( jmp_target[i] = bnum; );
1423 jmp_offset[i] = current_offset - blk_offset; 1423 jmp_offset[i] = current_offset - blk_offset;
1424 jmp_size[i] = new_size; 1424 jmp_size[i] = new_size;
1425 jmp_rule[i] = mach->rule(); 1425 jmp_rule[i] = mach->rule();
1426 #endif 1426 #endif
1427 b->_nodes.map(j, replacement); 1427 b->_nodes.map(j, replacement);
1428 mach->subsume_by(replacement); 1428 mach->subsume_by(replacement, C);
1429 n = replacement; 1429 n = replacement;
1430 mach = replacement; 1430 mach = replacement;
1431 } 1431 }
1432 } 1432 }
1433 mach->as_MachBranch()->label_set( &blk_labels[block_num], block_num ); 1433 mach->as_MachBranch()->label_set( &blk_labels[block_num], block_num );