Track field types.

src/a64/stub-cache-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 374 matching lines @@
   ASSERT(!representation.IsNone());
 
   if (details.type() == CONSTANT) {
     Handle<Object> constant(descriptors->GetValue(descriptor), masm->isolate());
     __ LoadObject(scratch1, constant);
     __ Cmp(value_reg, scratch1);
     __ B(ne, miss_label);
   } else if (representation.IsSmi()) {
     __ JumpIfNotSmi(value_reg, miss_label);
   } else if (representation.IsHeapObject()) {
-    __ JumpIfSmi(value_reg, miss_label);
+    HeapType* field_type = descriptors->GetFieldType(descriptor);
+    if (field_type->IsClass()) {
+      __ CheckMap(value_reg, scratch1, field_type->AsClass(),
+                  miss_label, DO_SMI_CHECK);
+    } else {
+      __ JumpIfSmi(value_reg, miss_label);
+    }
   } else if (representation.IsDouble()) {
     Label do_store, heap_number;
     __ AllocateHeapNumber(storage_reg, slow, scratch1, scratch2);
 
     // TODO(jbramley): Is fp_scratch the most appropriate FP scratch register?
     // It's only used in Fcmp, but it's not really safe to use it like this.
     __ JumpIfNotSmi(value_reg, &heap_number);
     __ SmiUntagToDouble(fp_scratch, value_reg);
     __ B(&do_store);
 
@@ skipping 140 matching lines @@
   // Adjust for the number of properties stored in the object. Even in the
   // face of a transition we can use the old map here because the size of the
   // object and the number of in-object properties is not going to change.
   index -= object->map()->inobject_properties();
 
   Representation representation = lookup->representation();
   ASSERT(!representation.IsNone());
   if (representation.IsSmi()) {
     __ JumpIfNotSmi(value_reg, miss_label);
   } else if (representation.IsHeapObject()) {
-    __ JumpIfSmi(value_reg, miss_label);
+    HeapType* field_type = lookup->GetFieldType();
+    if (field_type->IsClass()) {
+      __ CheckMap(value_reg, scratch1, field_type->AsClass(),
+                  miss_label, DO_SMI_CHECK);
+    } else {
+      __ JumpIfSmi(value_reg, miss_label);
+    }
   } else if (representation.IsDouble()) {
     // Load the double storage.
     if (index < 0) {
       int offset = (index * kPointerSize) + object->map()->instance_size();
       __ Ldr(scratch1, FieldMemOperand(receiver_reg, offset));
     } else {
       int offset = (index * kPointerSize) + FixedArray::kHeaderSize;
       __ Ldr(scratch1,
              FieldMemOperand(receiver_reg, JSObject::kPropertiesOffset));
       __ Ldr(scratch1, FieldMemOperand(scratch1, offset));
@@ skipping 932 matching lines @@
 
   // Miss case, call the runtime.
   __ Bind(&miss);
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64