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

runtime/vm/flow_graph_inliner.cc

 // Copyright (c) 2013, 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/flow_graph_inliner.h"
 
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 1081 matching lines @@
       if (inlined_variants_[i].cid == kSmiCid) {
         CheckSmiInstr* check_smi =
             new CheckSmiInstr(new Value(redefinition), call_->deopt_id());
         check_smi->InheritDeoptTarget(call_);
         cursor = AppendInstruction(cursor, check_smi);
       } else {
         const ICData& old_checks = call_->ic_data();
         const ICData& new_checks = ICData::ZoneHandle(
             ICData::New(Function::Handle(old_checks.function()),
                         String::Handle(old_checks.target_name()),
+                        Array::Handle(old_checks.arguments_descriptor()),
                         old_checks.deopt_id(),
                         1));  // Number of args tested.
         new_checks.AddReceiverCheck(inlined_variants_[i].cid,
                                     *inlined_variants_[i].target);
         CheckClassInstr* check_class =
             new CheckClassInstr(new Value(redefinition),
                                 call_->deopt_id(),
                                 new_checks);
         check_class->InheritDeoptTarget(call_);
         cursor = AppendInstruction(cursor, check_class);
@@ skipping 104 matching lines @@
       PushArgumentInstr* push = call_->PushArgumentAt(i);
       push->ReplaceUsesWith(push->value()->definition());
       push->previous()->LinkTo(push->next());
       cursor->LinkTo(push);
       cursor = push;
     }
     const ICData& old_checks = call_->ic_data();
     const ICData& new_checks = ICData::ZoneHandle(
         ICData::New(Function::Handle(old_checks.function()),
                     String::Handle(old_checks.target_name()),
+                    Array::Handle(old_checks.arguments_descriptor()),
                     old_checks.deopt_id(),
                     1));  // Number of args tested.
     for (intptr_t i = 0; i < non_inlined_variants_.length(); ++i) {
       new_checks.AddReceiverCheck(non_inlined_variants_[i].cid,
                                   *non_inlined_variants_[i].target,
                                   non_inlined_variants_[i].count);
     }
     PolymorphicInstanceCallInstr* fallback_call =
         new PolymorphicInstanceCallInstr(call_->instance_call(),
                                          new_checks,
@@ skipping 105 matching lines @@
         OS::Print("After Inlining of %s\n", flow_graph_->
                   parsed_function().function().ToFullyQualifiedCString());
         FlowGraphPrinter printer(*flow_graph_);
         printer.PrintBlocks();
       }
     }
   }
 }
 
 }  // namespace dart