Rescope arrow-function parameter lists by moving the delta to the parameter scope

src/ast/scopes.cc

Index: src/ast/scopes.cc
diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
index 2f42e3ff884c019c3b45e365f610cb92c46d4e7b..1caa8d95170dc4d3ea18a53c8434c98108c6f065 100644
--- a/src/ast/scopes.cc
+++ b/src/ast/scopes.cc
@@ -367,6 +367,52 @@ Scope* Scope::FinalizeBlockScope() {
   return NULL;
 }
 
+void Scope::Snapshot::Reparent(Scope* new_parent) const {
+  DCHECK_EQ(new_parent, outer_scope_->inner_scope_);
+  DCHECK_EQ(new_parent->outer_scope_, outer_scope_);
+  DCHECK_EQ(new_parent, new_parent->ClosureScope());
+  DCHECK_NULL(new_parent->inner_scope_);
+  DCHECK_NULL(new_parent->unresolved_);
+  DCHECK_EQ(0, new_parent->temps_.length());
+  Scope* inner_scope = new_parent->sibling_;
+  if (inner_scope != top_inner_scope_) {
+    for (; inner_scope->sibling() != top_inner_scope_;
+         inner_scope = inner_scope->sibling()) {
+      inner_scope->outer_scope_ = new_parent;
+      DCHECK_NE(inner_scope, new_parent);
+    }
+    inner_scope->outer_scope_ = new_parent;
+
+    new_parent->inner_scope_ = new_parent->sibling_;
+    inner_scope->sibling_ = nullptr;
+    // Reset the sibling rather than the inner_scope_ since we
+    // want to keep new_parent there.
+    DCHECK_EQ(new_parent, outer_scope_->inner_scope_);

[nickie, 2016/07/22 09:05:31]

I'm not sure why we check this again.  It's checked in line 371.  Do we fear
that outer_scope_->inner_scope_ will have changed since then?  That could only
have happened if new_parent_ == outer_scope_, which is rather impossible, but if
we're afraid it may happen, I suggest checking that directly.

[adamk, 2016/07/22 23:04:34]

I agree that there's no need to check this again, removed.

+    new_parent->sibling_ = top_inner_scope_;
+  }
+
+  if (outer_scope_->unresolved_ != top_unresolved_) {
+    VariableProxy* last = outer_scope_->unresolved_;
+    while (last->next_unresolved() != top_unresolved_) {
+      last = last->next_unresolved();
+    }
+    last->set_next_unresolved(nullptr);
+    new_parent->unresolved_ = outer_scope_->unresolved_;
+    outer_scope_->unresolved_ = top_unresolved_;
+  }
+
+  if (outer_scope_->ClosureScope()->temps_.length() != top_temp_) {
+    ZoneList<Variable*>* temps = &outer_scope_->ClosureScope()->temps_;
+    for (int i = top_temp_; i < temps->length(); i++) {
+      Variable* temp = temps->at(i);
+      DCHECK_EQ(temp->scope(), temp->scope()->ClosureScope());
+      DCHECK_NE(temp->scope(), new_parent);
+      temp->set_scope(new_parent);
+      new_parent->AddTemporary(temp);
+    }
+    temps->Rewind(top_temp_);
+  }
+}
 
 void Scope::ReplaceOuterScope(Scope* outer) {
   DCHECK_NOT_NULL(outer);