Get rid of dynamic call debug stub

runtime/vm/debugger_ia32.cc

 // Copyright (c) 2011, 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/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/debugger.h"
 
 #include "vm/code_patcher.h"
@@ skipping 27 matching lines @@
 
 
 uword CodeBreakpoint::OrigStubAddress() const {
   return saved_value_;
 }
 
 
 void CodeBreakpoint::PatchCode() {
   ASSERT(!is_enabled_);
   switch (breakpoint_kind_) {
-    case PcDescriptors::kIcCall: {
-      const Code& code =
-          Code::Handle(Function::Handle(function_).unoptimized_code());
-      saved_value_ = CodePatcher::GetInstanceCallAt(pc_, code, NULL);
-      CodePatcher::PatchInstanceCallAt(pc_, code,
-                                       StubCode::BreakpointDynamicEntryPoint());
-      break;
-    }
+    case PcDescriptors::kIcCall:
     case PcDescriptors::kUnoptStaticCall:
     case PcDescriptors::kRuntimeCall:
     case PcDescriptors::kClosureCall:
     case PcDescriptors::kReturn: {
       const Code& code =
           Code::Handle(Function::Handle(function_).unoptimized_code());

[zra, 2014/01/24 16:09:17]

In general, unoptimized code can be disconnected from the function and GC'd.
Even if you know there's another reference to the code other than through the
function, it can be good to add an assert that the code is still around, just in
case.

       saved_value_ = CodePatcher::GetStaticCallTargetAt(pc_, code);
       CodePatcher::PatchStaticCallAt(pc_, code,
                                      StubCode::BreakpointRuntimeEntryPoint());
       break;
     }
     default:
       UNREACHABLE();
   }
   is_enabled_ = true;
 }
 
 
 void CodeBreakpoint::RestoreCode() {
   ASSERT(is_enabled_);
   switch (breakpoint_kind_) {
-    case PcDescriptors::kIcCall: {
-      const Code& code =
-          Code::Handle(Function::Handle(function_).unoptimized_code());
-      CodePatcher::PatchInstanceCallAt(pc_, code, saved_value_);
-      break;
-    }
+    case PcDescriptors::kIcCall:
     case PcDescriptors::kUnoptStaticCall:
     case PcDescriptors::kClosureCall:
     case PcDescriptors::kRuntimeCall:
     case PcDescriptors::kReturn: {
       const Code& code =
           Code::Handle(Function::Handle(function_).unoptimized_code());

[zra, 2014/01/24 16:09:17]

Here, and etc.

       CodePatcher::PatchStaticCallAt(pc_, code, saved_value_);
       break;
     }
     default:
       UNREACHABLE();
   }
   is_enabled_ = false;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32