Introduce a nesting stack to the flow graph builder.

runtime/vm/flow_graph_inliner.cc

 // Copyright (c) 2013, 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_inliner.h"
 
 #include "vm/block_scheduler.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
@@ skipping 51 matching lines @@
 static bool IsCallRecursive(const Function& function, Definition* call) {
   Environment* env = call->env();
   while (env != NULL) {
     if (function.raw() == env->function().raw()) return true;
     env = env->outer();
   }
   return false;
 }
 
 
-// TODO(zerny): Remove the ChildrenVisitor and SourceLabelResetter once we have
-// moved the label/join map for control flow out of the AST and into the flow
-// graph builder.
-
-// Default visitor to traverse child nodes.
-class ChildrenVisitor : public AstNodeVisitor {
- public:
-  ChildrenVisitor() { }
-#define DEFINE_VISIT(BaseName)                                                 \
-  virtual void Visit##BaseName##Node(BaseName##Node* node) {                   \
-    node->VisitChildren(this);                                                 \
-  }
-
-  FOR_EACH_NODE(DEFINE_VISIT);
-#undef DEFINE_VISIT
-};
-
-
-// Visitor to clear each AST node containing source labels.
-class SourceLabelResetter : public ChildrenVisitor {
- public:
-  SourceLabelResetter() { }
-  virtual void VisitSequenceNode(SequenceNode* node) {
-    Reset(node, node->label());
-  }
-  virtual void VisitCaseNode(CaseNode* node) {
-    Reset(node, node->label());
-  }
-  virtual void VisitSwitchNode(SwitchNode* node) {
-    Reset(node, node->label());
-  }
-  virtual void VisitWhileNode(WhileNode* node) {
-    Reset(node, node->label());
-  }
-  virtual void VisitDoWhileNode(DoWhileNode* node) {
-    Reset(node, node->label());
-  }
-  virtual void VisitForNode(ForNode* node) {
-    Reset(node, node->label());
-  }
-  virtual void VisitJumpNode(JumpNode* node) {
-    Reset(node, node->label());
-  }
-  void Reset(AstNode* node, SourceLabel* lbl) {
-    node->VisitChildren(this);
-    if (lbl == NULL) return;
-    lbl->join_for_break_ = NULL;
-    lbl->join_for_continue_ = NULL;
-  }
-};
-
-
 // Helper to create a parameter stub from an actual argument.
 static Definition* CreateParameterStub(intptr_t i,
                                        Value* argument,
                                        FlowGraph* graph) {
   ConstantInstr* constant = argument->definition()->AsConstant();
   if (constant != NULL) {
     return new ConstantInstr(constant->value());
   } else {
     return new ParameterInstr(i, graph->graph_entry());
   }
@@ skipping 646 matching lines @@
     return count;
   }
 
   // Parse a function reusing the cache if possible.
   ParsedFunction* GetParsedFunction(const Function& function, bool* in_cache) {
     // TODO(zerny): Use a hash map for the cache.
     for (intptr_t i = 0; i < function_cache_.length(); ++i) {
       ParsedFunction* parsed_function = function_cache_[i];
       if (parsed_function->function().raw() == function.raw()) {
         *in_cache = true;
-        SourceLabelResetter reset;
-        parsed_function->node_sequence()->Visit(&reset);
         return parsed_function;
       }
     }
     *in_cache = false;
     ParsedFunction* parsed_function = new ParsedFunction(function);
     Parser::ParseFunction(parsed_function);
     parsed_function->AllocateVariables();
     return parsed_function;
   }
 
@@ skipping 720 matching lines @@
         OS::Print("After Inlining of %s\n", flow_graph_->
                   parsed_function().function().ToFullyQualifiedCString());
         FlowGraphPrinter printer(*flow_graph_);
         printer.PrintBlocks();
       }
     }
   }
 }
 
 }  // namespace dart