Reverting r7833 because of failing compilation.

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 25 matching lines @@
   // Infrastructure copied from class CodeGenerator or stubbed out.
   void FinalizePcDescriptors(const Code& code);
   void FinalizeStackmaps(const Code& code);
   void FinalizeVarDescriptors(const Code& code);
   void FinalizeExceptionHandlers(const Code& code);
   void FinalizeComments(const Code& code);
 
   Assembler* assembler() const { return assembler_; }
 
  private:
-  // 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);
 
   // Constructor is lighweight, major initialization work should occur here.
   // This makes it easier to measure time spent in the compiler.
   void InitCompiler();
 
   struct BlockInfo : public ZoneAllocated {
    public:
     BlockInfo() : label() { }
 
@@ skipping 17 matching lines @@
 #define DECLARE_VISIT_INSTRUCTION(ShortName)                                   \
   virtual void Visit##ShortName(ShortName##Instr* instr);
 
   FOR_EACH_COMPUTATION(DECLARE_VISIT_COMPUTATION)
   FOR_EACH_INSTRUCTION(DECLARE_VISIT_INSTRUCTION)
 
 #undef DECLARE_VISIT_COMPUTATION
 #undef DECLARE_VISIT_INSTRUCTION
 
   void EmitInstructionPrologue(Instruction* instr);
+  void LoadInputs(LocationSummary* summary);
 
   // Emit code to load a Value into register 'dst'.
   void LoadValue(Register dst, Value* value);
 
   void EmitComment(Instruction* instr);
 
   // Emit an instance call.
   void EmitInstanceCall(intptr_t cid,
                         intptr_t token_index,
                         intptr_t try_index,
@@ skipping 61 matching lines @@
   DescriptorList* pc_descriptors_list_;
   ExceptionHandlerList* exception_handlers_list_;
   const bool is_optimizing_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_X64_H_