AOT: Optimize even large functions. Ensures all calls are optimized static calls, switchable calls …

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 1892 matching lines @@
   // Now that all functions have been compiled, we can switch to an instance
   // call sequence that loads the Code object and entry point directly from
   // the ic data array instead indirectly through a Function in the ic data
   // array. Iterate all the object pools and rewrite the ic data from
   // (cid, target function, count) to (cid, target code, entry point), and
   // replace the ICLookupThroughFunction stub with ICLookupThroughCode.
 
   class SwitchICCallsVisitor : public FunctionVisitor {
    public:
     explicit SwitchICCallsVisitor(Zone* zone) :
+        zone_(zone),
         code_(Code::Handle(zone)),
         pool_(ObjectPool::Handle(zone)),
         entry_(Object::Handle(zone)),
         ic_(ICData::Handle(zone)),
-        target_(Function::Handle(zone)),
-        target_code_(Code::Handle(zone)),
-        entry_point_(Smi::Handle(zone)) {
+        target_code_(Code::Handle(zone)) {
     }
 
     void Visit(const Function& function) {
       if (!function.HasCode()) {
         return;
       }
 
       code_ = function.CurrentCode();
       pool_ = code_.object_pool();
       for (intptr_t i = 0; i < pool_.Length(); i++) {
         if (pool_.InfoAt(i) != ObjectPool::kTaggedObject) continue;
         entry_ = pool_.ObjectAt(i);
         if (entry_.IsICData()) {
+          // The only IC calls generated by precompilation are for switchable
+          // calls.
           ic_ ^= entry_.raw();
-
-          if (ic_.NumArgsTested() != 1) continue;
-
-          for (intptr_t j = 0; j < ic_.NumberOfChecks(); j++) {
-            entry_ = ic_.GetTargetOrCodeAt(j);
-            if (entry_.IsFunction()) {
-              target_ ^= entry_.raw();
-              ASSERT(target_.HasCode());
-              target_code_ = target_.CurrentCode();
-              entry_point_ =
-                  Smi::FromAlignedAddress(target_code_.UncheckedEntryPoint());
-              ic_.SetCodeAt(j, target_code_);
-              ic_.SetEntryPointAt(j, entry_point_);
-            } else {
-              // We've already seen and switched this ICData.
-              ASSERT(entry_.IsCode());
-            }
-          }
+          ic_.ResetSwitchable(zone_);
         } else if (entry_.raw() ==
                    StubCode::ICLookupThroughFunction_entry()->code()) {
           target_code_ = StubCode::ICLookupThroughCode_entry()->code();
           pool_.SetObjectAt(i, target_code_);
         }
       }
     }
 
    private:
+    Zone* zone_;
     Code& code_;
     ObjectPool& pool_;
     Object& entry_;
     ICData& ic_;
-    Function& target_;
     Code& target_code_;
-    Smi& entry_point_;
   };
 
   ASSERT(!I->compilation_allowed());
   SwitchICCallsVisitor visitor(Z);
   VisitFunctions(&visitor);
 #endif
 }
 
 
 void Precompiler::DedupStackmaps() {
@@ skipping 969 matching lines @@
       CompilationPipeline::New(thread->zone(), function);
 
   ASSERT(FLAG_precompiled_mode);
   const bool optimized = function.IsOptimizable();  // False for natives.
   return PrecompileFunctionHelper(pipeline, function, optimized);
 }
 
 #endif  // DART_PRECOMPILER
 
 }  // namespace dart