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

runtime/vm/stub_code_ia32.cc

Index: runtime/vm/stub_code_ia32.cc
===================================================================
--- runtime/vm/stub_code_ia32.cc	(revision 7246)
+++ runtime/vm/stub_code_ia32.cc	(working copy)
@@ -1819,59 +1819,69 @@
 
 
 // Used to check class and type arguments. Arguments passed on stack:
-// TOS + 0: return address
-// TOS + 1: instantiator type arguments
-// TOS + 2: instance
-// TOS + 3: cache array.
-// Result in ECX: null -> not found, otherwise result.
-void StubCode::GenerateSubtypeTestCacheStub(Assembler* assembler) {
+// TOS + 0: return address.
+// TOS + 1: instantiator type arguments (can be NULL).
+// TOS + 1: instance.
+// TOS + 2: cache array.
+// Result in ECX: null -> not found, otherwise result (true or false).
+static void GenerateSubtypeNTestCacheStub(Assembler* assembler, int n) {
+  ASSERT((1 <= n) && (n <= 3));
   const intptr_t kInstantiatorTypeArgumentsInBytes = 1 * kWordSize;
   const intptr_t kInstanceOffsetInBytes = 2 * kWordSize;
   const intptr_t kCacheArrayOffsetInBytes = 3 * kWordSize;
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
-
+  Label not_found;
   __ movl(EAX, Address(ESP, kInstanceOffsetInBytes));
   __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
   // EAX: instance, ECX: instance-class.
   // Get instance type arguments
-  Label has_no_type_arguments;
-  __ movl(EBX, raw_null);
-  __ movl(EDI, FieldAddress(ECX,
-      Class::type_arguments_instance_field_offset_offset()));
-  __ cmpl(EDI, Immediate(Class::kNoTypeArguments));
-  __ j(EQUAL, &has_no_type_arguments, Assembler::kNearJump);
-  __ movl(EBX, FieldAddress(EAX, EDI, TIMES_1, 0));
-  __ Bind(&has_no_type_arguments);
+  if (n > 1) {
+    // Compute instance type arguments into EBX.
+    Label has_no_type_arguments;
+    __ movl(EBX, raw_null);
+    __ movl(EDI, FieldAddress(ECX,
+        Class::type_arguments_instance_field_offset_offset()));
+    __ cmpl(EDI, Immediate(Class::kNoTypeArguments));
+    __ j(EQUAL, &has_no_type_arguments, Assembler::kNearJump);
+    __ movl(EBX, FieldAddress(EAX, EDI, TIMES_1, 0));
+    __ Bind(&has_no_type_arguments);
+  }
   // EBX: instance type arguments (null if none).
   __ movl(EDX, Address(ESP, kCacheArrayOffsetInBytes));
   // EDX: cache.
   __ addl(EDX, Immediate(Array::data_offset() - kHeapObjectTag));
-  Label loop, found, not_found, next_iteration;
+
+  Label loop, found, next_iteration;
   // EDX: Entry start.
   // ECX: instance class.
   // EBX: instance type arguments
-  // TOS + 2: test-type-class.
-  // TOS + 1: test-type-arguments.
   __ Bind(&loop);
   __ movl(EDI, Address(EDX, kWordSize * SubTypeTestCache::kInstanceClass));
+  __ cmpl(EDI, raw_null);
+  __ j(EQUAL, &not_found, Assembler::kNearJump);
   __ cmpl(EDI, ECX);
-  __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
-  __ movl(EDI,
+  if (n == 1) {
+    __ j(EQUAL, &found, Assembler::kNearJump);
+  } else {
+    __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
+    __ movl(EDI,
           Address(EDX, kWordSize * SubTypeTestCache::kInstanceTypeArguments));
-  __ cmpl(EDI, EBX);
-  __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
-  __ movl(EDI,
-          Address(EDX, kWordSize *
-                       SubTypeTestCache::kInstantiatorTypeArguments));
-  __ cmpl(EDI, Address(ESP, kInstantiatorTypeArgumentsInBytes));
-  __ j(EQUAL, &found, Assembler::kNearJump);
-
+    __ cmpl(EDI, EBX);
+    if (n == 2) {
+      __ j(EQUAL, &found, Assembler::kNearJump);
+    } else {
+      __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
+      __ movl(EDI,
+              Address(EDX, kWordSize *
+                           SubTypeTestCache::kInstantiatorTypeArguments));
+      __ cmpl(EDI, Address(ESP, kInstantiatorTypeArgumentsInBytes));
+      __ j(EQUAL, &found, Assembler::kNearJump);
+    }
+  }
   __ Bind(&next_iteration);
   __ addl(EDX, Immediate(kWordSize * SubTypeTestCache::kNumEntries));
-  // Is loop done?
-  __ cmpl(EDI, raw_null);
-  __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
+  __ jmp(&loop, Assembler::kNearJump);
   // Fall through to not found.
   __ Bind(&not_found);
   __ movl(ECX, raw_null);
@@ -1882,6 +1892,39 @@
   __ ret();
 }
 
+
+// Used to check class and type arguments. Arguments passed on stack:
+// TOS + 0: return address.
+// TOS + 1: instantiator type arguments or NULL.
+// TOS + 1: instance.

[regis, 2012/05/02 20:05:27]

TOS + 1.5?

[srdjan, 2012/05/02 20:44:00]

Done.

+// TOS + 2: cache array.
+// Result in ECX: null -> not found, otherwise result (true or false).
+void StubCode::GenerateSubtype1TestCacheStub(Assembler* assembler) {
+  GenerateSubtypeNTestCacheStub(assembler, 1);
+}
+
+
+// Used to check class and type arguments. Arguments passed on stack:
+// TOS + 0: return address.
+// TOS + 1: instantiator type arguments or NULL.
+// TOS + 2: instance.
+// TOS + 3: cache array.
+// Result in ECX: null -> not found, otherwise result (true or false).
+void StubCode::GenerateSubtype2TestCacheStub(Assembler* assembler) {
+  GenerateSubtypeNTestCacheStub(assembler, 2);
+}
+
+
+// Used to check class and type arguments. Arguments passed on stack:
+// TOS + 0: return address.
+// TOS + 1: instantiator type arguments.
+// TOS + 2: instance.
+// TOS + 3: cache array.
+// Result in ECX: null -> not found, otherwise result (true or false).
+void StubCode::GenerateSubtype3TestCacheStub(Assembler* assembler) {
+  GenerateSubtypeNTestCacheStub(assembler, 3);
+}
+
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32