- Make sure to not skip frames too early.

runtime/vm/debugger.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/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 931 matching lines @@
   ActivationFrame* callee_activation = NULL;
   bool optimized_frame_found = false;
   for (StackFrame* frame = iterator.NextFrame();
        frame != NULL;
        frame = iterator.NextFrame()) {
     ASSERT(frame->IsValid());
     if (frame->IsDartFrame()) {
       code = frame->LookupDartCode();
       ActivationFrame* activation =
           new ActivationFrame(frame->pc(), frame->fp(), frame->sp(), code);
-      // Check if frame is a debuggable function.
-      if (!IsDebuggable(activation->function())) {
-        continue;
-      }
       // If this activation frame called a closure, the function has
       // saved its context before the call.
       if ((callee_activation != NULL) &&
           (callee_activation->function().IsClosureFunction())) {
         ctx = activation->GetSavedCurrentContext();
         if (FLAG_verbose_debug && ctx.IsNull()) {
           const Function& caller = activation->function();
           const Function& callee = callee_activation->function();
           const Script& script =
               Script::Handle(Class::Handle(caller.Owner()).script());
           intptr_t line, col;
           script.GetTokenLocation(activation->TokenPos(), &line, &col);
           OS::Print("CollectStackTrace error: no saved context in function "
               "'%s' which calls closure '%s' "
               " in line %"Pd" column %"Pd"\n",
               caller.ToFullyQualifiedCString(),
               callee.ToFullyQualifiedCString(),
               line, col);
         }
-        ASSERT(!ctx.IsNull());
       }
       if (optimized_frame_found || code.is_optimized()) {
         // Set context to null, to avoid returning bad context variable values.
         activation->SetContext(Context::Handle());
         optimized_frame_found = true;
       } else {
+        ASSERT(!ctx.IsNull());
         activation->SetContext(ctx);
       }
-      stack_trace->AddActivation(activation);
+      // Check if frame is a debuggable function.
+      if (IsDebuggable(activation->function())) {
+        stack_trace->AddActivation(activation);
+      }
       callee_activation = activation;
       // Get caller's context if this function saved it on entry.
       ctx = activation->GetSavedEntryContext(ctx);
     } else if (frame->IsEntryFrame()) {
       ctx = reinterpret_cast<EntryFrame*>(frame)->SavedContext();
       callee_activation = NULL;
     }
   }
   return stack_trace;
 }
@@ skipping 869 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart