Eliminate RawObject::class_ field entirely.

runtime/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 71 matching lines @@
     __ Bind(&size_tag_overflow);
     __ 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::ClassIdTag::encode(cls.id())));
     __ 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);
-
   // Store the type argument field.
   __ movl(EDI, Address(ESP, kTypeArgumentsOffset));  // type argument.
   __ StoreIntoObject(EAX,
                      FieldAddress(EAX, Array::type_arguments_offset()),
                      EDI);
 
   // Set the length field.
   __ movl(EDI, Address(ESP, kArrayLengthOffset));  // Array Length.
   __ StoreIntoObject(EAX, FieldAddress(EAX, Array::length_offset()), EDI);
 
@@ skipping 186 matching lines @@
   tags = RawObject::ClassIdTag::update(cls.id(), tags);
   __ movl(FieldAddress(EAX, GrowableObjectArray::tags_offset()),
           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()));
-  __ movl(EBX, Address(EBX, Isolate::object_store_offset()));
-  __ movl(EBX, Address(EBX, ObjectStore::growable_object_array_class_offset()));
-  __ StoreIntoObject(EAX,
-                     FieldAddress(EAX, GrowableObjectArray::class_offset()),
-                     EBX);
-
   // Store the type argument field in the growable array object.
   __ movl(EBX, Address(ESP, kTypeArgumentsOffset));  // type argument.
   __ StoreIntoObject(EAX,
                      FieldAddress(EAX,
                                   GrowableObjectArray::type_arguments_offset()),
                      EBX);
 
   // Set the length field in the growable array object to 0.
   __ movl(FieldAddress(EAX, GrowableObjectArray::length_offset()),
           Immediate(0));
@@ skipping 324 matching lines @@
   // Arguments are Smi but the shift produced an overflow to Mint.
   __ cmpl(EBX, Immediate(0));
   // TODO(srdjan): Implement negative values, for now fall through.
   __ j(LESS, &fall_through, Assembler::kNearJump);
   __ SmiUntag(EBX);
   __ movl(EAX, EBX);
   __ shll(EBX, ECX);
   __ xorl(EDI, EDI);
   __ shld(EDI, EAX);
   // Result in EDI (high) and EBX (low).
   const Class& mint_class = Class::ZoneHandle(

[Ivan Posva, 2012/06/06 13:42:11]

Does still need to be a ZoneHandle?

       Isolate::Current()->object_store()->mint_class());
-  __ LoadObject(ECX, mint_class);
   AssemblerMacros::TryAllocate(assembler,
                                mint_class,
-                               ECX,  // Class register.
                                &fall_through,
                                EAX);  // Result register.
   // EBX and EDI are not objects but integer values.
   __ movl(FieldAddress(EAX, Mint::value_offset()), EBX);
   __ movl(FieldAddress(EAX, Mint::value_offset() + kWordSize), EDI);
   __ ret();
   __ Bind(&fall_through);
   return false;
 }
 
@@ skipping 234 matching lines @@
   __ movsd(XMM1, FieldAddress(EAX, Double::value_offset()));
   __ movl(EAX, Address(ESP, + 2 * kWordSize));  // Left argument.
   __ movsd(XMM0, FieldAddress(EAX, Double::value_offset()));
   switch (kind) {
     case Token::kADD: __ addsd(XMM0, XMM1); break;
     case Token::kSUB: __ subsd(XMM0, XMM1); break;
     case Token::kMUL: __ mulsd(XMM0, XMM1); break;
     case Token::kDIV: __ divsd(XMM0, XMM1); break;
     default: UNREACHABLE();
   }
   const Class& double_class = Class::ZoneHandle(

[Ivan Posva, 2012/06/06 13:42:11]

Ditto here and many other places.

       Isolate::Current()->object_store()->double_class());
-  __ LoadObject(EBX, double_class);
   AssemblerMacros::TryAllocate(assembler,
                                double_class,
-                               EBX,  // Class register.
                                &fall_through,
                                EAX);  // Result register.
   __ movsd(FieldAddress(EAX, Double::value_offset()), XMM0);
   __ ret();
   __ Bind(&fall_through);
   return false;
 }
 
 
 bool Intrinsifier::Double_add(Assembler* assembler) {
@@ skipping 24 matching lines @@
   __ testl(EAX, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);
   // Is Smi.
   __ SmiUntag(EAX);
   __ cvtsi2sd(XMM1, EAX);
   __ movl(EAX, Address(ESP, + 2 * kWordSize));
   __ movsd(XMM0, FieldAddress(EAX, Double::value_offset()));
   __ mulsd(XMM0, XMM1);
   const Class& double_class = Class::ZoneHandle(
       Isolate::Current()->object_store()->double_class());
-  __ LoadObject(EBX, double_class);
   AssemblerMacros::TryAllocate(assembler,
                                double_class,
-                               EBX,  // Class register.
                                &fall_through,
                                EAX);  // Result register.
   __ movsd(FieldAddress(EAX, Double::value_offset()), XMM0);
   __ ret();
   __ Bind(&fall_through);
   return false;
 }
 
 
 bool Intrinsifier::Double_fromInteger(Assembler* assembler) {
   Label fall_through;
   __ movl(EAX, Address(ESP, +1 * kWordSize));
   __ testl(EAX, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);
   // Is Smi.
   __ SmiUntag(EAX);
   __ cvtsi2sd(XMM0, EAX);
   const Class& double_class = Class::ZoneHandle(
       Isolate::Current()->object_store()->double_class());
-  __ LoadObject(EBX, double_class);
   AssemblerMacros::TryAllocate(assembler,
                                double_class,
-                               EBX,  // Class register.
                                &fall_through,
                                EAX);  // Result register.
   __ movsd(FieldAddress(EAX, Double::value_offset()), XMM0);
   __ ret();
   __ Bind(&fall_through);
   return false;
 }
 
 
 bool Intrinsifier::Double_isNaN(Assembler* assembler) {
@@ skipping 43 matching lines @@
 // Argument type is not known
 bool Intrinsifier::Math_sqrt(Assembler* assembler) {
   Label fall_through, is_smi, double_op;
   TestLastArgumentIsDouble(assembler, &is_smi, &fall_through);
   // Argument is double and is in EAX, class in EBX.
   __ movsd(XMM1, FieldAddress(EAX, Double::value_offset()));
   __ Bind(&double_op);
   __ sqrtsd(XMM0, XMM1);
   const Class& double_class = Class::ZoneHandle(
       Isolate::Current()->object_store()->double_class());
-  __ LoadObject(EBX, double_class);
   AssemblerMacros::TryAllocate(assembler,
                                double_class,
-                               EBX,  // Class register.
                                &fall_through,
                                EAX);  // Result register.
   __ movsd(FieldAddress(EAX, Double::value_offset()), XMM0);
   __ ret();
   __ Bind(&is_smi);
   __ SmiUntag(EAX);
   __ cvtsi2sd(XMM1, EAX);
   __ jmp(&double_op);
   __ Bind(&fall_through);
   return false;
@@ skipping 14 matching lines @@
   __ fldl(FieldAddress(EAX, Double::value_offset()));
   __ Bind(&double_op);
   switch (kind) {
     case kSine:   __ fsin(); break;
     case kCosine: __ fcos(); break;
     default:
       UNREACHABLE();
   }
   const Class& double_class = Class::ZoneHandle(
       Isolate::Current()->object_store()->double_class());
-  __ LoadObject(EBX, double_class);
   Label alloc_failed;
   AssemblerMacros::TryAllocate(assembler,
                                double_class,
-                               EBX,  // Class register.
                                &alloc_failed,
                                EAX);  // Result register.
   __ fstpl(FieldAddress(EAX, Double::value_offset()));
   __ ret();
 
   __ Bind(&is_smi);  // smi -> double.
   __ SmiUntag(EAX);
   __ pushl(EAX);
   __ filds(Address(ESP, 0));
   __ popl(EAX);
@@ skipping 172 matching lines @@
   __ Bind(&is_true);
   __ LoadObject(EAX, bool_true);
   __ ret();
   return true;
 }
 
 #undef __
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32