Teach the flow graph compiler to play nice with the debugger

runtime/vm/intermediate_language.h

Index: runtime/vm/intermediate_language.h
===================================================================
--- runtime/vm/intermediate_language.h	(revision 4720)
+++ runtime/vm/intermediate_language.h	(working copy)
@@ -429,11 +429,13 @@
 
 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(); }
 
@@ -441,6 +443,7 @@
 
  private:
   Value* value_;
+  intptr_t token_index_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnInstr);
 };