Move ReturnInstr to new scheme (x64 and ia32) and implement more code in new ia32 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
@@ 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);
 
+  bool is_optimizing() const { return is_optimizing_; }
+  const ParsedFunction& parsed_function() const { return parsed_function_; }
 
   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);
 
   // 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;
   }
 
   // Returns assembler label associated with the given block entry.
   Label* GetBlockLabel(TargetEntryInstr* block_entry) const {
@@ skipping 18 matching lines @@
 
   struct BlockInfo : public ZoneAllocated {
    public:
     BlockInfo() : label() { }
 
     Label label;
   };
 
   BlockEntryInstr* current_block() const { return current_block_; }
 
-  bool is_optimizing() const { return is_optimizing_; }
-
   // Bail out of the flow graph compiler.  Does not return to the caller.
   void Bailout(const char* reason);
 
   virtual void VisitBlocks();
 
   // 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.
@@ skipping 27 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 AddCurrentDescriptor(PcDescriptors::Kind kind,
-                            intptr_t cid,
-                            intptr_t token_index,
-                            intptr_t try_index);
 
   // Type checking helper methods.
   void CheckClassIds(const GrowableArray<intptr_t>& class_ids,
                     Label* is_instance_lbl,
                     Label* is_not_instance_lbl);
   RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t cid,
                                                 intptr_t token_index,
                                                 const AbstractType& type,
                                                 Label* is_instance,
                                                 Label* is_not_instance);
@@ skipping 61 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_