Store arguments descriptor in ICData. Remove loading of arguments descriptor at unoptimized call si…

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 640 matching lines @@
 }
 
 
 void CodeBreakpoint::PatchCode() {
   ASSERT(!is_enabled_);
   switch (breakpoint_kind_) {
     case PcDescriptors::kIcCall: {
       const Code& code =
           Code::Handle(Function::Handle(function_).unoptimized_code());
       saved_bytes_.target_address_ =
-          CodePatcher::GetInstanceCallAt(pc_, code, NULL, NULL);
+          CodePatcher::GetInstanceCallAt(pc_, code, NULL);
       CodePatcher::PatchInstanceCallAt(pc_, code,
                                        StubCode::BreakpointDynamicEntryPoint());
       break;
     }
     case PcDescriptors::kFuncCall: {
       const Code& code =
           Code::Handle(Function::Handle(function_).unoptimized_code());
       saved_bytes_.target_address_ =
           CodePatcher::GetStaticCallTargetAt(pc_, code);
       CodePatcher::PatchStaticCallAt(pc_, code,
@@ skipping 886 matching lines @@
         ActivationFrame* caller_frame = stack_trace->ActivationFrameAt(1);
         func_to_instrument = caller_frame->function().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();
       ICData& ic_data = ICData::Handle();
-      Array& descriptor = Array::Handle();
       const Code& code =
           Code::Handle(Function::Handle(bpt->function_).unoptimized_code());
-      CodePatcher::GetInstanceCallAt(bpt->pc_, code, &ic_data, &descriptor);
-      ArgumentsDescriptor args_descriptor(descriptor);
+      CodePatcher::GetInstanceCallAt(bpt->pc_, code, &ic_data);
+      ArgumentsDescriptor
+          args_descriptor(Array::Handle(ic_data.arguments_descriptor()));
       ActivationFrame* top_frame = stack_trace->ActivationFrameAt(0);
       intptr_t num_args = args_descriptor.Count();
       Instance& receiver =
           Instance::Handle(top_frame->GetInstanceCallReceiver(num_args));
       Code& target_code =
-          Code::Handle(ResolveCompileInstanceCallTarget(receiver,
-                                                        ic_data,
-                                                        descriptor));
+          Code::Handle(ResolveCompileInstanceCallTarget(receiver, ic_data));
       if (!target_code.IsNull()) {
         Function& callee = Function::Handle(target_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 245 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart