Try/catch in graph builder.

runtime/vm/flow_graph_builder.h

Index: runtime/vm/flow_graph_builder.h
===================================================================
--- runtime/vm/flow_graph_builder.h	(revision 6367)
+++ runtime/vm/flow_graph_builder.h	(working copy)
@@ -18,11 +18,7 @@
 // Build a flow graph from a parsed function's AST.
 class FlowGraphBuilder: public ValueObject {
  public:
-  explicit FlowGraphBuilder(const ParsedFunction& parsed_function)
-      : parsed_function_(parsed_function),
-        preorder_block_entries_(),
-        postorder_block_entries_(),
-        context_level_(0) { }
+  explicit FlowGraphBuilder(const ParsedFunction& parsed_function);
 
   void BuildGraph();
 
@@ -37,6 +33,12 @@
   void set_context_level(intptr_t value) { context_level_ = value; }
   intptr_t context_level() const { return context_level_; }
 
+  intptr_t allocate_try_index() { return ++last_used_try_index_; }

[regis, 2012/04/10 22:58:24]

Shouldn't this be camel case?

[srdjan, 2012/04/10 23:11:58]

Done.

+  void set_try_index(intptr_t value) { try_index_ = value; }
+  intptr_t try_index() const { return try_index_; }
+
+  void AddCatchEntry(intptr_t try_index, Instruction* entry);
+
  private:
   void ComputeDominators(GrowableArray<BlockEntryInstr*>* preorder,
                          GrowableArray<intptr_t>* parent);
@@ -49,6 +51,11 @@
   GrowableArray<BlockEntryInstr*> preorder_block_entries_;
   GrowableArray<BlockEntryInstr*> postorder_block_entries_;
   intptr_t context_level_;
+  intptr_t last_used_try_index_;
+  intptr_t try_index_;
+  GrowableArray<Instruction*> catch_entries_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(FlowGraphBuilder);
 };
 
 
@@ -163,6 +170,10 @@
                             int start_index,
                             Value* alloc_value);
 
+  void BuildStoreContext(const LocalVariable& variable, intptr_t start_index);
+  void BuildLoadContext(const LocalVariable& context_variable,
+                        intptr_t start_index);
+
   void BuildThrowNode(ThrowNode* node);
 
  private: