First steps toward a two stages new compiler.

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
@@ skipping 1164 matching lines @@
                                                 values,
                                                 element_type);
   ReturnComputation(create);
 }
 
 
 void EffectGraphVisitor::VisitClosureNode(ClosureNode* node) {
   const Function& function = node->function();
 
   if (function.IsNonImplicitClosureFunction()) {
-    const ContextScope& context_scope = ContextScope::ZoneHandle(
-        node->scope()->PreserveOuterScope(owner()->context_level()));
-    ASSERT(!function.HasCode());
-    ASSERT(function.context_scope() == ContextScope::null());
-    function.set_context_scope(context_scope);
+    // The context scope may have already been set by the new non-optimizing

[regis, 2012/05/08 16:07:32]

I would drop "new".

[srdjan, 2012/05/08 16:16:03]

Done in next CL.

+    // compiler.  If it was not, set it here.
+    if (function.context_scope() == ContextScope::null()) {
+      const ContextScope& context_scope = ContextScope::ZoneHandle(
+          node->scope()->PreserveOuterScope(owner()->context_level()));
+      ASSERT(!function.HasCode());
+      ASSERT(function.context_scope() == ContextScope::null());
+      function.set_context_scope(context_scope);
+    }
   } else if (function.IsImplicitInstanceClosureFunction()) {
     ValueGraphVisitor for_receiver(owner(), temp_index());
     node->receiver()->Visit(&for_receiver);
     Append(for_receiver);
   }
   ASSERT(function.context_scope() != ContextScope::null());
 
   // The function type of a closure may have type arguments. In that case, pass
   // the type arguments of the instantiator.
   const Class& cls = Class::Handle(function.signature_class());
@@ skipping 1240 matching lines @@
 
 void FlowGraphPrinter::VisitBranch(BranchInstr* instr) {
   OS::Print("    if ");
   instr->value()->Accept(this);
   OS::Print(" goto(%d, %d)",
             reverse_index(instr->true_successor()->postorder_number()),
             reverse_index(instr->false_successor()->postorder_number()));
 }
 
 
-void FlowGraphBuilder::BuildGraph() {
+void FlowGraphBuilder::BuildGraph(bool for_optimized) {
   if (FLAG_print_ast) {
     // Print the function ast before IL generation.
     AstPrinter::PrintFunctionNodes(parsed_function());
   }
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::graphbuilder_timer);
   // Compilation can be nested, preserve the computation-id.
   Isolate* isolate = Isolate::Current();
   const intptr_t prev_cid = isolate->computation_id();
   isolate->set_computation_id(0);
   const Function& function = parsed_function().function();
   EffectGraphVisitor for_effect(this, 0);
   for_effect.AddInstruction(new TargetEntryInstr());
   parsed_function().node_sequence()->Visit(&for_effect);
   // Check that the graph is properly terminated.
   ASSERT(!for_effect.is_open());
   GrowableArray<intptr_t> parent;
   for (intptr_t i = 0; i < catch_entries_.length(); i++) {
     Instruction* entry = catch_entries_[i];
     entry->DiscoverBlocks(NULL,  // Entry block predecessor.
                           &preorder_block_entries_,
                           &postorder_block_entries_,
                           &parent);
-    ComputeDominators(&preorder_block_entries_, &parent);
+    if (for_optimized) {
+      ComputeDominators(&preorder_block_entries_, &parent);
+    }
   }
   if (for_effect.entry() != NULL) {
     // Perform a depth-first traversal of the graph to build preorder and
     // postorder block orders.
     for_effect.entry()->DiscoverBlocks(NULL,  // Entry block predecessor.
                                        &preorder_block_entries_,
                                        &postorder_block_entries_,
                                        &parent);
-    ComputeDominators(&preorder_block_entries_, &parent);
+    if (for_optimized) {
+      ComputeDominators(&preorder_block_entries_, &parent);
+    }
   }
   isolate->set_computation_id(prev_cid);
   if (FLAG_print_flow_graph) {
     intptr_t length = postorder_block_entries_.length();
     GrowableArray<BlockEntryInstr*> reverse_postorder(length);
     for (intptr_t i = length - 1; i >= 0; --i) {
       reverse_postorder.Add(postorder_block_entries_[i]);
     }
     FlowGraphPrinter printer(function, reverse_postorder);
     printer.VisitBlocks();
@@ skipping 95 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart