Tests for GuardField length check along with bug fixes

runtime/vm/intermediate_language_ia32.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"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 1594 matching lines @@
       field_has_length || (field().guarded_cid() == kIllegalCid);
   if (field_has_length) {
     // Currently, we should only see final fields that remember length.
     ASSERT(field().is_final());
   }
 
   if (field_cid == kDynamicCid) {
     ASSERT(!compiler->is_optimizing());
     return;  // Nothing to emit.
   }
-
   const intptr_t value_cid = value()->Type()->ToCid();
 
   Register value_reg = locs()->in(0).reg();
 
   Register value_cid_reg = needs_value_temp_reg ?
       locs()->temp(0).reg() : kNoRegister;
 
   Register field_reg = needs_field_temp_reg ?
       locs()->temp(locs()->temp_count() - 1).reg() : kNoRegister;
 
@@ skipping 25 matching lines @@
         field_reg, Field::guarded_list_length_offset());
 
     if (value_cid == kDynamicCid) {
       if (value_cid_reg == kNoRegister) {
         ASSERT(!compiler->is_optimizing());
         value_cid_reg = EDX;
         ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
       }
 
       LoadValueCid(compiler, value_cid_reg, value_reg);
-
       Label skip_length_check;
       __ cmpl(value_cid_reg, field_cid_operand);
       // Value CID != Field guard CID, skip length check.
       __ j(NOT_EQUAL, &skip_length_check);
       if (field_has_length) {
         // Field guard may have remembered list length, check it.
         if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
           __ pushl(value_cid_reg);
           __ movl(value_cid_reg,
                   FieldAddress(value_reg, Array::length_offset()));
           __ cmpl(value_cid_reg, Immediate(field_length));
           __ popl(value_cid_reg);
         } else if (RawObject::IsTypedDataClassId(field_cid)) {
           __ pushl(value_cid_reg);
           __ movl(value_cid_reg,
                   FieldAddress(value_reg, TypedData::length_offset()));
           __ cmpl(value_cid_reg, Immediate(field_length));
           __ popl(value_cid_reg);
         } else {
           ASSERT(field_cid == kIllegalCid);
-          // Following jump cannot not occur, fall through.
+          Label check_array, local_exit, local_fail;
+          // Check field guard.
+          __ cmpl(value_cid_reg, Immediate(kNullCid));
+          __ j(EQUAL, &local_fail);
+          // Check for typed data array.
+          __ cmpl(value_cid_reg, Immediate(kTypedDataFloat32x4ArrayCid));
+          __ j(GREATER, &local_fail);  // Not a typed array or a regular array.
+          __ cmpl(value_cid_reg, Immediate(kTypedDataInt8ArrayCid));
+          __ j(LESS, &check_array);  // Could still be a regular array.
+          __ pushl(value_cid_reg);
+          __ movl(value_cid_reg,
+                  FieldAddress(value_reg, TypedData::length_offset()));
+          __ cmpl(field_length_operand, value_cid_reg);
+          __ popl(value_cid_reg);
+          __ jmp(&local_exit);
+          // Check for regular array.
+          __ Bind(&check_array);
+          __ cmpl(value_cid_reg, Immediate(kImmutableArrayCid));
+          __ j(GREATER, &local_fail);
+          __ cmpl(value_cid_reg, Immediate(kArrayCid));
+          __ j(LESS, &local_fail);
+          __ pushl(value_cid_reg);
+          __ movl(value_cid_reg,
+                  FieldAddress(value_reg, Array::length_offset()));
+          __ cmpl(field_length_operand, value_cid_reg);
+          __ popl(value_cid_reg);
+          __ jmp(&local_exit);
+
+          __ Bind(&local_fail);
+          __ movl(field_length_operand, Immediate(Field::kNoFixedLength));
+
+          __ Bind(&local_exit);
         }
         __ j(NOT_EQUAL, fail);
       }
       __ Bind(&skip_length_check);
       __ cmpl(value_cid_reg, field_nullability_operand);
     } else if (value_cid == kNullCid) {
       // Value in graph known to be null.
       // Compare with null.
       __ cmpl(field_nullability_operand, Immediate(value_cid));
     } else {
@@ skipping 20 matching lines @@
         } else if (RawObject::IsTypedDataClassId(field_cid)) {
           __ pushl(value_cid_reg);
           __ movl(value_cid_reg,
                   FieldAddress(value_reg, TypedData::length_offset()));
           __ cmpl(value_cid_reg, Immediate(field_length));
           __ popl(value_cid_reg);
         } else {
           ASSERT(field_cid == kIllegalCid);
           // Following jump cannot not occur, fall through.
         }
+        __ j(NOT_EQUAL, fail);
       }
       // Not identical, possibly null.
       __ Bind(&skip_length_check);
     }
     // Jump when class id guard and list length guard are okay.
     __ j(EQUAL, &ok);
 
-
     // Check if guard field is uninitialized.
     __ cmpl(field_cid_operand, Immediate(kIllegalCid));
     // Jump to failure path when guard field has been initialized and
     // the field and value class ids do not not match.
     __ j(NOT_EQUAL, fail);
 
     // At this point the field guard is being initialized for the first time.
     if (value_cid == kDynamicCid) {
       // Do not know value's class id.
       __ movl(field_cid_operand, value_cid_reg);
@@ skipping 32 matching lines @@
     } else {
       if (value_cid_reg == kNoRegister) {
           ASSERT(!compiler->is_optimizing());
           value_cid_reg = EDX;
           ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
       }
       ASSERT(value_cid_reg != kNoRegister);
       ASSERT(field_reg != kNoRegister);
       __ movl(field_cid_operand, Immediate(value_cid));
       __ movl(field_nullability_operand, Immediate(value_cid));
-      if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ movl(value_cid_reg,
-                FieldAddress(value_reg, Array::length_offset()));
-        __ movl(field_length_operand, value_cid_reg);
-      } else if (RawObject::IsTypedDataClassId(value_cid)) {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ movl(value_cid_reg,
-                FieldAddress(value_reg, TypedData::length_offset()));
-        __ movl(field_length_operand, value_cid_reg);
-      } else {
-        __ movl(field_length_operand, Immediate(Field::kNoFixedLength));
+      if (field_has_length) {
+        if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
+          // Destroy value_cid_reg (safe because we are finished with it).
+          __ movl(value_cid_reg,
+                  FieldAddress(value_reg, Array::length_offset()));
+          __ movl(field_length_operand, value_cid_reg);
+        } else if (RawObject::IsTypedDataClassId(value_cid)) {
+          // Destroy value_cid_reg (safe because we are finished with it).
+          __ movl(value_cid_reg,
+                  FieldAddress(value_reg, TypedData::length_offset()));
+          __ movl(field_length_operand, value_cid_reg);
+        } else {
+          __ movl(field_length_operand, Immediate(Field::kNoFixedLength));
+        }
       }
     }
 
     if (!ok_is_fall_through) {
       __ jmp(&ok);
     }
   } else {
     // Field guard class has been initialized and is known.
-
     if (field_reg != kNoRegister) {
       __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
     }
 
     if (value_cid == kDynamicCid) {
       // Value's class id is not known.
       __ testl(value_reg, Immediate(kSmiTagMask));
 
       if (field_cid != kSmiCid) {
         __ j(ZERO, fail);
@@ skipping 3365 matching lines @@
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_IA32