Tests for GuardField length check along with bug fixes

runtime/vm/intermediate_language_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 1609 matching lines @@
 
       Label skip_length_check;
       __ cmpq(value_cid_reg, field_cid_operand);
       __ 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)) {
           __ pushq(value_cid_reg);
           __ movq(value_cid_reg,
                   FieldAddress(value_reg, Array::length_offset()));
-          __ cmpq(value_cid_reg, Immediate(field_length));
+          __ cmpq(value_cid_reg, Immediate(Smi::RawValue(field_length)));
           __ popq(value_cid_reg);
         } else if (RawObject::IsTypedDataClassId(field_cid)) {
           __ pushq(value_cid_reg);
           __ movq(value_cid_reg,
                   FieldAddress(value_reg, TypedData::length_offset()));
-          __ cmpq(value_cid_reg, Immediate(field_length));
+          __ cmpq(value_cid_reg, Immediate(Smi::RawValue(field_length)));
           __ popq(value_cid_reg);
         } else {
           ASSERT(field_cid == kIllegalCid);

[srdjan, 2013/08/28 16:00:55]

Similar comments as in ia32

-          // Following jump cannot not occur, fall through.
+          Label check_array, local_exit, local_fail;
+          __ cmpq(value_cid_reg, Immediate(kNullCid));
+          __ j(EQUAL, &local_fail);
+          // Check for typed data array.
+          __ cmpq(value_cid_reg, Immediate(kTypedDataFloat32x4ArrayCid));
+          __ j(GREATER, &local_fail);  // Not a typed array or a regular array.
+          __ cmpq(value_cid_reg, Immediate(kTypedDataInt8ArrayCid));
+          __ j(LESS, &check_array);  // Could still be a regular array.
+          __ pushq(value_cid_reg);
+          __ movq(value_cid_reg,
+                  FieldAddress(value_reg, TypedData::length_offset()));
+          __ cmpq(field_length_operand, value_cid_reg);
+          __ popq(value_cid_reg);
+          __ jmp(&local_exit);
+          // Check for regular array.
+          __ Bind(&check_array);
+          __ cmpq(value_cid_reg, Immediate(kImmutableArrayCid));
+          __ j(GREATER, &local_fail);
+          __ cmpq(value_cid_reg, Immediate(kArrayCid));
+          __ j(LESS, &local_fail);
+          __ pushq(value_cid_reg);
+          __ movq(value_cid_reg,
+                  FieldAddress(value_reg, Array::length_offset()));
+          __ cmpq(field_length_operand, value_cid_reg);
+          __ popq(value_cid_reg);
+          __ jmp(&local_exit);
+
+          __ Bind(&local_fail);
+          __ movq(field_length_operand,
+                  Immediate(Smi::RawValue(Field::kNoFixedLength)));
+
+          __ Bind(&local_exit);
         }
         __ j(NOT_EQUAL, fail);
       }
       __ Bind(&skip_length_check);
       __ cmpq(value_cid_reg, field_nullability_operand);
     } else if (value_cid == kNullCid) {
       __ cmpq(field_nullability_operand, Immediate(value_cid));
     } else {
       Label skip_length_check;
       __ cmpq(field_cid_operand, Immediate(value_cid));
       // If not equal, skip over length check.
       __ j(NOT_EQUAL, &skip_length_check);
       // Insert length check.
       if (field_has_length) {
         if (value_cid_reg == kNoRegister) {
           ASSERT(!compiler->is_optimizing());
           value_cid_reg = RDX;
           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)) {
           __ pushq(value_cid_reg);
           __ movq(value_cid_reg,
                   FieldAddress(value_reg, Array::length_offset()));
-          __ cmpq(value_cid_reg, Immediate(field_length));
+          __ cmpq(value_cid_reg, Immediate(Smi::RawValue(field_length)));
           __ popq(value_cid_reg);
-        } else if (RawObject::IsTypedDataClassId(field_cid)) {
+        } else if (RawObject::IsTypedDataClassId(value_cid)) {
           __ pushq(value_cid_reg);
           __ movq(value_cid_reg,
                   FieldAddress(value_reg, TypedData::length_offset()));
-          __ cmpq(value_cid_reg, Immediate(field_length));
+          __ cmpq(value_cid_reg, Immediate(Smi::RawValue(field_length)));
           __ popq(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);
     }
     __ j(EQUAL, &ok);
 
     __ cmpq(field_cid_operand, Immediate(kIllegalCid));
     __ j(NOT_EQUAL, fail);
 
     if (value_cid == kDynamicCid) {
@@ skipping 19 matching lines @@
         __ j(GREATER, &local_fail);
         __ cmpq(value_cid_reg, Immediate(kArrayCid));
         __ j(LESS, &local_fail);
         // Destroy value_cid_reg (safe because we are finished with it).
         __ movq(value_cid_reg,
                 FieldAddress(value_reg, Array::length_offset()));
         __ movq(field_length_operand, value_cid_reg);
         __ jmp(&local_exit);  // Updated field length from regular array.
 
         __ Bind(&local_fail);
-        __ movq(field_length_operand, Immediate(Field::kNoFixedLength));
+        __ movq(field_length_operand,
+                Immediate(Smi::RawValue(Field::kNoFixedLength)));
 
         __ Bind(&local_exit);
       }
     } else {
       if (value_cid_reg == kNoRegister) {
           ASSERT(!compiler->is_optimizing());
           value_cid_reg = RDX;
           ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
       }
       ASSERT(value_cid_reg != kNoRegister);
       ASSERT(field_reg != kNoRegister);
       __ movq(field_cid_operand, Immediate(value_cid));
       __ movq(field_nullability_operand, Immediate(value_cid));
-      if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ movq(value_cid_reg,
-                FieldAddress(value_reg, Array::length_offset()));
-        __ movq(field_length_operand, value_cid_reg);
-      } else if (RawObject::IsTypedDataClassId(value_cid)) {
-        // Destroy value_cid_reg (safe because we are finished with it).
-        __ movq(value_cid_reg,
-                FieldAddress(value_reg, TypedData::length_offset()));
-        __ movq(field_length_operand, value_cid_reg);
-      } else {
-        __ movq(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).
+          __ movq(value_cid_reg,
+                  FieldAddress(value_reg, Array::length_offset()));
+          __ movq(field_length_operand, value_cid_reg);
+        } else if (RawObject::IsTypedDataClassId(value_cid)) {
+          // Destroy value_cid_reg (safe because we are finished with it).
+          __ movq(value_cid_reg,
+                  FieldAddress(value_reg, TypedData::length_offset()));
+          __ movq(field_length_operand, value_cid_reg);
+        } else {
+          __ movq(field_length_operand,
+                  Immediate(Smi::RawValue(Field::kNoFixedLength)));
+        }
       }
     }
-
     if (!ok_is_fall_through) {
       __ jmp(&ok);
     }
   } else {
     if (field_reg != kNoRegister) {
       __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
     }
 
     if (value_cid == kDynamicCid) {
       // Field's guarded class id is fixed but value's class id is not known.
@@ skipping 48 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).
           __ movq(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).
           __ movq(value_cid_reg,
                   FieldAddress(value_reg, TypedData::length_offset()));
         }
-        __ cmpq(value_cid_reg, Immediate(field_length));
+        __ cmpq(value_cid_reg, Immediate(Smi::RawValue(field_length)));
         if (ok_is_fall_through) {
           __ j(NOT_EQUAL, fail);
         }
       } else {
         // Nothing to emit.
         ASSERT(!compiler->is_optimizing());
         return;
       }
     }
   }
@@ skipping 3047 matching lines @@
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64