VM: Treat dynamic calls consistently in the treeshaker.

runtime/vm/precompiler.cc

 // Copyright (c) 2015, 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/precompiler.h"
 
 #include "vm/aot_optimizer.h"
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/branch_optimizer.h"
@@ skipping 823 matching lines @@
   MegamorphicCache& cache = MegamorphicCache::Handle(Z);
   String& selector = String::Handle(Z);
   Field& field = Field::Handle(Z);
   Class& cls = Class::Handle(Z);
   Instance& instance = Instance::Handle(Z);
   Code& target_code = Code::Handle(Z);
   for (intptr_t i = 0; i < pool.Length(); i++) {
     if (pool.InfoAt(i) == ObjectPool::kTaggedObject) {
       entry = pool.ObjectAt(i);
       if (entry.IsICData()) {
+        // A dynamic call.
         call_site ^= entry.raw();
-        for (intptr_t j = 0; j < call_site.NumberOfChecks(); j++) {
-          target = call_site.GetTargetAt(j);
-          AddFunction(target);
-          if (!target.is_static()) {
-            // Super call (should not enqueue selector) or dynamic call with a
-            // CHA prediction (should enqueue selector).
-            selector = call_site.target_name();
-            AddSelector(selector);
-          }
-        }
-        if (call_site.NumberOfChecks() == 0) {
-          // A dynamic call.
-          selector = call_site.target_name();
-          AddSelector(selector);
-          if (selector.raw() == Symbols::Call().raw()) {
-            // Potential closure call.
-            AddClosureCall(call_site);
-          }
+        ASSERT(!call_site.is_static_call());
+        selector = call_site.target_name();
+        AddSelector(selector);
+        if (selector.raw() == Symbols::Call().raw()) {
+          // Potential closure call.
+          const Array& arguments_descriptor =
+              Array::Handle(Z, call_site.arguments_descriptor());
+          AddClosureCall(arguments_descriptor);
         }
       } else if (entry.IsMegamorphicCache()) {
         // A dynamic call.
         cache ^= entry.raw();
         selector = cache.target_name();
         AddSelector(selector);
+        if (selector.raw() == Symbols::Call().raw()) {
+          // Potential closure call.
+          const Array& arguments_descriptor =
+              Array::Handle(Z, cache.arguments_descriptor());
+          AddClosureCall(arguments_descriptor);
+        }
       } else if (entry.IsField()) {
         // Potential need for field initializer.
         field ^= entry.raw();
         AddField(field);
       } else if (entry.IsInstance()) {
         // Const object, literal or args descriptor.
         instance ^= entry.raw();
         if (entry.IsAbstractType()) {
           AddType(AbstractType::Cast(entry));
         } else {
@@ skipping 182 matching lines @@
    private:
     Precompiler* precompiler_;
     Object& subinstance_;
   };
 
   ConstObjectVisitor visitor(this, I);
   instance.raw()->VisitPointers(&visitor);
 }
 
 
-void Precompiler::AddClosureCall(const ICData& call_site) {
-  const Array& arguments_descriptor =
-      Array::Handle(Z, call_site.arguments_descriptor());
+void Precompiler::AddClosureCall(const Array& arguments_descriptor) {
   const Class& cache_class =
       Class::Handle(Z, I->object_store()->closure_class());
   const Function& dispatcher = Function::Handle(
       Z, cache_class.GetInvocationDispatcher(
              Symbols::Call(), arguments_descriptor,
              RawFunction::kInvokeFieldDispatcher, true /* create_if_absent */));
   AddFunction(dispatcher);
 }
 
 
@@ skipping 2209 matching lines @@
 
   ASSERT(FLAG_precompiled_mode);
   const bool optimized = function.IsOptimizable();  // False for natives.
   DartPrecompilationPipeline pipeline(zone, field_type_map);
   return PrecompileFunctionHelper(precompiler, &pipeline, function, optimized);
 }
 
 #endif  // DART_PRECOMPILER
 
 }  // namespace dart