Reapply "Deoptimization support in inlined code."

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/assembler_macros.h"
@@ skipping 52 matching lines @@
  public:
   CompilerDeoptInfo(intptr_t deopt_id, DeoptReasonId reason)
       : deopt_id_(deopt_id), reason_(reason), deoptimization_env_(NULL) {}
 
   void set_deoptimization_env(Environment* env) {
     deoptimization_env_ = env;
   }
 
   RawDeoptInfo* CreateDeoptInfo(FlowGraphCompiler* compiler);
 
+  void AllocateIncomingParametersRecursive(Environment* env,
+                                           intptr_t* stack_height);
+
   // No code needs to be generated.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix) {}
 
   // Builds deopt-after continuation point.
   virtual void BuildReturnAddress(DeoptInfoBuilder* builder,
                                   const Function& function,
                                   intptr_t slot_ix);
 
   intptr_t deopt_id() const { return deopt_id_; }
   DeoptReasonId reason() const { return reason_; }
   const Environment* deoptimization_env() const { return deoptimization_env_; }
 
  private:
   const intptr_t deopt_id_;
   const DeoptReasonId reason_;
-  const Environment* deoptimization_env_;
+  Environment* deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilerDeoptInfo);
 };
 
 
 class CompilerDeoptInfoWithStub : public CompilerDeoptInfo {
  public:
   CompilerDeoptInfoWithStub(intptr_t deopt_id,
                             DeoptReasonId reason)
       : CompilerDeoptInfo(deopt_id, reason), entry_label_() {
@@ skipping 40 matching lines @@
 #include "vm/flow_graph_compiler_ia32.h"
 #elif defined(TARGET_ARCH_X64)
 #include "vm/flow_graph_compiler_x64.h"
 #elif defined(TARGET_ARCH_ARM)
 #include "vm/flow_graph_compiler_arm.h"
 #else
 #error Unknown architecture.
 #endif
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_