From 62054826d85525f299300daf811611184a90b7bf Mon Sep 17 00:00:00 2001
From: "bmeurer@chromium.org"
 <bmeurer@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 14 Mar 2014 12:05:01 +0000
Subject: [PATCH] Revert "Really skip dead blocks in GVN"

This reverts commit r19779 for breaking the GVN algorithm.

BUG=352149
LOG=y
R=hpayer@chromium.org

Review URL: https://codereview.chromium.org/200223004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19932 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/hydrogen-gvn.cc | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/hydrogen-gvn.cc b/src/hydrogen-gvn.cc
index 827ad27..4c98015 100644
--- a/src/hydrogen-gvn.cc
+++ b/src/hydrogen-gvn.cc
@@ -592,9 +592,7 @@ void HGlobalValueNumberingPhase::LoopInvariantCodeMotion() {
               graph()->use_optimistic_licm() ? "yes" : "no");
   for (int i = graph()->blocks()->length() - 1; i >= 0; --i) {
     HBasicBlock* block = graph()->blocks()->at(i);
-    if (block->IsLoopHeader() &&
-        block->IsReachable() &&
-        !block->IsDeoptimizing()) {
+    if (block->IsLoopHeader()) {
       SideEffects side_effects = loop_side_effects_[block->block_id()];
       if (FLAG_trace_gvn) {
         HeapStringAllocator allocator;
@@ -618,7 +616,6 @@ void HGlobalValueNumberingPhase::ProcessLoopBlock(
     HBasicBlock* block,
     HBasicBlock* loop_header,
     SideEffects loop_kills) {
-  if (!block->IsReachable() || block->IsDeoptimizing()) return;
   HBasicBlock* pre_header = loop_header->predecessors()->at(0);
   if (FLAG_trace_gvn) {
     HeapStringAllocator allocator;
@@ -683,8 +680,10 @@ bool HGlobalValueNumberingPhase::AllowCodeMotion() {
 
 bool HGlobalValueNumberingPhase::ShouldMove(HInstruction* instr,
                                             HBasicBlock* loop_header) {
-  // If we've disabled code motion, don't move any instructions.
-  return AllowCodeMotion();
+  // If we've disabled code motion or we're in a block that unconditionally
+  // deoptimizes, don't move any instructions.
+  return AllowCodeMotion() && !instr->block()->IsDeoptimizing() &&
+      instr->block()->IsReachable();
 }
 
 
@@ -777,18 +776,20 @@ class GvnBasicBlockState: public ZoneObject {
   }
 
   GvnBasicBlockState* next_dominated(Zone* zone) {
-    while (++dominated_index_ < length_) {
-      HBasicBlock* block = block_->dominated_blocks()->at(dominated_index_);
-      if (block->IsReachable()) {
-        if (dominated_index_ == length_ - 1) {
-          // No need to copy the map for the last child in the dominator tree.
-          Initialize(block, map(), dominators(), false, zone);
-          return this;
-        }
-        return push(zone, block);
-      }
+    dominated_index_++;
+    if (dominated_index_ == length_ - 1) {
+      // No need to copy the map for the last child in the dominator tree.
+      Initialize(block_->dominated_blocks()->at(dominated_index_),
+                 map(),
+                 dominators(),
+                 false,
+                 zone);
+      return this;
+    } else if (dominated_index_ < length_) {
+      return push(zone, block_->dominated_blocks()->at(dominated_index_));
+    } else {
+      return NULL;
     }
-    return NULL;
   }
 
   GvnBasicBlockState* push(Zone* zone, HBasicBlock* block) {
-- 
2.7.4