Change how debugger handles source breakpoints

runtime/vm/debugger.h

 // 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.
 
 #ifndef VM_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "include/dart_debugger_api.h"
 
 #include "vm/object.h"
 #include "vm/port.h"
 
 namespace dart {
 
 class ActiveVariables;
 class CodeBreakpoint;
 class Isolate;
 class JSONArray;
 class JSONStream;
 class ObjectPointerVisitor;
 class RemoteObjectCache;
 class SourceBreakpoint;
 class StackFrame;
 
 // SourceBreakpoint represents a user-specified breakpoint location in
 // Dart source. There may be more than one CodeBreakpoint object per
 // SourceBreakpoint.
 class SourceBreakpoint {
  public:
-  SourceBreakpoint(intptr_t id, const Function& func, intptr_t token_pos);
+  SourceBreakpoint(intptr_t id, const Script& script, intptr_t token_pos);
 
   RawFunction* function() const { return function_; }
   intptr_t token_pos() const { return token_pos_; }
-  void set_token_pos(intptr_t value) { token_pos_ = value; }
   intptr_t id() const { return id_; }
 
-  RawScript* SourceCode();
+  RawScript* script() { return script_; }
   RawString* SourceUrl();
   intptr_t LineNumber();
 
-  void GetCodeLocation(Library* lib,
-                       Script* script,
-                       intptr_t* token_pos) const;
+  void GetCodeLocation(Library* lib, Script* script, intptr_t* token_pos);
 
   void Enable();
   void Disable();
   bool IsEnabled() const { return is_enabled_; }
+  bool IsResolved() { return is_resolved_; }
 
-  void PrintToJSONStream(JSONStream* stream) const;
+  void PrintToJSONStream(JSONStream* stream);
 
  private:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
-  void set_function(const Function& func);
+  void SetResolved(const Function& func, intptr_t token_pos);
   void set_next(SourceBreakpoint* value) { next_ = value; }
   SourceBreakpoint* next() const { return this->next_; }
 
   const intptr_t id_;
+  RawScript* script_;
+  intptr_t token_pos_;
+  bool is_resolved_;
+  bool is_enabled_;
+  SourceBreakpoint* next_;
+
+  // Valid for resolved breakpoints:
   RawFunction* function_;
-  intptr_t token_pos_;
   intptr_t line_number_;
-  bool is_enabled_;
-
-  SourceBreakpoint* next_;
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(SourceBreakpoint);
 };
 
 
 // CodeBreakpoint represents a location in compiled code. There may be
 // more than one CodeBreakpoint for one SourceBreakpoint, e.g. when a
 // function gets compiled as a regular function and as a closure.
 class CodeBreakpoint {
@@ skipping 296 matching lines @@
   static bool IsDebuggable(const Function& func);
 
  private:
   enum ResumeAction {
     kContinue,
     kStepOver,
     kStepOut,
     kSingleStep
   };
 
+  void FindEquivalentFunctions(const Script& script,
+                               intptr_t start_pos,
+                               intptr_t end_pos,
+                               GrowableObjectArray* function_list);
+  RawFunction* FindBestFit(const Script& script, intptr_t token_pos);
+  RawFunction* FindInnermostClosure(const Function& function,
+                                    intptr_t token_pos);
   intptr_t ResolveBreakpointPos(const Function& func,
-                                intptr_t first_token_pos,
-                                intptr_t last_token_pos);
+                                intptr_t requested_token_pos);
   void DeoptimizeWorld();
   void InstrumentForStepping(const Function& target_function);
+  SourceBreakpoint* SetBreakpoint(const Script& script, intptr_t token_pos);
   SourceBreakpoint* SetBreakpoint(const Function& target_function,
                                   intptr_t first_token_pos,
                                   intptr_t last_token_pos);
   void RemoveInternalBreakpoints();
   void UnlinkCodeBreakpoints(SourceBreakpoint* src_bpt);
   void RegisterSourceBreakpoint(SourceBreakpoint* bpt);
   void RegisterCodeBreakpoint(CodeBreakpoint* bpt);
-  SourceBreakpoint* GetSourceBreakpoint(const Function& func,
+  SourceBreakpoint* GetSourceBreakpoint(const Script& script,
                                         intptr_t token_pos);
   void MakeCodeBreakpointsAt(const Function& func,
-                             intptr_t token_pos,
                              SourceBreakpoint* bpt);
   // Returns NULL if no breakpoint exists for the given address.
   CodeBreakpoint* GetCodeBreakpoint(uword breakpoint_address);
 
   void SyncBreakpoint(SourceBreakpoint* bpt);
 
   ActivationFrame* TopDartFrame() const;
   static ActivationFrame* CollectDartFrame(Isolate* isolate,
                                            uword pc,
                                            StackFrame* frame,
@@ skipping 61 matching lines @@
 
   friend class Isolate;
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_