Fix source position for stack traces with optimized top function.

runtime/vm/flow_graph_compiler.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_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/assembler_macros.h"
@@ skipping 202 matching lines @@
   void LoadDoubleOrSmiToFpu(FpuRegister result,
                             Register reg,
                             Register temp,
                             Label* not_double_or_smi);
 
   // Returns 'true' if code generation for this function is complete, i.e.,
   // no fall-through to regular code is needed.
   bool TryIntrinsify();
 
   void GenerateCallRuntime(intptr_t token_pos,
+                           intptr_t deopt_id,
                            const RuntimeEntry& entry,
                            LocationSummary* locs);
 
   void GenerateCall(intptr_t token_pos,
                     const ExternalLabel* label,
                     PcDescriptors::Kind kind,
                     LocationSummary* locs);
 
   void GenerateDartCall(intptr_t deopt_id,
                         intptr_t token_pos,
                         const ExternalLabel* label,
                         PcDescriptors::Kind kind,
                         LocationSummary* locs);
 
   void GenerateAssertAssignable(intptr_t token_pos,
+                                intptr_t deopt_id,
                                 const AbstractType& dst_type,
                                 const String& dst_name,
                                 LocationSummary* locs);
 
   void GenerateInstanceOf(intptr_t token_pos,
+                          intptr_t deopt_id,
                           const AbstractType& type,
                           bool negate_result,
                           LocationSummary* locs);
 
   void GenerateInstanceCall(intptr_t deopt_id,
                             intptr_t token_pos,
                             intptr_t argument_count,
                             const Array& argument_names,
                             LocationSummary* locs,
                             const ICData& ic_data);
@@ skipping 134 matching lines @@
                                                 Register array,
                                                 Register index);
   static Address ExternalElementAddressForIntIndex(intptr_t cid,
                                                    Register array,
                                                    intptr_t offset);
   static Address ExternalElementAddressForRegIndex(intptr_t cid,
                                                    Register array,
                                                    Register index);
 
  private:
+  friend class CheckStackOverflowSlowPath;  // For pending_deoptimization_env_.
+
   void EmitFrameEntry();
 
   void AddStaticCallTarget(const Function& function);
 
   void GenerateDeferredCode();
 
   void EmitInstructionPrologue(Instruction* instr);
   void EmitInstructionEpilogue(Instruction* instr);
 
   // Emit code to load a Value into register 'dst'.
@@ skipping 107 matching lines @@
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_