Never erase parameter types in the JIT.

runtime/vm/program_visitor.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/program_visitor.h"
 
 #include "vm/deopt_instructions.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/hash_map.h"
@@ skipping 418 matching lines @@
     return true;
   }
 };
 
 typedef DirectChainedHashMap<ArrayKeyValueTrait> ArraySet;
 
 
 void ProgramVisitor::DedupLists() {
   class DedupListsVisitor : public FunctionVisitor {
    public:
-    DedupListsVisitor(Isolate* isolate, Zone* zone)
-        : isolate_(isolate),
-          zone_(zone),
+    explicit DedupListsVisitor(Zone* zone)
+        : zone_(zone),
           canonical_lists_(),
           code_(Code::Handle(zone)),
           list_(Array::Handle(zone)) {}
 
     void Visit(const Function& function) {
       code_ = function.CurrentCode();
       if (!code_.IsNull()) {
         list_ = code_.stackmaps();
         if (!list_.IsNull()) {
           list_ = DedupList(list_);
@@ skipping 18 matching lines @@
 #endif  // !PRODUCT
         list_ = code_.static_calls_target_table();
         if (!list_.IsNull()) {
           list_ = DedupList(list_);
           code_.set_static_calls_target_table(list_);
         }
       }
 
       list_ = function.parameter_types();
       if (!list_.IsNull()) {
-        // Preserve parameter types in case of recompilation in JIT checked
-        // mode, or if available to mirrors.
-        if (FLAG_precompiled_mode ||
-            (!FLAG_enable_mirrors && !isolate_->type_checks())) {
+        // Preserve parameter types in the JIT. Needed in case of recompilation
+        // in checked mode, or if available to mirrors, or for copied types to
+        // lazily generated tear offs.
+        if (FLAG_precompiled_mode) {
           if (!function.IsSignatureFunction() &&
               !function.IsClosureFunction() &&
               (function.name() != Symbols::Call().raw()) && !list_.InVMHeap()) {
             // Parameter types not needed for function type tests.
             for (intptr_t i = 0; i < list_.Length(); i++) {
               list_.SetAt(i, Object::dynamic_type());
             }
           }
         }
         list_ = DedupList(list_);
@@ skipping 20 matching lines @@
       const Array* canonical_list = canonical_lists_.LookupValue(&list);
       if (canonical_list == NULL) {
         canonical_lists_.Insert(&Array::ZoneHandle(zone_, list.raw()));
         return list.raw();
       } else {
         return canonical_list->raw();
       }
     }
 
    private:
-    Isolate* isolate_;
     Zone* zone_;
     ArraySet canonical_lists_;
     Code& code_;
     Array& list_;
   };
 
-  Thread* thread = Thread::Current();
-  DedupListsVisitor visitor(thread->isolate(), thread->zone());
+  DedupListsVisitor visitor(Thread::Current()->zone());
   ProgramVisitor::VisitFunctions(&visitor);
 }
 
 
 class InstructionsKeyValueTrait {
  public:
   // Typedefs needed for the DirectChainedHashMap template.
   typedef const Instructions* Key;
   typedef const Instructions* Value;
   typedef const Instructions* Pair;
@@ skipping 16 matching lines @@
   class DedupInstructionsVisitor : public FunctionVisitor {
    public:
     explicit DedupInstructionsVisitor(Zone* zone)
         : zone_(zone),
           canonical_instructions_set_(),
           code_(Code::Handle(zone)),
           instructions_(Instructions::Handle(zone)) {}
 
     void Visit(const Function& function) {
       if (!function.HasCode()) {
-        ASSERT(function.HasImplicitClosureFunction());
         return;
       }
       code_ = function.CurrentCode();
       instructions_ = code_.instructions();
       instructions_ = DedupOneInstructions(instructions_);
       code_.SetActiveInstructions(instructions_);
       code_.set_instructions(instructions_);
       function.SetInstructions(code_);  // Update cached entry point.
     }
 
@@ skipping 35 matching lines @@
   DedupCodeSourceMaps();
   DedupLists();
 
   if (!FLAG_profiler) {
     // Reduces binary size but obfuscates profiler results.
     DedupInstructions();
   }
 }
 
 }  // namespace dart