Try to fix cross-script global scope

src/scopes.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/scopes.h"
 
 #include "src/accessors.h"
 #include "src/bootstrapper.h"
@@ skipping 252 matching lines @@
   ASSERT(info->function() != NULL);
   Scope* scope = info->function()->scope();
   Scope* top = scope;
 
   // Traverse the scope tree up to the first unresolved scope or the global
   // scope and start scope resolution and variable allocation from that scope.
   while (!top->is_global_scope() &&
          !top->outer_scope()->already_resolved()) {
     top = top->outer_scope();
   }
+  // TODO(rossberg): remove the above.
+  top = info->global_scope();
+  ASSERT(top->is_global_scope());
 
   // Allocate the variables.
   {
     // Passing NULL as AstValueFactory is ok, because AllocateVariables doesn't
     // need to create new strings or values.
     AstNodeFactory<AstNullVisitor> ast_node_factory(info->zone(), NULL);
     if (!top->AllocateVariables(info, &ast_node_factory)) return false;
   }
 
 #ifdef DEBUG
@@ skipping 483 matching lines @@
 }
 
 
 #ifdef DEBUG
 static const char* Header(ScopeType scope_type) {
   switch (scope_type) {
     case EVAL_SCOPE: return "eval";
     case FUNCTION_SCOPE: return "function";
     case MODULE_SCOPE: return "module";
     case GLOBAL_SCOPE: return "global";
+    case SCRIPT_SCOPE: return "script";
     case CATCH_SCOPE: return "catch";
     case BLOCK_SCOPE: return "block";
     case WITH_SCOPE: return "with";
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 static void Indent(int n, const char* str) {
@@ skipping 430 matching lines @@
     if (params_[i]->name().is_identical_to(
             isolate_->factory()->arguments_string())) {
       return true;
     }
   }
   return false;
 }
 
 
 void Scope::AllocateStackSlot(Variable* var) {
+  ASSERT(var->scope() == this);
   var->AllocateTo(Variable::LOCAL, num_stack_slots_++);
 }
 
 
 void Scope::AllocateHeapSlot(Variable* var) {
+printf("[AllocateHeapSlot] scope=%p %s var=%.*s\n", (void*)this, Variable::Mode2String(var->mode()), var->raw_name()->length(), var->raw_name()->raw_data());
+if (var->mode() == LET) base::OS::DebugBreak();
+  ASSERT(var->scope() == this);
   var->AllocateTo(Variable::CONTEXT, num_heap_slots_++);
 }
 
 
 void Scope::AllocateParameterLocals() {
   ASSERT(is_function_scope());
   Variable* arguments = LookupLocal(ast_value_factory_->arguments_string());
   ASSERT(arguments != NULL);  // functions have 'arguments' declared implicitly
 
   bool uses_sloppy_arguments = false;
@@ skipping 153 matching lines @@
 }
 
 
 int Scope::ContextLocalCount() const {
   if (num_heap_slots() == 0) return 0;
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS -
       (function_ != NULL && function_->proxy()->var()->IsContextSlot() ? 1 : 0);
 }
 
 } }  // namespace v8::internal