Implement branching control flow in the non-optimizing graph compiler.

runtime/vm/flow_graph_compiler_x64.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_COMPILER_X64_H_
 #define VM_FLOW_GRAPH_COMPILER_X64_H_
 
 #ifndef VM_FLOW_GRAPH_COMPILER_H_
 #error Include flow_graph_compiler.h instead of flow_graph_compiler_x64.h.
 #endif
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/intermediate_language.h"
 
 namespace dart {
 
 class Code;
 template <typename T> class GrowableArray;
 class ParsedFunction;
 
 class FlowGraphCompiler : public FlowGraphVisitor {
  public:

[srdjan, 2012/03/07 22:23:06]

Maybe write (again) that blocks are in reversed order as that they are
generated.

   FlowGraphCompiler(Assembler* assembler,
                     const ParsedFunction& parsed_function,
-                    const GrowableArray<BlockEntryInstr*>* blocks)
-      : assembler_(assembler),
-        parsed_function_(parsed_function),
-        blocks_(blocks),
-        pc_descriptors_list_(new CodeGenerator::DescriptorList()),
-        stack_local_count_(0) { }
+                    const GrowableArray<BlockEntryInstr*>* blocks);
 
   virtual ~FlowGraphCompiler() { }
 
   void CompileGraph();
 
   // Infrastructure copied from class CodeGenerator or stubbed out.
   void FinalizePcDescriptors(const Code& code);
   void FinalizeVarDescriptors(const Code& code);
   void FinalizeExceptionHandlers(const Code& code);
 
  private:
+  struct BlockInfo : public ZoneAllocated {
+   public:
+    BlockInfo() : label() { }
+
+    Label label;
+  };

[srdjan, 2012/03/07 22:23:06]

ZoneAllocated objects have their destructor never called, i.e., the Label
destructor will never be called neither, i.e., the checks in Label's destructor
are not being done any longer. I think those checks are important. Maybe we
could traverse the list at the end of compilation and verify that the Labels are
OK.

[Kevin Millikin (Google), 2012/03/08 09:59:53]

I know, and I'm not certain this is best.  Label has DISALLOW_COPY_AND_ASSIGN so
it doesn't really work to use an embedded GrowableArray.

It seems possibly better to have a malloced array of BlockInfos---especially
depending on what else we put in this struct.

For now I've put the label asserts in ~FlowGraphCompiler.

+
   int stack_local_count() const { return stack_local_count_; }
   void set_stack_local_count(int count) { stack_local_count_ = count; }
+  BlockEntryInstr* current_block() const { return current_block_; }
 
   // Bail out of the flow graph compiler.  Does not return to the caller.
   void Bailout(const char* reason);
 
+  virtual void VisitBlocks(const GrowableArray<BlockEntryInstr*>& blocks);
+
   // Emit code to perform a computation, leaving its value in RAX.
 #define DECLARE_VISIT_COMPUTATION(ShortName, ClassName)                        \
   virtual void Visit##ShortName(ClassName* comp);
 
   // Each visit function compiles a type of instruction.
 #define DECLARE_VISIT_INSTRUCTION(ShortName)                                   \
   virtual void Visit##ShortName(ShortName##Instr* instr);
 
   FOR_EACH_COMPUTATION(DECLARE_VISIT_COMPUTATION)
   FOR_EACH_INSTRUCTION(DECLARE_VISIT_INSTRUCTION)
@@ skipping 25 matching lines @@
 
   void GenerateAssertAssignable(intptr_t node_id,
                                 intptr_t token_index,
                                 const AbstractType& dst_type,
                                 const String& dst_name);
 
   Assembler* assembler_;
   const ParsedFunction& parsed_function_;
   const GrowableArray<BlockEntryInstr*>* blocks_;
 
+  // Compiler specific per-block state.  Indexed by block number, so not
+  // necessarily the same order as the array of blocks.
+  GrowableArray<BlockInfo*> block_info_;
+
+  BlockEntryInstr* current_block_;
+
   CodeGenerator::DescriptorList* pc_descriptors_list_;
   int stack_local_count_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_X64_H_