Verify that no-side-effects scope does not add unsafe phis and does not change push-pop balance of …

src/hydrogen.h

Index: src/hydrogen.h
diff --git a/src/hydrogen.h b/src/hydrogen.h
index a95424a1c9e455ffa4a9664770844aee75b28b7d..68fde0762203a79a33f3923e9fca3aaf90056f66 100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -934,6 +934,7 @@ class HGraphBuilder {
       : info_(info),
         graph_(NULL),
         current_block_(NULL),
+        no_side_effects_scope_environment_push_pop_delta_(0),

[danno, 2013/05/08 16:24:27]

This is a bit long :-)
How about just no_side_effects_scope_env_delta_

[ulan, 2013/05/10 08:40:43]

Done.

         no_side_effects_scope_count_(0) {}
   virtual ~HGraphBuilder() {}
 
@@ -965,11 +966,31 @@ class HGraphBuilder {
   HReturn* AddReturn(HValue* value);
 
   void IncrementInNoSideEffectsScope() {
+    if (no_side_effects_scope_count_ == 0) {
+      no_side_effects_scope_environment_push_pop_delta_ =
+          environment()->push_count() - environment()->pop_count();
+    }
     no_side_effects_scope_count_++;
   }
 
   void DecrementInNoSideEffectsScope() {
     no_side_effects_scope_count_--;
+    if (no_side_effects_scope_count_ == 0) {
+      // No-side-effects scope should not change push-pop delta.
+      ASSERT_EQ(no_side_effects_scope_environment_push_pop_delta_,
+                environment()->push_count() - environment()->pop_count());
+      no_side_effects_scope_environment_push_pop_delta_ = 0;
+    }
+  }
+
+  bool SafeToAddPhiInNoSideEffectsScope() {
+    // Pops and pushes after a simulate are not visible in LChunkBuilder.
+    // If the number of pops is greater than the number pushes then the
+    // environment in HGraphBuilder is shorter then the corresponding
+    // environment in LChunkBuilder. This causes non-observable phis
+    // to be pushed in the environment, which breaks deoptimization.
+    return no_side_effects_scope_count_ == 0 ||
+           no_side_effects_scope_environment_push_pop_delta_ >= 0;
   }
 
  protected:
@@ -1332,6 +1353,7 @@ class HGraphBuilder {
   CompilationInfo* info_;
   HGraph* graph_;
   HBasicBlock* current_block_;
+  int no_side_effects_scope_environment_push_pop_delta_;
   int no_side_effects_scope_count_;
 };