- Support for patching of class methods and fields.

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 "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 51 matching lines @@
 
 
 void SourceBreakpoint::Disable() {
   is_enabled_ = false;
   Isolate::Current()->debugger()->SyncBreakpoint(this);
 }
 
 
 RawScript* SourceBreakpoint::SourceCode() {
   const Function& func = Function::Handle(function_);
-  const Class& cls = Class::Handle(func.owner());
-  return cls.script();
+  return func.script();
 }
 
 
 RawString* SourceBreakpoint::SourceUrl() {
   const Script& script = Script::Handle(SourceCode());
   return script.url();
 }
 
 
 intptr_t SourceBreakpoint::LineNumber() {
@@ skipping 45 matching lines @@
     ASSERT(isolate != NULL);
     const Code& code = Code::Handle(Code::LookupCode(pc_));
     function_ = code.function();
   }
   return function_;
 }
 
 
 const char* Debugger::QualifiedFunctionName(const Function& func) {
   const String& func_name = String::Handle(func.name());
-  Class& func_class = Class::Handle(func.owner());
+  Class& func_class = Class::Handle(func.Owner());
   String& class_name = String::Handle(func_class.Name());
 
   const char* kFormat = "%s%s%s";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat,
       func_class.IsTopLevel() ? "" : class_name.ToCString(),
       func_class.IsTopLevel() ? "" : ".",
       func_name.ToCString());
   len++;  // String terminator.
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat,
@@ skipping 11 matching lines @@
 
 
 RawString* ActivationFrame::SourceUrl() {
   const Script& script = Script::Handle(SourceScript());
   return script.url();
 }
 
 
 RawScript* ActivationFrame::SourceScript() {
   const Function& func = DartFunction();
-  const Class& cls = Class::Handle(func.owner());
-  return cls.script();
+  return func.script();
 }
 
 
 RawLibrary* ActivationFrame::Library() {
   const Function& func = DartFunction();
-  const Class& cls = Class::Handle(func.owner());
+  const Class& cls = Class::Handle(func.Owner());
   return cls.library();
 }
 
 
 void ActivationFrame::GetPcDescriptors() {
   if (pc_desc_.IsNull()) {
     const Function& func = DartFunction();
     ASSERT(!func.HasOptimizedCode());
     Code& code = Code::Handle(func.unoptimized_code());
     ASSERT(!code.IsNull());
@@ skipping 292 matching lines @@
   pc_ = 0ul;
   src_bpt_ = NULL;
   next_ = NULL;
   breakpoint_kind_ = PcDescriptors::kOther;
 #endif
 }
 
 
 RawScript* CodeBreakpoint::SourceCode() {
   const Function& func = Function::Handle(function_);
-  const Class& cls = Class::Handle(func.owner());
-  return cls.script();
+  return func.script();
 }
 
 
 RawString* CodeBreakpoint::SourceUrl() {
   const Script& script = Script::Handle(SourceCode());
   return script.url();
 }
 
 
 intptr_t CodeBreakpoint::LineNumber() {
@@ skipping 765 matching lines @@
 }
 
 
 bool Debugger::IsDebuggable(const Function& func) {
   RawFunction::Kind fkind = func.kind();
   if ((fkind == RawFunction::kImplicitGetter) ||
       (fkind == RawFunction::kImplicitSetter) ||
       (fkind == RawFunction::kConstImplicitGetter)) {
     return false;
   }
-  const Class& cls = Class::Handle(func.owner());
+  const Class& cls = Class::Handle(func.Owner());
   const Library& lib = Library::Handle(cls.library());
   return lib.IsDebuggable();
 }
 
 
 void Debugger::SignalBpReached() {
   if (ignore_breakpoints_) {
     return;
   }
   DebuggerStackTrace* stack_trace = CollectStackTrace();
@@ skipping 130 matching lines @@
     // there are any breakpoints. The parent function is the actual method on
     // which the user sets breakpoints.
     lookup_function = func.parent_function();
     ASSERT(!lookup_function.IsNull());
   }
   SourceBreakpoint* bpt = src_breakpoints_;
   while (bpt != NULL) {
     if (lookup_function.raw() == bpt->function()) {
       // Check if the breakpoint is inside a closure or local function
       // within the newly compiled function.
-      Class& owner = Class::Handle(lookup_function.owner());
+      Class& owner = Class::Handle(lookup_function.Owner());
       Function& closure =
           Function::Handle(owner.LookupClosureFunction(bpt->token_pos()));
       if (!closure.IsNull() && (closure.raw() != lookup_function.raw())) {
         if (verbose) {
           OS::Print("Resetting pending breakpoint to function %s\n",
                     closure.ToFullyQualifiedCString());
         }
         bpt->set_function(closure);
       } else {
         if (verbose) {
@@ skipping 128 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart