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

runtime/vm/flow_graph_compiler.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_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 211 matching lines @@
          frame_register_allocator()->IsSpilled());
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
                                        deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
-                                       intptr_t deopt_token_pos,
                                        intptr_t try_index,
                                        DeoptReasonId reason,
                                        Register reg1,
                                        Register reg2,
                                        Register reg3) {
   DeoptimizationStub* stub =
-      new DeoptimizationStub(deopt_id, deopt_token_pos, try_index, reason);
+      new DeoptimizationStub(deopt_id, try_index, reason);
   if (pending_deoptimization_env_ == NULL) {
     ASSERT(!is_ssa_);
     frame_register_allocator()->SpillInDeoptStub(stub);
     if (reg1 != kNoRegister) stub->Push(reg1);
     if (reg2 != kNoRegister) stub->Push(reg2);
     if (reg3 != kNoRegister) stub->Push(reg3);
   } else {
     ASSERT(pending_deoptimization_env_ != NULL);
     stub->set_deoptimization_env(pending_deoptimization_env_);
   }
@@ skipping 602 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart