Pass IC data and arguments descriptor to IC miss runtime functions.

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 548 matching lines @@
     script.GetTokenLocation(token_pos_, &line_number_, &ignore_column);
   }
   return line_number_;
 }
 
 
 void CodeBreakpoint::PatchCode() {
   ASSERT(!is_enabled_);
   switch (breakpoint_kind_) {
     case PcDescriptors::kIcCall: {
-      int num_args, num_named_args;
-      CodePatcher::GetInstanceCallAt(pc_,
-          NULL, &num_args, &num_named_args,
-          &saved_bytes_.target_address_);
-      CodePatcher::PatchInstanceCallAt(
-          pc_, StubCode::BreakpointDynamicEntryPoint());
+      saved_bytes_.target_address_ =
+          CodePatcher::GetInstanceCallAt(pc_, NULL, NULL);
+      CodePatcher::PatchInstanceCallAt(pc_,
+                                       StubCode::BreakpointDynamicEntryPoint());
       break;
     }
     case PcDescriptors::kFuncCall: {
       saved_bytes_.target_address_ = CodePatcher::GetStaticCallTargetAt(pc_);
       CodePatcher::PatchStaticCallAt(pc_,
           StubCode::BreakpointStaticEntryPoint());
       break;
     }
     case PcDescriptors::kReturn:
       PatchFunctionReturn();
@@ skipping 793 matching lines @@
       if (stack_trace->Length() > 1) {
         ActivationFrame* caller_frame = stack_trace->ActivationFrameAt(1);
         func_to_instrument = caller_frame->DartFunction().raw();
       }
     }
   } else if (resume_action_ == kStepInto) {
     // If the call target is not debuggable, we treat StepInto like
     // a StepOver, that is we instrument the current function.
     if (bpt->breakpoint_kind_ == PcDescriptors::kIcCall) {
       func_to_instrument = bpt->function();
-      int num_args, num_named_args;
-      uword target;
-      CodePatcher::GetInstanceCallAt(bpt->pc_, NULL,
-          &num_args, &num_named_args, &target);
+      ICData& ic_data = ICData::Handle();
+      Array& descriptor = Array::Handle();
+      CodePatcher::GetInstanceCallAt(bpt->pc_, &ic_data, &descriptor);
+      ArgumentsDescriptor arg_descriptor(descriptor.raw());
       ActivationFrame* top_frame = stack_trace->ActivationFrameAt(0);
-      Instance& receiver = Instance::Handle(
-          top_frame->GetInstanceCallReceiver(num_args));
-      Code& code = Code::Handle(
-          ResolveCompileInstanceCallTarget(isolate_, receiver));
+      intptr_t num_args = arg_descriptor.Count();
+      Instance& receiver =
+          Instance::Handle(top_frame->GetInstanceCallReceiver(num_args));
+      Code& code =
+          Code::Handle(ResolveCompileInstanceCallTarget(receiver,
+                                                        ic_data,
+                                                        arg_descriptor));
       if (!code.IsNull()) {
         Function& callee = Function::Handle(code.function());
         if (IsDebuggable(callee)) {
           func_to_instrument = callee.raw();
         }
       }
     } else if (bpt->breakpoint_kind_ == PcDescriptors::kFuncCall) {
       func_to_instrument = bpt->function();
       const Code& code = Code::Handle(func_to_instrument.CurrentCode());
       const Function& callee =
@@ skipping 209 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart