| Index: src/hydrogen-dce.cc
|
| diff --git a/src/hydrogen-dce.cc b/src/hydrogen-dce.cc
|
| index 0e7253d5a4869d44ee137129bd4c037eb8774dfd..d665340b0bed3d6c56eeb47f79a3bfb9b24866eb 100644
|
| --- a/src/hydrogen-dce.cc
|
| +++ b/src/hydrogen-dce.cc
|
| @@ -31,56 +31,60 @@
|
| namespace v8 {
|
| namespace internal {
|
|
|
| -bool HDeadCodeEliminationPhase::MarkLive(HValue* ref, HValue* instr) {
|
| - if (instr->CheckFlag(HValue::kIsLive)) return false;
|
| - instr->SetFlag(HValue::kIsLive);
|
| -
|
| - if (FLAG_trace_dead_code_elimination) {
|
| - HeapStringAllocator allocator;
|
| - StringStream stream(&allocator);
|
| - if (ref != NULL) {
|
| - ref->PrintTo(&stream);
|
| - } else {
|
| - stream.Add("root ");
|
| +void HDeadCodeEliminationPhase::MarkLive(
|
| + HValue* instr, ZoneList<HValue*>* worklist) {
|
| + if (instr->CheckFlag(HValue::kIsLive)) return; // Already live.
|
| +
|
| + if (FLAG_trace_dead_code_elimination) PrintLive(NULL, instr);
|
| +
|
| + // Transitively mark all inputs of live instructions live.
|
| + worklist->Add(instr, zone());
|
| + while (!worklist->is_empty()) {
|
| + HValue* instr = worklist->RemoveLast();
|
| + instr->SetFlag(HValue::kIsLive);
|
| + for (int i = 0; i < instr->OperandCount(); ++i) {
|
| + HValue* input = instr->OperandAt(i);
|
| + if (!input->CheckFlag(HValue::kIsLive)) {
|
| + input->SetFlag(HValue::kIsLive);
|
| + worklist->Add(input, zone());
|
| + if (FLAG_trace_dead_code_elimination) PrintLive(instr, input);
|
| + }
|
| }
|
| - stream.Add(" -> ");
|
| - instr->PrintTo(&stream);
|
| - PrintF("[MarkLive %s]\n", *stream.ToCString());
|
| }
|
| +}
|
| +
|
|
|
| - return true;
|
| +void HDeadCodeEliminationPhase::PrintLive(HValue* ref, HValue* instr) {
|
| + HeapStringAllocator allocator;
|
| + StringStream stream(&allocator);
|
| + if (ref != NULL) {
|
| + ref->PrintTo(&stream);
|
| + } else {
|
| + stream.Add("root ");
|
| + }
|
| + stream.Add(" -> ");
|
| + instr->PrintTo(&stream);
|
| + PrintF("[MarkLive %s]\n", *stream.ToCString());
|
| }
|
|
|
|
|
| void HDeadCodeEliminationPhase::MarkLiveInstructions() {
|
| ZoneList<HValue*> worklist(graph()->blocks()->length(), zone());
|
|
|
| - // Mark initial root instructions for dead code elimination.
|
| + // Transitively mark all live instructions, starting from roots.
|
| for (int i = 0; i < graph()->blocks()->length(); ++i) {
|
| HBasicBlock* block = graph()->blocks()->at(i);
|
| for (HInstructionIterator it(block); !it.Done(); it.Advance()) {
|
| HInstruction* instr = it.Current();
|
| - if (instr->CannotBeEliminated() && MarkLive(NULL, instr)) {
|
| - worklist.Add(instr, zone());
|
| - }
|
| + if (instr->CannotBeEliminated()) MarkLive(instr, &worklist);
|
| }
|
| for (int j = 0; j < block->phis()->length(); j++) {
|
| HPhi* phi = block->phis()->at(j);
|
| - if (phi->CannotBeEliminated() && MarkLive(NULL, phi)) {
|
| - worklist.Add(phi, zone());
|
| - }
|
| + if (phi->CannotBeEliminated()) MarkLive(phi, &worklist);
|
| }
|
| }
|
|
|
| - // Transitively mark all inputs of live instructions live.
|
| - while (!worklist.is_empty()) {
|
| - HValue* instr = worklist.RemoveLast();
|
| - for (int i = 0; i < instr->OperandCount(); ++i) {
|
| - if (MarkLive(instr, instr->OperandAt(i))) {
|
| - worklist.Add(instr->OperandAt(i), zone());
|
| - }
|
| - }
|
| - }
|
| + ASSERT(worklist.is_empty()); // Should have processed everything.
|
| }
|
|
|
|
|
|
|