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

runtime/vm/code_generator_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 1274 matching lines @@
   return &cls;
 }
 
 
 // Instance to test is in EAX. Test if its class is in subtype test cache array
 // and use the result in the array to jump to one of the labels. Fall through
 // if the instance is not in the cache array.
 // TODO(srdjan): Implement a quicker subtype check, as type test
 // arrays can grow too high, but they may be useful when optimizing
 // code (type-feedback).
-void CodeGenerator::GenerateSubtypeTestCacheLookup(intptr_t node_id,
-                                                   intptr_t token_index,
-                                                   const Class& type_class,
-                                                   Label* is_instance_lbl,
-                                                   Label* is_not_instance_lbl) {
+void CodeGenerator::GenerateSubtype1TestCacheLookup(
+    intptr_t node_id,
+    intptr_t token_index,
+    const Class& type_class,
+    Label* is_instance_lbl,
+    Label* is_not_instance_lbl) {
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label loop, found_in_cache, runtime_call;
   // Check immediate equality.
   __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
   // ECX: instance class.
   __ CompareObject(ECX, type_class);
   __ j(EQUAL, is_instance_lbl);
 
   // Check immediate superclass equality.
   __ movl(EDI, FieldAddress(ECX, Class::super_type_offset()));
   __ movl(EDI, FieldAddress(EDI, Type::type_class_offset()));
   __ CompareObject(EDI, type_class);
   __ j(EQUAL, is_instance_lbl);
 
-  // ECX: instance class.
-  // Insert subtype test cache into the code stream.
   AddCurrentDescriptor(PcDescriptors::kTypeTest, node_id, token_index);
   __ LoadObject(EDX, Array::ZoneHandle(
       Array::New(SubTypeTestCache::kNumEntries)));
-  // EDX: cache array.
-  __ addl(EDX, Immediate(Array::data_offset() - kHeapObjectTag));
-  __ Bind(&loop);
-  __ movl(EBX, Address(EDX, kWordSize * SubTypeTestCache::kInstanceClass));
-  __ cmpl(ECX, EBX);
-  __ j(EQUAL, &found_in_cache, Assembler::kNearJump);
-  __ addl(EDX, Immediate(kWordSize * SubTypeTestCache::kNumEntries));
-  __ cmpl(EBX, raw_null);
-  __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
-  __ jmp(&runtime_call, Assembler::kNearJump);
+  __ pushl(EDX);  // Cache array.
+  __ pushl(EAX);  // Instance.
+  __ pushl(raw_null);  // Unused
+  __ call(&StubCode::Subtype1TestCacheLabel());
+  __ popl(EAX);  // Discard.
+  __ popl(EAX);  // Restore receiver.
+  __ popl(EDX);  // Discard.
+  // Result is in ECX: null -> not found, otherwise Bool::True or Bool::False.
 
-  __ Bind(&found_in_cache);
-  __ movl(EDX, Address(EDX, kWordSize * SubTypeTestCache::kTestResult));
-  __ CompareObject(EDX, bool_true);
+  __ cmpl(ECX, raw_null);
+  __ j(EQUAL, &runtime_call, Assembler::kNearJump);
+  __ CompareObject(ECX, bool_true);
   __ j(EQUAL, is_instance_lbl);
   __ jmp(is_not_instance_lbl);
   __ Bind(&runtime_call);
 }
 
 
 // Inline tests according to the 'type' being tested. Jump to labels
 // if we can compute the type-test, otherwise fallthrough.
 // EAX: instance to be tested, must be preserved.
 // Clobbers many registers.
@@ skipping 15 matching lines @@
                                                 is_not_instance_lbl);
       // Fall through to runtime call.
     } else {
       GenerateInstantiatedTypeNoArgumentsTest(node_id,
                                               token_index,
                                               type,
                                               is_instance_lbl,
                                               is_not_instance_lbl);
       // If test non-conclusive so far, try the inlined type-test cache.
       // 'type' is known at compile time.
-      GenerateSubtypeTestCacheLookup(node_id, token_index, type_class,
-                                     is_instance_lbl, is_not_instance_lbl);
+      GenerateSubtype1TestCacheLookup(node_id, token_index, type_class,
+                                      is_instance_lbl, is_not_instance_lbl);
     }
   } else {
     GenerateUninstantiatedTypeTest(type,
                                    token_index,
                                    is_instance_lbl);
   }
 }
 
 
 // If instanceof type test cannot be performed successfully at compile time and
@@ skipping 137 matching lines @@
   if (is_raw_type) {
     // Dynamic type argument, check only classes.
     __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
     if (type.IsListInterface()) {
       // TODO(srdjan) also accept List<Object>.
       __ CompareObject(ECX, *CoreClass("ObjectArray"));
       __ j(EQUAL, is_instance_lbl);
       __ CompareObject(ECX, *CoreClass("GrowableObjectArray"));
       __ j(EQUAL, is_instance_lbl);
     }
-    GenerateSubtypeTestCacheLookup(node_id, token_index, type_class,
-                                   is_instance_lbl, is_not_instance_lbl);
+    GenerateSubtype1TestCacheLookup(node_id, token_index, type_class,
+                                    is_instance_lbl, is_not_instance_lbl);
     return;
   }
   // Note that the test below must be synced with the tests in
   // CodeGenerator::UpdateTestCache.
   // Inline checks for one type argument only.
   if (type_arguments.Length() != 1) {
     return;
   }
   const AbstractType& tp_argument =
       AbstractType::ZoneHandle(type_arguments.TypeAt(0));
   if (!tp_argument.IsType()) {
     // E.g., it is a TypeParameter.
     return;
   }
   // Malformed type has been caught in the caller chain of this function.
   ASSERT(tp_argument.HasResolvedTypeClass());
   // Check if type argument is dynamic or Object.
   const Type& object_type =
       Type::Handle(Isolate::Current()->object_store()->object_type());
   Error& malformed_error = Error::Handle();
   if (object_type.IsSubtypeOf(tp_argument, &malformed_error)) {
     // Instance class test only necessary.
-    GenerateSubtypeTestCacheLookup(node_id, token_index, type_class,
-                                   is_instance_lbl, is_not_instance_lbl);
+    GenerateSubtype1TestCacheLookup(node_id, token_index, type_class,
+                                    is_instance_lbl, is_not_instance_lbl);
     return;
   }
   Label inlined_check, fall_through;
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   AddCurrentDescriptor(PcDescriptors::kTypeTest, node_id, token_index);
   __ LoadObject(EDX, Array::ZoneHandle(
       Array::New(SubTypeTestCache::kNumEntries)));
-  __ pushl(EDX);       // Cache array.
-  __ pushl(EAX);       // Instance.
-  __ pushl(raw_null);  // Instantiator type arguments, no instantiator -> null.
-  __ call(&StubCode::SubtypeTestCacheLabel());
-  __ popl(EDX);  // Discard.
+  __ pushl(EDX);  // Cache array.
+  __ pushl(EAX);  // Instance.
+  __ pushl(raw_null);  // Unused.
+  __ call(&StubCode::Subtype2TestCacheLabel());
+  __ popl(EAX);  // Discard.
   __ popl(EAX);  // Restore receiver.
   __ popl(EDX);  // Discard.
   // Result is in ECX: null -> not found, otherwise Bool::True or Bool::False.
 
   __ cmpl(ECX, raw_null);
   __ j(EQUAL, &fall_through, Assembler::kNearJump);
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   __ CompareObject(ECX, bool_true);
   __ j(EQUAL, is_instance_lbl);
   __ jmp(is_not_instance_lbl);
@@ skipping 1417 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32