Pass a second type argument vector to all type instantiation calls in the VM.

runtime/vm/stub_code_mips.cc

 // Copyright (c) 2013, 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"
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 1845 matching lines @@
   __ lw(RA, Address(SP, 0 * kWordSize));
   __ addiu(SP, SP, Immediate(1 * kWordSize));
   __ LeaveStubFrame();
   __ b(&done_stepping);
 }
 
 
 // Used to check class and type arguments. Arguments passed in registers:
 // RA: return address.
 // A0: instance (must be preserved).
-// A1: instantiator type arguments or NULL.
-// A2: cache array.
+// A1: instantiator type arguments (only if n == 4, can be raw_null).
+// A2: function type arguments (only if n == 4, can be raw_null).
+// A3: SubtypeTestCache.
 // Result in V0: null -> not found, otherwise result (true or false).
 static void GenerateSubtypeNTestCacheStub(Assembler* assembler, int n) {
   __ Comment("SubtypeNTestCacheStub");
-  ASSERT((1 <= n) && (n <= 3));
+  ASSERT((n == 1) || (n == 2) || (n == 4));
   if (n > 1) {
-    // Get instance type arguments.
     __ LoadClass(T0, A0);
     // Compute instance type arguments into T1.
     Label has_no_type_arguments;
     __ LoadObject(T1, Object::null_object());
     __ lw(T2, FieldAddress(
                   T0, Class::type_arguments_field_offset_in_words_offset()));
     __ BranchEqual(T2, Immediate(Class::kNoTypeArguments),
                    &has_no_type_arguments);
     __ sll(T2, T2, 2);
     __ addu(T2, A0, T2);  // T2 <- A0 + T2 * 4
     __ lw(T1, FieldAddress(T2, 0));
     __ Bind(&has_no_type_arguments);
   }
   __ LoadClassId(T0, A0);
   // A0: instance.
-  // A1: instantiator type arguments or NULL.
-  // A2: SubtypeTestCache.
+  // A1: instantiator type arguments (only if n == 4, can be raw_null).
+  // A2: function type arguments (only if n == 4, can be raw_null).
+  // A3: SubtypeTestCache.
   // T0: instance class id.
   // T1: instance type arguments (null if none), used only if n > 1.
-  __ lw(T2, FieldAddress(A2, SubtypeTestCache::cache_offset()));
+  __ lw(T2, FieldAddress(A3, SubtypeTestCache::cache_offset()));
   __ AddImmediate(T2, Array::data_offset() - kHeapObjectTag);
 
   __ LoadObject(T7, Object::null_object());
-
   Label loop, found, not_found, next_iteration;
   // T0: instance class id.
   // T1: instance type arguments (still null if closure).
   // T2: Entry start.
   // T7: null.
   __ SmiTag(T0);
   __ BranchNotEqual(T0, Immediate(Smi::RawValue(kClosureCid)), &loop);
   __ lw(T1, FieldAddress(A0, Closure::instantiator_offset()));
   __ lw(T0, FieldAddress(A0, Closure::function_offset()));
   // T0: instance class id as Smi or function.
   __ Bind(&loop);
   __ lw(T3,
         Address(T2, kWordSize * SubtypeTestCache::kInstanceClassIdOrFunction));
   __ beq(T3, T7, &not_found);
-
   if (n == 1) {
     __ beq(T3, T0, &found);
   } else {
     __ bne(T3, T0, &next_iteration);
     __ lw(T3,
           Address(T2, kWordSize * SubtypeTestCache::kInstanceTypeArguments));
     if (n == 2) {
       __ beq(T3, T1, &found);
     } else {
       __ bne(T3, T1, &next_iteration);
       __ lw(T3, Address(T2, kWordSize *
                                 SubtypeTestCache::kInstantiatorTypeArguments));
-      __ beq(T3, A1, &found);
+      __ bne(T3, A1, &next_iteration);
+      __ lw(T3,
+            Address(T2, kWordSize * SubtypeTestCache::kFunctionTypeArguments));
+      __ beq(T3, A2, &found);
     }
   }
   __ Bind(&next_iteration);
   __ b(&loop);
   __ delay_slot()->addiu(
       T2, T2, Immediate(kWordSize * SubtypeTestCache::kTestEntryLength));
   // Fall through to not found.
   __ Bind(&not_found);
   __ Ret();
   __ delay_slot()->mov(V0, T7);
 
   __ Bind(&found);
   __ Ret();
   __ delay_slot()->lw(V0,
                       Address(T2, kWordSize * SubtypeTestCache::kTestResult));
 }
 
 
 // Used to check class and type arguments. Arguments passed in registers:
 // RA: return address.
 // A0: instance (must be preserved).
-// A1: instantiator type arguments or NULL.
-// A2: cache array.
+// A1: unused.
+// A2: unused.
+// A3: SubtypeTestCache.
 // Result in V0: 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 in registers:
 // RA: return address.
 // A0: instance (must be preserved).
-// A1: instantiator type arguments or NULL.
-// A2: cache array.
+// A1: unused.
+// A2: unused.
+// A3: SubtypeTestCache.
 // Result in V0: 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 in registers:
 // RA: return address.
 // A0: instance (must be preserved).
-// A1: instantiator type arguments or NULL.
-// A2: cache array.
+// A1: instantiator type arguments (can be raw_null).
+// A2: function type arguments (can be raw_null).
+// A3: SubtypeTestCache.
 // Result in V0: null -> not found, otherwise result (true or false).
-void StubCode::GenerateSubtype3TestCacheStub(Assembler* assembler) {
-  GenerateSubtypeNTestCacheStub(assembler, 3);
+void StubCode::GenerateSubtype4TestCacheStub(Assembler* assembler) {
+  GenerateSubtypeNTestCacheStub(assembler, 4);
 }
 
 
 // Return the current stack pointer address, used to stack alignment
 // checks.
 void StubCode::GenerateGetStackPointerStub(Assembler* assembler) {
   __ Ret();
   __ delay_slot()->mov(V0, SP);
 }
 
@@ skipping 441 matching lines @@
 }
 
 
 void StubCode::GenerateAsynchronousGapMarkerStub(Assembler* assembler) {
   __ break_(0);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS