Change inlined stack frame iterator to use code and pc instead of frame.

runtime/vm/stack_frame.cc

 // 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.
 
 #include "vm/stack_frame.h"
 
 #include "vm/assembler.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 325 matching lines @@
   ASSERT(!frames_.HasNext());
   entry_.sp_ = frames_.sp_;
   entry_.fp_ = frames_.fp_;
   entry_.pc_ = frames_.pc_;
   SetupNextExitFrameData();  // Setup data for next exit frame in chain.
   ASSERT(entry_.IsValid());
   return &entry_;
 }
 
 
-InlinedFunctionsIterator::InlinedFunctionsIterator(StackFrame* frame)
+InlinedFunctionsIterator::InlinedFunctionsIterator(const Code& code, uword pc)
   : index_(0),
-    code_(Code::Handle()),
+    code_(Code::Handle(code.raw())),
     deopt_info_(DeoptInfo::Handle()),
     function_(Function::Handle()),
-    pc_(0),
+    pc_(pc),
     deopt_instructions_(),
     object_table_(Array::Handle()) {

[siva, 2013/09/04 19:32:42]

Need an assertion here to ensure that the passed in 'code' contains 'pc'.

[srdjan, 2013/09/04 19:36:03]

Done.

-  ASSERT(frame != NULL);
-  code_ = frame->LookupDartCode();
   ASSERT(code_.is_optimized());
   intptr_t deopt_reason = kDeoptUnknown;
-  deopt_info_ = code_.GetDeoptInfoAtPc(frame->pc(), &deopt_reason);
+  deopt_info_ = code_.GetDeoptInfoAtPc(pc, &deopt_reason);
   if (deopt_info_.IsNull()) {
     // This is the case when a call without deopt info in optimized code
     // throws an exception. (e.g. in the parameter copying prologue).
     // In that case there won't be any inlined frames.
     function_ = code_.function();
-    pc_ = frame->pc();
     ASSERT(pc_ != 0);
   } else {
     // Unpack deopt info into instructions (translate away suffixes).
     const Array& deopt_table = Array::Handle(code_.deopt_info_array());
     ASSERT(!deopt_table.IsNull());
     deopt_info_.ToInstructions(deopt_table, &deopt_instructions_);
     object_table_ = code_.object_table();
     Advance();
   }
 }
@@ skipping 17 matching lines @@
       pc_ = DeoptInstr::GetRetAddress(deopt_instr, object_table_, &func);
       code_ = func.unoptimized_code();
       function_ = func.raw();
       return;
     }
   }
   SetDone();
 }
 
 }  // namespace dart