Revert r7665.

src/x64/lithium-x64.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 115 matching lines @@
 template<typename T, int N>
 void OperandContainer<T, N>::PrintOperandsTo(StringStream* stream) {
   for (int i = 0; i < N; i++) {
     if (i > 0) stream->Add(" ");
     elems_[i]->PrintTo(stream);
   }
 }
 
 
 void LLabel::PrintDataTo(StringStream* stream) {
+  LGap::PrintDataTo(stream);
   LLabel* rep = replacement();
   if (rep != NULL) {
     stream->Add(" Dead block replaced with B%d", rep->block_id());
   }
 }
 
 
 bool LGap::IsRedundant() const {
   for (int i = 0; i < 4; i++) {
     if (parallel_moves_[i] != NULL && !parallel_moves_[i]->IsRedundant()) {
       return false;
     }
   }
+
   return true;
 }
 
 
 void LGap::PrintDataTo(StringStream* stream) {
   for (int i = 0; i < 4; i++) {
     stream->Add("(");
     if (parallel_moves_[i] != NULL) {
       parallel_moves_[i]->PrintDataTo(stream);
     }
@@ skipping 219 matching lines @@
     HBasicBlock* block = graph()->blocks()->at(i);
     int first = block->first_instruction_index();
     int last = block->last_instruction_index();
     LInstruction* first_instr = instructions()->at(first);
     LInstruction* last_instr = instructions()->at(last);
 
     LLabel* label = LLabel::cast(first_instr);
     if (last_instr->IsGoto()) {
       LGoto* goto_instr = LGoto::cast(last_instr);
       if (!goto_instr->include_stack_check() &&
+          label->IsRedundant() &&
           !label->is_loop_header()) {
         bool can_eliminate = true;
         for (int i = first + 1; i < last && can_eliminate; ++i) {
           LInstruction* cur = instructions()->at(i);
           if (cur->IsGap()) {
             LGap* gap = LGap::cast(cur);
             if (!gap->IsRedundant()) {
               can_eliminate = false;
             }
           } else {
@@ skipping 1727 matching lines @@
 
 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) {
   HEnvironment* outer = current_block_->last_environment()->outer();
   current_block_->UpdateEnvironment(outer);
   return NULL;
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64