Lazily generate local var descriptors.

runtime/vm/compiler.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 872 matching lines @@
     for (intptr_t i = 0; i < stackmap_table.Length(); ++i) {
       map ^= stackmap_table.At(i);
       ISL_Print("%s\n", map.ToCString());
     }
   }
   ISL_Print("}\n");
 
   ISL_Print("Variable Descriptors for function '%s' {\n",
             function_fullname);
   const LocalVarDescriptors& var_descriptors =
-      LocalVarDescriptors::Handle(code.var_descriptors());
+      LocalVarDescriptors::Handle(code.GetLocalVarDescriptors());
   intptr_t var_desc_length =
       var_descriptors.IsNull() ? 0 : var_descriptors.Length();
   String& var_name = String::Handle();
   for (intptr_t i = 0; i < var_desc_length; i++) {
     var_name = var_descriptors.GetName(i);
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors.GetInfo(i, &var_info);
     const int8_t kind = var_info.kind();
     if (kind == RawLocalVarDescriptors::kSavedCurrentContext) {
       ISL_Print("  saved current CTX reg offset %d\n", var_info.index());
@@ skipping 218 matching lines @@
     // We got an error during compilation.
     error = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
     return error.raw();
   }
   UNREACHABLE();
   return Error::null();
 }
 
 
+void Compiler::ComputeLocalVarDescriptors(const Code& code) {

[hausner, 2015/05/06 16:39:54]

This code is now duplicated (also present in the
FlowGraphCompiler::FinalizeVarDescriptors). Could this be factored out?

[srdjan, 2015/05/06 20:00:47]

Removed it from here; FlowGraphCompiler::FinalizeVarDescriptors should go away
once the transition to lazy local var descriptors has completed.

+  ASSERT(!code.is_optimized());
+  const Function& function = Function::Handle(code.function());
+  ParsedFunction* parsed_function = new ParsedFunction(
+      Thread::Current(), Function::ZoneHandle(function.raw()));
+  LocalVarDescriptors& var_descs = LocalVarDescriptors::Handle();
+  if (function.IsIrregexpFunction()) {
+    UNREACHABLE();  // Special parsing needed, not yet implemented.
+    var_descs = LocalVarDescriptors::New(1);

[hausner, 2015/05/06 16:39:54]

Should the code after UNREACHABLE() remain?

[srdjan, 2015/05/06 20:00:47]

Removed, will add it back once functionality implemented.

+    RawLocalVarDescriptors::VarInfo info;
+    info.set_kind(RawLocalVarDescriptors::kSavedCurrentContext);
+    info.scope_id = 0;
+    info.begin_pos = 0;
+    info.end_pos = 0;
+    info.set_index(parsed_function->current_context_var()->index());
+    var_descs.SetVar(0, Symbols::CurrentContextVar(), &info);
+  } else {
+    Parser::ParseFunction(parsed_function);
+    parsed_function->AllocateVariables();
+    var_descs =
+        parsed_function->node_sequence()->scope()->GetVarDescriptors(
+            parsed_function->function());

[hausner, 2015/05/06 16:39:54]

Could you not use function here instead of parsed_function->function()?

[srdjan, 2015/05/06 20:00:47]

Done.

+  }
+  code.set_var_descriptors(var_descs);
+}
+
+
 RawError* Compiler::CompileAllFunctions(const Class& cls) {
   Thread* thread = Thread::Current();
   Zone* zone = thread->zone();
   Error& error = Error::Handle(zone);
   Array& functions = Array::Handle(zone, cls.functions());
   Function& func = Function::Handle(zone);
   // Class dynamic lives in the vm isolate. Its array fields cannot be set to
   // an empty array.
   if (functions.IsNull()) {
     ASSERT(cls.IsDynamicClass());
@@ skipping 131 matching lines @@
     const Object& result =
       PassiveObject::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart