Move deopt reason into PcDescriptor so the EAX/RAX register is not destroyed. Some cleanups in PC d…

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 122 matching lines @@
   FlowGraphCompiler* compiler_;
 
   // List of moves not yet resolved.
   GrowableArray<MoveOperands*> moves_;
 };
 
 
 class DeoptimizationStub : public ZoneAllocated {
  public:
   DeoptimizationStub(intptr_t deopt_id,
-                     intptr_t deopt_token_pos,
                      intptr_t try_index,
                      DeoptReasonId reason)
       : deopt_id_(deopt_id),
-        deopt_token_pos_(deopt_token_pos),
         try_index_(try_index),
         reason_(reason),
         registers_(2),
         deoptimization_env_(NULL),
         entry_label_() {}
 
   void Push(Register reg) { registers_.Add(reg); }
   Label* entry_label() { return &entry_label_; }
 
   // Implementation is in architecture specific file.
   void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix);
 
   void set_deoptimization_env(Environment* env) {
     deoptimization_env_ = env;
   }
 
   RawDeoptInfo* CreateDeoptInfo(FlowGraphCompiler* compiler);
 
  private:
   const intptr_t deopt_id_;
-  const intptr_t deopt_token_pos_;
   const intptr_t try_index_;
   const DeoptReasonId reason_;
   GrowableArray<Register> registers_;
   const Environment* deoptimization_env_;
   Label entry_label_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptimizationStub);
 };
 
 }  // namespace dart
 
 #if defined(TARGET_ARCH_IA32)
 #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_