Temporary fix for GrowableArray type arguments: use the type arguments stores in GrowableArray inst…

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 462 matching lines @@
       if (!tp_argument.IsType()) {
         // E.g, it is TypeParameter.
         return;
       }
       ASSERT(tp_argument.HasResolvedTypeClass());
     }
   }
   AbstractTypeArguments& instance_type_arguments =
       AbstractTypeArguments::Handle();
   const Class& instance_class = Class::Handle(instance.clazz());
+  AbstractTypeArguments& original_instance_type_arguments =
+      AbstractTypeArguments::Handle();
   if (instance_class.HasTypeArguments()) {
+    original_instance_type_arguments = instance.GetTypeArguments();
     OptimizeTypeArguments(instance);
     instance_type_arguments = instance.GetTypeArguments();
   }
 
   DartFrameIterator iterator;
   StackFrame* caller_frame = iterator.NextFrame();
   ASSERT(caller_frame != NULL);
   const Code& code = Code::Handle(caller_frame->LookupDartCode());
   ASSERT(!code.IsNull());
   uword loc = code.GetTypeTestAtNodeId(node_id);
   if (loc != 0) {
     // Found type test cache.
     Array& cache = Array::Handle(CodePatcher::GetTypeTestArray(loc));
     // TODO(srdjan): Prevent type test cache from growing too much, it has been
     // observed to grow to 100 elements.
     // Don't enter duplicate entries.
     // TODO(srdjan): Check instantiator type arguments as well.
     Object& last_instance_class = Object::Handle();
     Object& last_instance_type_arguments = Object::Handle();
+    // Check for duplicate entries (can happen if we optimized type arguments
+    // above).
     for (intptr_t i = 0; i < cache.Length();
          i += SubTypeTestCache::kNumEntries) {
       last_instance_class = cache.At(i + SubTypeTestCache::kInstanceClass);
       last_instance_type_arguments =
           cache.At(i + SubTypeTestCache::kInstanceTypeArguments);
       if ((last_instance_class.raw() == instance_class.raw()) &&
           (last_instance_type_arguments.raw() ==
               instance_type_arguments.raw())) {
-        if (FLAG_trace_type_checks) {
+        if (FLAG_trace_type_checks &&
+            (original_instance_type_arguments.raw() ==
+             instance_type_arguments.raw())) {
           PrintTypeCheck("WARNING duplicate cache entry", instance, type,
               type_instantiator, result);
         }
         return;
       }
     }
 
     // Array must be null terminated.
     ASSERT(last_instance_class.IsNull());
     ASSERT(!cache.IsNull());
@@ skipping 1042 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart