Tests for GuardField length check along with bug fixes

runtime/vm/intermediate_language_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"  // Needed here to get TARGET_ARCH_MIPS.
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 1644 matching lines @@
       LoadValueCid(compiler, value_cid_reg, value_reg);
 
       Label skip_length_check;
 
       __ lw(CMPRES1, field_cid_operand);
       __ bne(value_cid_reg, CMPRES1, &skip_length_check);
       if (field_has_length) {
         // Field guard may have remembered list length, check it.
         if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
           __ lw(TMP, FieldAddress(value_reg, Array::length_offset()));
-          __ LoadImmediate(CMPRES1, field_length);
+          __ LoadImmediate(CMPRES1, Smi::RawValue(field_length));
           __ subu(CMPRES1, TMP, CMPRES1);
         } else if (RawObject::IsTypedDataClassId(field_cid)) {
           __ lw(TMP, FieldAddress(value_reg, TypedData::length_offset()));
-          __ LoadImmediate(CMPRES1, field_length);
+          __ LoadImmediate(CMPRES1, Smi::RawValue(field_length));
           __ subu(CMPRES1, TMP, CMPRES1);
         } else {
           ASSERT(field_cid == kIllegalCid);
-          __ LoadImmediate(CMPRES1, 0x1);
+          Label check_array, local_exit, local_fail;
+          __ BranchEqual(value_cid_reg, kNullCid, &local_fail);
+          // Check for typed data array.
+          __ BranchSignedGreater(value_cid_reg, kTypedDataFloat32x4ArrayCid,
+                                 &local_fail);
+          __ BranchSignedLess(value_cid_reg, kTypedDataInt8ArrayCid,
+                              &check_array);
+          __ lw(TMP, FieldAddress(value_reg, TypedData::length_offset()));
+          __ lw(CMPRES1, field_length_operand);
+          __ subu(CMPRES1, TMP, CMPRES1);
+          __ b(&local_exit);
+          // Check for regular array.
+          __ Bind(&check_array);
+          __ BranchSignedGreater(value_cid_reg, kImmutableArrayCid,
+                                 &local_fail);
+          __ BranchSignedLess(value_cid_reg, kArrayCid, &local_fail);
+          __ lw(TMP, FieldAddress(value_reg, Array::length_offset()));
+          __ lw(CMPRES1, field_length_operand);
+          __ subu(CMPRES1, TMP, CMPRES1);
+          __ b(&local_exit);
+
+          __ Bind(&local_fail);
+          // TODO(regis): TMP1 may conflict. Revisit.
+          __ LoadImmediate(TMP1, Smi::RawValue(Field::kNoFixedLength));
+          __ sw(TMP1, field_length_operand);
+
+          __ Bind(&local_exit);
         }
         __ bne(CMPRES1, ZR, fail);
       }
       __ Bind(&skip_length_check);
       __ lw(TMP1, field_nullability_operand);
       __ subu(CMPRES, value_cid_reg, TMP1);
     } else if (value_cid == kNullCid) {
       // TODO(regis): TMP1 may conflict. Revisit.
       __ lw(TMP1, field_nullability_operand);
       __ LoadImmediate(CMPRES, value_cid);
       __ subu(CMPRES, TMP1, CMPRES);
     } else {
       Label skip_length_check;
       // TODO(regis): TMP1 may conflict. Revisit.
       __ lw(TMP1, field_cid_operand);
       __ LoadImmediate(CMPRES, value_cid);
       __ subu(CMPRES, TMP1, CMPRES);
       __ bne(CMPRES, ZR, &skip_length_check);
       // Insert length check.
       if (field_has_length) {
         if (value_cid_reg == kNoRegister) {
           ASSERT(!compiler->is_optimizing());
           value_cid_reg = A1;
           ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
         }
         ASSERT(value_cid_reg != kNoRegister);
-        if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
+        if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
           __ lw(TMP, FieldAddress(value_reg, Array::length_offset()));
-          __ LoadImmediate(CMPRES, field_length);
+          __ LoadImmediate(CMPRES, Smi::RawValue(field_length));
           __ subu(CMPRES, TMP, CMPRES);
-        } else if (RawObject::IsTypedDataClassId(field_cid)) {
+        } else if (RawObject::IsTypedDataClassId(value_cid)) {
           __ lw(TMP, FieldAddress(value_reg, TypedData::length_offset()));
-          __ LoadImmediate(CMPRES, field_length);
+          __ LoadImmediate(CMPRES, Smi::RawValue(field_length));
           __ subu(CMPRES, TMP, CMPRES);
         } else {
           ASSERT(field_cid == kIllegalCid);
-          __ LoadImmediate(CMPRES, 0x1);
         }
+        __ bne(CMPRES, ZR, fail);
       }
       __ Bind(&skip_length_check);
     }
     __ beq(CMPRES, ZR, &ok);
 
     __ lw(CMPRES1, field_cid_operand);
     __ BranchNotEqual(CMPRES1, kIllegalCid, fail);
 
     if (value_cid == kDynamicCid) {
       __ sw(value_cid_reg, field_cid_operand);
@@ skipping 17 matching lines @@
                                &local_fail);
         __ BranchSignedLess(value_cid_reg, kArrayCid, &local_fail);
         // Destroy value_cid_reg (safe because we are finished with it).
         __ lw(value_cid_reg,
                 FieldAddress(value_reg, Array::length_offset()));
         __ sw(value_cid_reg, field_length_operand);
         __ b(&local_exit);  // Updated field length from regular array.
 
         __ Bind(&local_fail);
         // TODO(regis): TMP1 may conflict. Revisit.
-        __ LoadImmediate(TMP1, Field::kNoFixedLength);
+        __ LoadImmediate(TMP1, Smi::RawValue(Field::kNoFixedLength));
         __ sw(TMP1, field_length_operand);
 
         __ Bind(&local_exit);
       }
     } else {
       if (value_cid_reg == kNoRegister) {
         ASSERT(!compiler->is_optimizing());
         value_cid_reg = A1;
         ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
       }
       ASSERT(value_cid_reg != kNoRegister);
       ASSERT(field_reg != kNoRegister);
       __ LoadImmediate(TMP1, value_cid);
       __ sw(TMP1, field_cid_operand);
       __ sw(TMP1, field_nullability_operand);
-      if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ lw(value_cid_reg,
-              FieldAddress(value_reg, Array::length_offset()));
-        __ sw(value_cid_reg, field_length_operand);
-      } else if (RawObject::IsTypedDataClassId(value_cid)) {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ lw(value_cid_reg,
-              FieldAddress(value_reg, TypedData::length_offset()));
-        __ sw(value_cid_reg, field_length_operand);
-      } else {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ LoadImmediate(value_cid_reg, Field::kNoFixedLength);
-        __ sw(value_cid_reg, field_length_operand);
+      if (field_has_length) {
+        if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
+          // Destroy value_cid_reg (safe because we are finished with it).
+          __ lw(value_cid_reg,
+                FieldAddress(value_reg, Array::length_offset()));
+          __ sw(value_cid_reg, field_length_operand);
+        } else if (RawObject::IsTypedDataClassId(value_cid)) {
+          // Destroy value_cid_reg (safe because we are finished with it).
+          __ lw(value_cid_reg,
+                FieldAddress(value_reg, TypedData::length_offset()));
+          __ sw(value_cid_reg, field_length_operand);
+        } else {
+          // Destroy value_cid_reg (safe because we are finished with it).
+          __ LoadImmediate(value_cid_reg, Smi::RawValue(Field::kNoFixedLength));
+          __ sw(value_cid_reg, field_length_operand);
+        }
       }
     }
-
     if (!ok_is_fall_through) {
       __ b(&ok);
     }
   } else {
     if (field_reg != kNoRegister) {
       __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
     }
     if (value_cid == kDynamicCid) {
       // Field's guarded class id is fixed by value's class id is not known.
       __ andi(CMPRES, value_reg, Immediate(kSmiTagMask));
@@ skipping 47 matching lines @@
         ASSERT(value_cid_reg != kNoRegister);
         if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
           // Destroy value_cid_reg (safe because we are finished with it).
           __ lw(value_cid_reg,
                 FieldAddress(value_reg, Array::length_offset()));
         } else if (RawObject::IsTypedDataClassId(field_cid)) {
           // Destroy value_cid_reg (safe because we are finished with it).
           __ lw(value_cid_reg,
                 FieldAddress(value_reg, TypedData::length_offset()));
         }
-        __ LoadImmediate(TMP1, field_length);
+        __ LoadImmediate(TMP1, Smi::RawValue(field_length));
         __ subu(CMPRES, value_cid_reg, TMP1);
         if (ok_is_fall_through) {
           __ bne(CMPRES, ZR, fail);
         }
       } else {
         // Nothing to emit.
         ASSERT(!compiler->is_optimizing());
         return;
       }
     }
@@ skipping 2267 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS