Fix source position for stack traces with optimized top function.

runtime/vm/deopt_instructions.h

 // Copyright (c) 2013, 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_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 97 matching lines @@
   static DeoptInstr* Create(intptr_t kind_as_int, intptr_t from_index);
 
   DeoptInstr() {}
   virtual ~DeoptInstr() {}
 
   virtual const char* ToCString() const = 0;
 
   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());
   }
 
   // Decode the payload of a suffix command.  Return the suffix length and
   // set the output parameter info_number to the index of the shared suffix.
   static intptr_t DecodeSuffix(intptr_t from_index, intptr_t* info_number);
 
   // 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;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeoptInstr);
 };
 
 
 // Builds a deoptimization info table, one DeoptInfo at a time.  Call AddXXX
@@ skipping 73 matching lines @@
                        DeoptInfo* info,
                        Smi* reason);
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_