Remove parent_level field of function type parameters.

runtime/vm/stub_code_arm.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_ARM)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/cpu.h"
@@ skipping 1771 matching lines @@
   // R4: instance type arguments (null if none), used only if n > 1.
   __ ldr(R3, FieldAddress(R3, SubtypeTestCache::cache_offset()));
   __ AddImmediate(R3, Array::data_offset() - kHeapObjectTag);
 
   Label loop, found, not_found, next_iteration;
   // R3: entry start.
   // R8: instance class id.
   // R4: instance type arguments (still null if closure).
   __ SmiTag(R8);
   __ CompareImmediate(R8, Smi::RawValue(kClosureCid));
-  __ ldr(R4, FieldAddress(R0, Closure::instantiator_offset()), EQ);
-  __ ldr(R8, FieldAddress(R0, Closure::function_offset()), EQ);
+  __ b(&loop, NE);
+  __ ldr(R4, FieldAddress(R0, Closure::function_type_arguments_offset()));
+  __ CompareObject(R4, Object::null_object());
+  __ b(&not_found, NE);  // Cache cannot be used for generic closures.
+  __ ldr(R4, FieldAddress(R0, Closure::instantiator_type_arguments_offset()));
+  __ ldr(R8, FieldAddress(R0, Closure::function_offset()));
   // R8: instance class id as Smi or function.
   __ Bind(&loop);
   __ ldr(R9,
          Address(R3, kWordSize * SubtypeTestCache::kInstanceClassIdOrFunction));
   __ CompareObject(R9, Object::null_object());
   __ b(&not_found, EQ);
   __ cmp(R9, Operand(R8));
   if (n == 1) {
     __ b(&found, EQ);
   } else {
@@ skipping 505 matching lines @@
 }
 
 
 void StubCode::GenerateAsynchronousGapMarkerStub(Assembler* assembler) {
   __ bkpt(0);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM