Mercurial > hg > truffle
diff src/share/vm/runtime/vmStructs.cpp @ 12079:4dece0730c50
Merge
| author | rbackman |
|---|---|
| date | Thu, 22 Aug 2013 18:37:14 +0200 |
| parents | e22ee8e7ae62 adb9a7d94cb5 |
| children | 69f26e8e09f9 e2722a66aba7 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp Tue Aug 20 13:47:40 2013 -0700 +++ b/src/share/vm/runtime/vmStructs.cpp Thu Aug 22 18:37:14 2013 +0200 @@ -1096,10 +1096,10 @@ \ c2_nonstatic_field(MachCallRuntimeNode, _name, const char*) \ \ - c2_nonstatic_field(PhaseCFG, _num_blocks, uint) \ + c2_nonstatic_field(PhaseCFG, _number_of_blocks, uint) \ c2_nonstatic_field(PhaseCFG, _blocks, Block_List) \ c2_nonstatic_field(PhaseCFG, _node_to_block_mapping, Block_Array) \ - c2_nonstatic_field(PhaseCFG, _broot, Block*) \ + c2_nonstatic_field(PhaseCFG, _root_block, Block*) \ \ c2_nonstatic_field(PhaseRegAlloc, _node_regs, OptoRegPair*) \ c2_nonstatic_field(PhaseRegAlloc, _node_regs_max_index, uint) \