Revert r40306 because of crash.

runtime/vm/flow_graph_compiler.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_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 302 matching lines @@
 
   void CompileGraph();
 
   void VisitBlocks();
 
   // Bail out of the flow graph compiler. Does not return to the caller.
   void Bailout(const char* reason);
 
   void TryIntrinsify();
 
-  void RecordCallInfo(intptr_t token_pos,
-                      RawPcDescriptors::Kind kind,
-                      intptr_t deopt_id,
-                      LocationSummary* locs,
-                      intptr_t input_count_adjustment);
-
   void GenerateRuntimeCall(intptr_t token_pos,
                            intptr_t deopt_id,
                            const RuntimeEntry& entry,
                            intptr_t argument_count,
                            LocationSummary* locs);
 
   void GenerateCall(intptr_t token_pos,
                     const ExternalLabel* label,
                     RawPcDescriptors::Kind kind,
                     LocationSummary* locs);
@@ skipping 105 matching lines @@
   void AddExceptionHandler(intptr_t try_index,
                            intptr_t outer_try_index,
                            intptr_t pc_offset,
                            const Array& handler_types,
                            bool needs_stacktrace);
   void SetNeedsStacktrace(intptr_t try_index);
   void AddCurrentDescriptor(RawPcDescriptors::Kind kind,
                             intptr_t deopt_id,
                             intptr_t token_pos);
 
+  void RecordSafepoint(LocationSummary* locs);
+
   Label* AddDeoptStub(intptr_t deopt_id, ICData::DeoptReasonId reason);
 
+  void AddDeoptIndexAtCall(intptr_t deopt_id, intptr_t token_pos);
+
   void AddSlowPathCode(SlowPathCode* slow_path);
 
   void FinalizeExceptionHandlers(const Code& code);
   void FinalizePcDescriptors(const Code& code);
   void FinalizeDeoptInfo(const Code& code);
   void FinalizeStackmaps(const Code& code);
   void FinalizeVarDescriptors(const Code& code);
   void FinalizeStaticCallTargetsTable(const Code& code);
 
   const Class& double_class() const { return double_class_; }
@@ skipping 35 matching lines @@
     return *deopt_id_to_ic_data_;
   }
 
   Isolate* isolate() const { return isolate_; }
 
  private:
   friend class CheckStackOverflowSlowPath;  // For pending_deoptimization_env_.
 
   void EmitFrameEntry();
 
-  void RecordSafepoint(LocationSummary* locs);
-
   void AddStaticCallTarget(const Function& function);
 
-  void AddDeoptIndexAtCall(intptr_t deopt_id,
-                           intptr_t token_pos,
-                           intptr_t input_count);
-
   void GenerateDeferredCode();
 
   void EmitInstructionPrologue(Instruction* instr);
   void EmitInstructionEpilogue(Instruction* instr);
 
   // Emit code to load a Value into register 'dst'.
   void LoadValue(Register dst, Value* value);
 
   void EmitOptimizedStaticCall(const Function& function,
                                const Array& arguments_descriptor,
@@ skipping 131 matching lines @@
   intptr_t lazy_deopt_pc_offset_;
 
   ZoneGrowableArray<const ICData*>* deopt_id_to_ic_data_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_