Set BP in closurized function if necessary

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 938 matching lines @@
                                           intptr_t first_token_pos,
                                           intptr_t last_token_pos) {
   if ((last_token_pos < target_function.token_pos()) ||
       (target_function.end_token_pos() < first_token_pos)) {
     // The given token position is not within the target function.
     return NULL;
   }
   EnsureFunctionIsDeoptimized(target_function);
 
   CodeBreakpoint* cbpt = NULL;
-  SourceBreakpoint* bpt = NULL;
+  SourceBreakpoint* source_bpt = NULL;
   if (target_function.HasCode()) {
     cbpt = MakeCodeBreakpoint(target_function, first_token_pos, last_token_pos);
     if (cbpt != NULL) {
       if (cbpt->src_bpt() != NULL) {
         // There is already a source breakpoint for the location.
         ASSERT(cbpt->src_bpt() ==
                GetSourceBreakpoint(target_function, cbpt->token_pos()));
         return cbpt->src_bpt();
       }
       // No source breakpoint exists yet that is associated with the code
       // breakpoint we found. (This is an internal breakpoint.) Adjust
       // the breakpoint location to the actual position where breakpoint
       // got set.
       first_token_pos = cbpt->token_pos();
     }
   } else {
-    bpt = GetSourceBreakpoint(target_function, first_token_pos);
-    if (bpt != NULL) {
+    source_bpt = GetSourceBreakpoint(target_function, first_token_pos);
+    if (source_bpt != NULL) {
       // A source breakpoint for this uncompiled location already
       // exists.
-      return bpt;
+      return source_bpt;
     }
   }
-  bpt = new SourceBreakpoint(nextId(), target_function, first_token_pos);
-  RegisterSourceBreakpoint(bpt);
+  source_bpt = new SourceBreakpoint(nextId(), target_function, first_token_pos);
+  RegisterSourceBreakpoint(source_bpt);
   if (FLAG_verbose_debug && !target_function.HasCode()) {
     OS::Print("Registering breakpoint for "
               "uncompiled function '%s' at line %"Pd"\n",
               target_function.ToFullyQualifiedCString(),
-              bpt->LineNumber());
+              source_bpt->LineNumber());
   }
 
   if (cbpt != NULL) {
     ASSERT(cbpt->src_bpt() == NULL);
-    cbpt->set_src_bpt(bpt);
-    SignalBpResolved(bpt);
+    cbpt->set_src_bpt(source_bpt);
+    SignalBpResolved(source_bpt);
   } else {
     if (FLAG_verbose_debug) {
       OS::Print("Failed to set breakpoint at '%s' line %"Pd"\n",
-                String::Handle(bpt->SourceUrl()).ToCString(),
-                bpt->LineNumber());
+                String::Handle(source_bpt->SourceUrl()).ToCString(),
+                source_bpt->LineNumber());
     }
   }
-  bpt->Enable();
-  return bpt;
+
+  if (target_function.implicit_closure_function() != Function::null()) {

[regis, 2012/12/05 22:54:34]

You use implicit_closure_function() and ImplicitClosureFunction(), which also
creates one. How about renaming the new implicit_closure_function() to
HasImplicitClosureFunction() and making it return a boolean?

[hausner, 2012/12/05 23:04:13]

Done.

+    // There is a closureized version of this function. If the closure

[regis, 2012/12/05 22:54:34]

closurized

[hausner, 2012/12/05 23:04:13]

Done.

+    // is already compiled, we need to set a code breakpoint in its
+    // code.
+    const Function& closure =
+        Function::Handle(target_function.ImplicitClosureFunction());
+    if (closure.HasCode()) {
+      CodeBreakpoint* closure_bpt =
+          MakeCodeBreakpoint(closure, first_token_pos, last_token_pos);
+      if ((closure_bpt != NULL) && (closure_bpt->src_bpt() == NULL)) {
+        closure_bpt->set_src_bpt(source_bpt);
+      }
+    }
+  }
+  source_bpt->Enable();
+  return source_bpt;
 }
 
 
 // Synchronize the enabled/disabled state of all code breakpoints
 // associated with the source breakpoint bpt.
 void Debugger::SyncBreakpoint(SourceBreakpoint* bpt) {
   CodeBreakpoint* cbpt = code_breakpoints_;
   while (cbpt != NULL) {
     if (bpt == cbpt->src_bpt()) {
       if (bpt->IsEnabled()) {
@@ skipping 602 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart