Fix a crash bug when creating a stack trace from an optimized 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_macros.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 262 matching lines @@
 EntryFrame* StackFrameIterator::NextEntryFrame() {
   ASSERT(!frames_.HasNext());
   entry_.sp_ = frames_.sp_;
   entry_.fp_ = frames_.fp_;
   SetupNextExitFrameData();  // Setup data for next exit frame in chain.
   ASSERT(entry_.IsValid());
   return &entry_;
 }
 
 
-InlinedFunctionsInDartFrameIterator::InlinedFunctionsInDartFrameIterator(
-    StackFrame* frame) : index_(0),
-                         deopt_instructions_(),
-                         object_table_(Array::Handle()) {
+InlinedFunctionsIterator::InlinedFunctionsIterator(StackFrame* frame)
+  : index_(0),
+    code_(Code::Handle()),
+    deopt_info_(DeoptInfo::Handle()),
+    function_(Function::Handle()),
+    pc_(0),
+    deopt_instructions_(),
+    object_table_(Array::Handle()) {
   ASSERT(frame != NULL);
-  const Code& code = Code::Handle(frame->LookupDartCode());
-  ASSERT(code.is_optimized());
+  code_ = frame->LookupDartCode();
+  ASSERT(code_.is_optimized());
   intptr_t deopt_reason = kDeoptUnknown;
-  const DeoptInfo& deopt_info = DeoptInfo::Handle(
-      code.GetDeoptInfoAtPc(frame->pc(), &deopt_reason));
-  ASSERT(!deopt_info.IsNull());
-
-  // 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();
+  deopt_info_ = code_.GetDeoptInfoAtPc(frame->pc(), &deopt_reason);
+  if (deopt_info_.IsNull()) {
+    // This is the case when a call without deopt info in optimzed code
+    // throws an exception. (e.g. in the parameter copying prologue).
+    // In that case there won't be any inlined frames.

[Vyacheslav Egorov (Google), 2013/01/30 13:03:11]

Can we verify that this is indeed a prologue that copies parameters? Maybe we
accidentally forgot to emit some data?

[Florian Schneider, 2013/01/30 14:11:16]

In the failing tests it is. But that does not exclude that it may occur in other
places. I'll check manually for more.

+    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();
+  }
 }
 
 
-RawFunction* InlinedFunctionsInDartFrameIterator::GetNextFunction(uword* pc) {
+RawFunction* InlinedFunctionsIterator::GetNextFunctionAndCode(uword* pc,

[Vyacheslav Egorov (Google), 2013/01/30 13:03:11]

Instead of having three return values you can refactor this class to be a
classical iterator with methods:

bool Done();
void Advance();

RawFunction* function();
uword pc();
RawCode* code();

[Florian Schneider, 2013/01/30 14:06:43]

Done.

+                                                             Code* code) {
   if (index_ == -1) {
     return Function::null();
   }
 
+  if (deopt_info_.IsNull()) {
+    // No deoptimization info. Return the optimized code and pc.
+    index_ = -1;
+    *pc = pc_;
+    *code = code_.raw();
+    return function_.raw();
+  }
+
   // Iterate over the deopt instructions and determine the inlined
   // functions if any and iterate over them.
   Function& func = Function::Handle();
   ASSERT(deopt_instructions_.length() != 0);
   while (index_ < deopt_instructions_.length()) {
     DeoptInstr* deopt_instr = deopt_instructions_[index_++];
     ASSERT(deopt_instr->kind() != DeoptInstr::kRetBeforeAddress);
     if (deopt_instr->kind() == DeoptInstr::kRetAfterAddress) {
       *pc = DeoptInstr::GetRetAfterAddress(deopt_instr,
                                            object_table_,
                                            &func);
+      *code = func.unoptimized_code();
       return func.raw();
     }
   }
   index_ = -1;
   return Function::null();
 }
 
 }  // namespace dart