Fix the ScopeIterator reimplemantation.

src/runtime.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 11216 matching lines @@
     // Reparse the code and analyze the scopes.
     ZoneScope zone_scope(isolate, DELETE_ON_EXIT);
     Handle<Script> script(Script::cast(shared_info->script()));
     Scope* scope;
 
     // Check whether we are in global, eval or function code.
     Handle<ScopeInfo> scope_info(shared_info->scope_info());
     if (scope_info->Type() != FUNCTION_SCOPE) {
       // Global or eval code.
       CompilationInfo info(script);
+      ScriptDataImpl* pre_data = NULL;
+      int flags = kNoParsingFlags;
+      if (info.is_native() || FLAG_allow_natives_syntax) {
+        flags |= kAllowNativesSyntax;
+      }
+      if (!info.is_native() && FLAG_harmony_scoping){
+        flags |= kHarmonyScoping;
+      }
       if (scope_info->Type() == GLOBAL_SCOPE) {
+        Handle<String> source(String::cast(script->source()));
+        pre_data = ParserApi::PartialPreParse(source, NULL, flags);

[Lasse Reichstein, 2011/11/18 14:12:52]

Why preparse? Is it for speed?

Maybe only do it if the source is larger than 1K, as we do in the normal
parsing.

[Steven, 2011/11/18 16:53:19]

Initially this was only for mimicking the behaviour of the initial parse. But
indeed we don't have the information anymore if the browser provided preparse
data. I can leave it in for speed but also delete it.

I rewrote this part, so that it simply does not provide information about stack
allocated variables when reparsing fails and refrains from crashing in release
mode.

On 2011/11/18 14:12:52, Lasse Reichstein wrote:

         info.MarkAsGlobal();
+        info.SetPreParseData(pre_data);
       } else {
         ASSERT(scope_info->Type() == EVAL_SCOPE);
         info.MarkAsEval();
         info.SetCallingContext(Handle<Context>(function_->context()));
       }
       CHECK(ParserApi::Parse(&info));
       CHECK(Scope::Analyze(&info));
       scope = info.function()->scope();
+      // Delete preparse data again.
+      if (pre_data != NULL) {
+        delete pre_data;
+      }
     } else {
       // Function code
       CompilationInfo info(shared_info);
       CHECK(ParserApi::Parse(&info));
       CHECK(Scope::Analyze(&info));
       scope = info.function()->scope();
     }
 
     // Retrieve the scope chain for the current position.
     int source_position = shared_info->code()->SourcePosition(frame_->pc());
@@ skipping 2280 matching lines @@
   } else {
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     isolate->counters()->gc_last_resort_from_js()->Increment();
     isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags);
   }
 }
 
 
 } }  // namespace v8::internal