Fix source position for stack traces with optimized top function.

runtime/vm/deopt_instructions.h

Index: runtime/vm/deopt_instructions.h
===================================================================
--- runtime/vm/deopt_instructions.h	(revision 17448)
+++ runtime/vm/deopt_instructions.h	(working copy)
@@ -115,6 +115,8 @@
   virtual void Execute(DeoptimizationContext* deopt_context,
                        intptr_t to_index) = 0;
 
+  virtual DeoptInstr::Kind kind() const = 0;
+
   bool Equals(const DeoptInstr& other) const {
     return (kind() == other.kind()) && (from_index() == other.from_index());
   }
@@ -125,12 +127,11 @@
 
   // Get the function and return address which is encoded in this
   // kRetAfterAddress deopt instruction.
-  static uword GetRetAfterAddress(intptr_t deopt_from_index,
+  static uword GetRetAfterAddress(DeoptInstr* instr,
                                   const Array& object_table,

[srdjan, 2013/01/28 18:03:58]

Why not making this an instance method, implemented for appropriate instr only?

[Florian Schneider, 2013/01/29 12:19:07]

I would have to move all concrete deopt instruction class declarations to the .h
file.

                                   Function* func);
 
  protected:
-  virtual DeoptInstr::Kind kind() const = 0;
   virtual intptr_t from_index() const = 0;
 
   friend class DeoptInfoBuilder;