| Index: src/compiler/register-allocator.h
|
| diff --git a/src/compiler/register-allocator.h b/src/compiler/register-allocator.h
|
| index 45c33712de70bb3cc3e64d4988238e6bf736d336..91a1ab2e8a1a83056789af0edc78bda8fa97806f 100644
|
| --- a/src/compiler/register-allocator.h
|
| +++ b/src/compiler/register-allocator.h
|
| @@ -341,25 +341,21 @@ class RegisterAllocator FINAL : public ZoneObject {
|
| // Phase 1 : insert moves to account for fixed register operands.
|
| void MeetRegisterConstraints();
|
|
|
| - // Phase 2: deconstruct SSA by inserting moves in successors and the headers
|
| - // of blocks containing phis.
|
| - void ResolvePhis();
|
| -
|
| - // Phase 3: compute liveness of all virtual register.
|
| + // Phase 2: compute liveness of all virtual register.
|
| void BuildLiveRanges();
|
| bool ExistsUseWithoutDefinition();
|
|
|
| - // Phase 4: compute register assignments.
|
| + // Phase 3: compute register assignments.
|
| void AllocateGeneralRegisters();
|
| void AllocateDoubleRegisters();
|
|
|
| - // Phase 5: compute values for pointer maps.
|
| + // Phase 4: compute values for pointer maps.
|
| void PopulatePointerMaps(); // TODO(titzer): rename to PopulateReferenceMaps.
|
|
|
| - // Phase 6: reconnect split ranges with moves.
|
| + // Phase 5: reconnect split ranges with moves.
|
| void ConnectRanges();
|
|
|
| - // Phase 7: insert moves to connect ranges across basic blocks.
|
| + // Phase 6: insert moves to connect ranges across basic blocks.
|
| void ResolveControlFlow();
|
|
|
| private:
|
| @@ -407,7 +403,7 @@ class RegisterAllocator FINAL : public ZoneObject {
|
| int gap_index);
|
| void MeetRegisterConstraintsForLastInstructionInBlock(
|
| const InstructionBlock* block);
|
| - void ResolvePhis(const InstructionBlock* block);
|
| + void ProcessPhis(const InstructionBlock* block);
|
|
|
| // Helper methods for building intervals.
|
| InstructionOperand* AllocateFixed(UnallocatedOperand* operand, int pos,
|
|
|