Fixes a problem with the recovery of contexts in the debugger at closure calls.

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"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 #include "vm/raw_object.h"
 #include "vm/stub_code.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 
 bool StackFrame::IsStubFrame() const {
   ASSERT(!(IsEntryFrame() || IsExitFrame()));
   uword saved_pc =
       *(reinterpret_cast<uword*>(fp() + (kPcMarkerSlotFromFp * kWordSize)));
   return (saved_pc == 0);
 }
 
 
-void StackFrame::Print() const {
-  OS::Print("[%-8s : sp(%#" Px ") ]\n", GetName(), sp());
+const char* StackFrame::ToCString() const {
+  Zone* zone = Isolate::Current()->current_zone();
+  if (IsDartFrame()) {
+    const Code& code = Code::Handle(LookupDartCode());
+    ASSERT(!code.IsNull());
+    const Object& owner = Object::Handle(code.owner());
+    ASSERT(!owner.IsNull());
+    if (owner.IsFunction()) {
+      const Function& function = Function::Cast(owner);
+      return zone->PrintToString(
+          "[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px ") %s ]",
+          GetName(), sp(), fp(), pc(),
+          function.ToFullyQualifiedCString());
+    } else {
+      return zone->PrintToString(
+          "[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px ") %s ]",
+          GetName(), sp(), fp(), pc(),
+          owner.ToCString());
+    }
+  } else {
+    return zone->PrintToString(
+        "[%-8s : sp(%#" Px ") fp(%#" Px ") pc(%#" Px ")]",
+        GetName(), sp(), fp(), pc());
+  }
 }
 
 
 void ExitFrame::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   // There are no objects to visit in this frame.
 }
 
 
 RawContext* EntryFrame::SavedContext() const {
   return *(reinterpret_cast<RawContext**>(
@@ skipping 387 matching lines @@
     if (deopt_instr->kind() == DeoptInstr::kCallerFp) {
       return (index - num_materializations_);
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 }  // namespace dart