Restructure type checks in ObjectArray []= to accept any value if parameterized type is Dynamic.

runtime/vm/intrinsifier_ia32.cc

 // Copyright (c) 2011, 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.
 //
 // The intrinsic code below is executed before a method has built its frame.
 // The return address is on the stack and the arguments below it.
 // Registers EDX (arguments descriptor) and ECX (function) must be preserved.
 // Each intrinsification method returns true if the corresponding
 // Dart method was intrinsified.
 
@@ skipping 220 matching lines @@
 // update. Array length is always a Smi.
 static bool Array_setIndexed(Assembler* assembler) {
   Label fall_through;
   if (FLAG_enable_type_checks) {
     const intptr_t type_args_field_offset =
         ComputeObjectArrayTypeArgumentsOffset();
     // Inline simple tests (Smi, null), fallthrough if not positive.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
     Label checked_ok;
-    __ movl(EAX, Address(ESP, + 1 * kWordSize));  // Value.
-    __ cmpl(EAX, raw_null);
+    __ movl(EDI, Address(ESP, + 1 * kWordSize));  // Value.
+    // Null value is valid for any type.
+    __ cmpl(EDI, raw_null);
     __ j(EQUAL, &checked_ok, Assembler::kNearJump);
-    __ testl(EAX, Immediate(kSmiTagMask));
-    __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);  // Non-smi value.
 
     __ movl(EBX, Address(ESP, + 3 * kWordSize));  // Array.
     __ movl(EBX, FieldAddress(EBX, type_args_field_offset));
     // EBX: Type arguments of array.
     __ movl(EAX, FieldAddress(EBX, Object::class_offset()));
-    // Check if it's Dynamic, int, or num.
-    __ cmpl(EAX, raw_null);  // Dynamic?
+    // Check if it's Dynamic.
+    __ cmpl(EAX, raw_null);
     __ j(EQUAL, &checked_ok, Assembler::kNearJump);
     // For now handle only TypeArguments and bail out if InstantiatedTypeArgs.
     __ CompareObject(EAX, Object::ZoneHandle(Object::type_arguments_class()));
     __ j(NOT_EQUAL, &fall_through, Assembler::kNearJump);
     // Get type at index 0.
     __ movl(EAX, FieldAddress(EBX, TypeArguments::type_at_offset(0)));
     __ CompareObject(EAX, Type::ZoneHandle(Type::DynamicType()));
     __ j(EQUAL,  &checked_ok, Assembler::kNearJump);
+    // Check for int and num.
+    __ testl(EDI, Immediate(kSmiTagMask));  // Value is Smi?
+    __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);  // Non-smi value.
     __ CompareObject(EAX, Type::ZoneHandle(Type::IntInterface()));
     __ j(EQUAL,  &checked_ok, Assembler::kNearJump);
     __ CompareObject(EAX, Type::ZoneHandle(Type::NumberInterface()));
     __ j(NOT_EQUAL, &fall_through, Assembler::kNearJump);
     __ Bind(&checked_ok);
   }
   __ movl(EBX, Address(ESP, + 2 * kWordSize));  // Index.
   __ testl(EBX, Immediate(kSmiTagMask));
   // Index not Smi.
   __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);
@@ skipping 1016 matching lines @@
   }                                                                            \
 
 INTRINSIC_LIST(FIND_INTRINSICS);
 #undef FIND_INTRINSICS
   return false;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32