Move Throw and ReThrow to the location based code generation.

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
@@ skipping 32 matching lines @@
 
   Assembler* assembler() const { return assembler_; }
 
   Label* AddDeoptStub(intptr_t deopt_id,
                       intptr_t deopt_token_index,
                       intptr_t try_index_,
                       DeoptReasonId reason,
                       Register reg1,
                       Register reg2);
 
+
+  void GenerateCallRuntime(intptr_t cid,
+                           intptr_t token_index,
+                           intptr_t try_index,
+                           const RuntimeEntry& entry);
+
+  // Returns true if the next block after current in the current block order
+  // is the given block.
+  bool IsNextBlock(TargetEntryInstr* block_entry) const {
+    intptr_t current_index = reverse_index(current_block()->postorder_number());
+    return block_order_[current_index + 1] == block_entry;
+  }

[srdjan, 2012/05/31 16:00:53]

I think we can move both of these implementations into .cc file.

+
+  // Returns assembler label associated with the given block entry.
+  Label* GetBlockLabel(TargetEntryInstr* block_entry) const {
+    intptr_t block_index = block_entry->postorder_number();
+    return &block_info_[block_index]->label;
+  }
+
  private:
   friend class DeoptimizationStub;
 
   // TODO(fschneider): Clean up friend-class declarations once all code
   // generator templates have been moved to intermediate_language_x64.cc.
 #define DECLARE_FRIEND(ShortName, ClassName) friend class ClassName;
   FOR_EACH_COMPUTATION(DECLARE_FRIEND)
 #undef DECLARE_FRIEND
 
   static const int kLocalsOffsetFromFP = (-1 * kWordSize);
@@ skipping 53 matching lines @@
                       intptr_t try_index,
                       const Function& function,
                       intptr_t argument_count,
                       const Array& argument_names);
 
   // Infrastructure copied from class CodeGenerator.
   void GenerateCall(intptr_t token_index,
                     intptr_t try_index,
                     const ExternalLabel* label,
                     PcDescriptors::Kind kind);
-  void GenerateCallRuntime(intptr_t cid,
-                           intptr_t token_index,
-                           intptr_t try_index,
-                           const RuntimeEntry& entry);
   void AddCurrentDescriptor(PcDescriptors::Kind kind,
                             intptr_t cid,
                             intptr_t token_index,
                             intptr_t try_index);
 
   // Type checking helper methods.
   void CheckClasses(const GrowableArray<const Class*>& classes,
                     Label* is_instance_lbl,
                     Label* is_not_instance_lbl);
   RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t cid,
@@ skipping 64 matching lines @@
   ExceptionHandlerList* exception_handlers_list_;
   GrowableArray<DeoptimizationStub*> deopt_stubs_;
   const bool is_optimizing_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_X64_H_