Split deopt-after and deopt-before handling:

runtime/vm/flow_graph_compiler_x64.cc

 // 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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
 #include "vm/ast_printer.h"
 #include "vm/il_printer.h"
 #include "vm/locations.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, print_ast);
 DECLARE_FLAG(bool, print_scopes);
 DECLARE_FLAG(bool, trace_functions);
 
 
-void DeoptimizationStub::GenerateCode(FlowGraphCompiler* compiler,
-                                      intptr_t stub_ix) {
+void CompilerDeoptInfoWithStub::GenerateCode(FlowGraphCompiler* compiler,
+                                             intptr_t stub_ix) {
   // Calls do not need stubs, they share a deoptimization trampoline.
-  if (reason_ == kDeoptAtCall) return;
+  ASSERT(reason() != kDeoptAtCall);
   Assembler* assem = compiler->assembler();
 #define __ assem->
-  __ Comment("Deopt stub for id %d", deopt_id_);
+  __ Comment("Deopt stub for id %d", deopt_id());
   __ Bind(entry_label());
 
-  ASSERT(deoptimization_env_ != NULL);
+  ASSERT(deoptimization_env() != NULL);
 
   if (compiler->IsLeaf()) {
     __ Comment("Leaf method, lazy PC marker setup");
     // TODO(srdjan): Can we use TMP instead of RAX? We must guarantee that
     // TMP is never part of deoptimization environment.
     __ pushq(RAX);  // Preserve RAX.
     Label L;
     __ call(&L);
     const intptr_t offset = assem->CodeSize();
     __ Bind(&L);
     __ popq(RAX);
     __ subq(RAX,
         Immediate(offset - AssemblerMacros::kOffsetOfSavedPCfromEntrypoint));
     __ movq(Address(RBP, -kWordSize), RAX);
     __ popq(RAX);  // Restore RAX.
   }
   __ call(&StubCode::DeoptimizeLabel());
   const intptr_t deopt_info_index = stub_ix;
   compiler->pc_descriptors_list()->AddDeoptIndex(
       compiler->assembler()->CodeSize(),
-      deopt_id_,
-      reason_,
+      deopt_id(),
+      reason(),
       deopt_info_index);
   __ int3();
 #undef __
 }
 
 
 #define __ assembler()->
 
 
 // Fall through if bool_register contains null.
@@ skipping 1234 matching lines @@
 void ParallelMoveResolver::Exchange(const Address& mem1, const Address& mem2) {
   __ Exchange(mem1, mem2);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64