- Add a class index to the classes.

vm/intrinsifier_ia32.cc

 // Copyright (c) 2012, 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 31 matching lines @@
   // Assert that length is a Smi.
   __ testl(EDI, Immediate(kSmiTagSize));
   __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);
   __ cmpl(EDI, Immediate(0));
   __ j(LESS, &fall_through, Assembler::kNearJump);
   intptr_t fixed_size = sizeof(RawArray) + kObjectAlignment - 1;
   __ leal(EDI, Address(EDI, TIMES_2, fixed_size));  // EDI is a Smi.
   ASSERT(kSmiTagShift == 1);
   __ andl(EDI, Immediate(-kObjectAlignment));
 
-  Heap* heap = Isolate::Current()->heap();
+  Isolate* isolate = Isolate::Current();
+  Heap* heap = isolate->heap();
 
   // EDI: allocation size.
   __ movl(EAX, Address::Absolute(heap->TopAddress()));
   __ leal(EBX, Address(EAX, EDI, TIMES_1, 0));
 
   // Check if the allocation fits into the remaining space.
   // EAX: potential new object start.
   // EBX: potential next object start.
   // EDI: allocation size.
   __ cmpl(EBX, Address::Absolute(heap->EndAddress()));
   __ j(ABOVE_EQUAL, &fall_through, Assembler::kNearJump);
 
   // Successfully allocated the object(s), now update top to point to
   // next object start and initialize the object.
   __ movl(Address::Absolute(heap->TopAddress()), EBX);
   __ addl(EAX, Immediate(kHeapObjectTag));
 
   // Initialize the tags.
   // EAX: new object start as a tagged pointer.
   // EBX: new object end address.
   // EDI: allocation size.
   {
     Label size_tag_overflow, done;
     __ cmpl(EDI, Immediate(RawObject::SizeTag::kMaxSizeTag));
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
     __ shll(EDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
-    __ movl(FieldAddress(EAX, Array::tags_offset()), EDI);  // Tags.
     __ jmp(&done, Assembler::kNearJump);
 
     __ Bind(&size_tag_overflow);
-    __ movl(FieldAddress(EAX, Array::tags_offset()), Immediate(0));
+    __ movl(EDI, Immediate(0));
     __ Bind(&done);
+
+    // Get the class index and insert it into the tags.
+    const Class& cls = Class::Handle(isolate->object_store()->array_class());
+    __ orl(EDI, Immediate(RawObject::ClassTag::encode(cls.index())));
+    __ movl(FieldAddress(EAX, Array::tags_offset()), EDI);  // Tags.
   }
 
   // Store class value for array.
   // EAX: new object start as a tagged pointer.
   // EBX: new object end address.
   __ movl(EDI, FieldAddress(CTX, Context::isolate_offset()));
   __ movl(EDI, Address(EDI, Isolate::object_store_offset()));
   __ movl(EDI, Address(EDI, ObjectStore::array_class_offset()));
   __ StoreIntoObject(EAX, FieldAddress(EAX, Array::class_offset()), EDI);
 
@@ skipping 164 matching lines @@
   // and the newly allocated object is returned in EAX.
   const intptr_t kTypeArgumentsOffset = 2 * kWordSize;
   const intptr_t kArrayOffset = 1 * kWordSize;
   Label fall_through;
 
   // Compute the size to be allocated, it is based on the array length
   // and it computed as:
   // RoundedAllocationSize(sizeof(RawGrowableObjectArray)) +
   intptr_t fixed_size = GrowableObjectArray::InstanceSize();
 
-  Heap* heap = Isolate::Current()->heap();
+  Isolate* isolate = Isolate::Current();
+  Heap* heap = isolate->heap();
 
   __ movl(EAX, Address::Absolute(heap->TopAddress()));
   __ leal(EBX, Address(EAX, fixed_size));
 
   // Check if the allocation fits into the remaining space.
   // EAX: potential new backing array object start.
   // EBX: potential next object start.
   __ cmpl(EBX, Address::Absolute(heap->EndAddress()));
   __ j(ABOVE_EQUAL, &fall_through, Assembler::kNearJump);
 
   // Successfully allocated the object(s), now update top to point to
   // next object start and initialize the object.
   __ movl(Address::Absolute(heap->TopAddress()), EBX);
   __ addl(EAX, Immediate(kHeapObjectTag));
 
   // Initialize the tags.
   // EAX: new growable array object start as a tagged pointer.
+  const Class& cls = Class::Handle(
+      isolate->object_store()->growable_object_array_class());
+  intptr_t tags = 0;
+  tags = RawObject::SizeTag::update(fixed_size, tags);
+  tags = RawObject::ClassTag::update(cls.index(), tags);
   __ movl(FieldAddress(EAX, GrowableObjectArray::tags_offset()),
-          Immediate(RawObject::SizeTag::update(fixed_size, 0)));
+          Immediate(tags));
 
   // Store backing array object in growable array object.
   __ movl(EBX, Address(ESP, kArrayOffset));  // data argument.
   __ StoreIntoObject(EAX,
                      FieldAddress(EAX, GrowableObjectArray::data_offset()),
                      EBX);
 
   // Store class value for the growable array object.
   // EAX: new growable array object start as a tagged pointer.
   __ movl(EBX, FieldAddress(CTX, Context::isolate_offset()));
@@ skipping 1027 matching lines @@
   __ Bind(&is_true);
   __ LoadObject(EAX, bool_true);
   __ ret();
   return true;
 }
 
 #undef __
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32