Teach the flow graph compiler to play nice with the debugger

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 #include "vm/handles_impl.h"
@@ skipping 411 matching lines @@
   const intptr_t temp_index_;
   Computation* computation_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(BindInstr);
 };
 
 
 class ReturnInstr : public Instruction {
  public:
-  explicit ReturnInstr(Value* value) : Instruction(), value_(value) { }
+  explicit ReturnInstr(Value* value, intptr_t token_index)

[srdjan, 2012/02/28 21:37:40]

Remove explicit

[hausner, 2012/02/28 21:42:34]

Done.

+      : Instruction(), value_(value), token_index_(token_index) { }
 
   DECLARE_INSTRUCTION(Return)
 
   Value* value() const { return value_; }
+  intptr_t token_index() const { return token_index_; }
 
   virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
 
   virtual void Postorder(GrowableArray<BlockEntryInstr*>* block_entries);
 
  private:
   Value* value_;
+  intptr_t token_index_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnInstr);
 };
 
 
 class BranchInstr : public Instruction {
  public:
   explicit BranchInstr(Value* value)
       : Instruction(),
         value_(value),
@@ skipping 50 matching lines @@
 #undef DECLARE_VISIT_INSTRUCTION
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_