- Add extra checking when validating objects.

vm/stub_code_ia32.cc

 // Copyright (c) 2011, 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"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
@@ skipping 1130 matching lines @@
       __ cmpl(ECX, EBX);
       __ j(EQUAL, &type_arguments_ready, Assembler::kNearJump);
       // Initialize InstantiatedTypeArguments object at ECX.
       __ movl(Address(ECX,
           InstantiatedTypeArguments::uninstantiated_type_arguments_offset()),
               EDI);
       __ movl(EDX, Address(ESP, kInstantiatorTypeArgumentsOffset));
       __ movl(Address(ECX,
           InstantiatedTypeArguments::instantiator_type_arguments_offset()),
               EDX);
-      __ LoadObject(EDX,
-          Class::ZoneHandle(Object::instantiated_type_arguments_class()));
+      const Class& ita_cls =
+          Class::ZoneHandle(Object::instantiated_type_arguments_class());
+      __ LoadObject(EDX, ita_cls);
       __ movl(Address(ECX, Instance::class_offset()), EDX);  // Set its class.
       // Set the tags.
-      __ movl(Address(ECX, Instance::tags_offset()),
-              Immediate(RawObject::SizeTag::encode(type_args_size)));
+      uword tags = 0;
+      tags = RawObject::SizeTag::update(type_args_size, tags);
+      tags = RawObject::ClassTag::update(ita_cls.index(), tags);
+      __ movl(Address(ECX, Instance::tags_offset()), Immediate(tags));
       // Set the new InstantiatedTypeArguments object (ECX) as the type
       // arguments (EDI) of the new object (EAX).
       __ movl(EDI, ECX);
       __ addl(EDI, Immediate(kHeapObjectTag));
       // Set EBX to new object end.
       __ movl(EBX, ECX);
       __ Bind(&type_arguments_ready);
       // EAX: new object.
       // EDI: new object type arguments.
     }
 
     // Initialize the class field in the object.
     // EAX: new object start.
     // EBX: next object start.
     // EDI: new object type arguments (if is_cls_parameterized).
     __ LoadObject(EDX, cls);  // Load class of object to be allocated.
     __ movl(Address(EAX, Instance::class_offset()), EDX);
     // Set the tags.
-    intptr_t tags = 0;
+    uword tags = 0;
     tags = RawObject::SizeTag::update(instance_size, tags);
     ASSERT(cls.index() != kIllegalObjectKind);
     tags = RawObject::ClassTag::update(cls.index(), tags);
     __ movl(Address(EAX, Instance::tags_offset()), Immediate(tags));
 
     // Initialize the remaining words of the object.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
     // EAX: new object start.
@@ skipping 132 matching lines @@
     // Successfully allocated the object, now update top to point to
     // next object start and initialize the object.
     __ movl(Address::Absolute(heap->TopAddress()), EBX);
 
     // Initialize the class field in the object.
     // EAX: new closure object.
     // ECX: new context object (only if is_implicit_closure).
     __ LoadObject(EDX, cls);  // Load signature class of closure.
     __ movl(Address(EAX, Closure::class_offset()), EDX);
     // Set the tags.
-    intptr_t tags = 0;
+    uword tags = 0;
     tags = RawObject::SizeTag::update(closure_size, tags);
     tags = RawObject::ClassTag::update(cls.index(), tags);
     __ movl(Address(EAX, Closure::tags_offset()), Immediate(tags));
 
     // Initialize the function field in the object.
     // EAX: new closure object.
     // ECX: new context object (only if is_implicit_closure).
     // EBX: next object start.
     __ LoadObject(EDX, func);  // Load function of closure to be allocated.
     __ movl(Address(EAX, Closure::function_offset()), EDX);
 
     // Setup the context for this closure.
     if (is_implicit_static_closure) {
       ObjectStore* object_store = Isolate::Current()->object_store();
       ASSERT(object_store != NULL);
       const Context& empty_context =
           Context::ZoneHandle(object_store->empty_context());
       __ LoadObject(EDX, empty_context);
       __ movl(Address(EAX, Closure::context_offset()), EDX);
     } else if (is_implicit_instance_closure) {
       // Initialize the new context capturing the receiver.
 
       // Set the class field to the Context class.
       const Class& context_class = Class::ZoneHandle(Object::context_class());
       __ LoadObject(EBX, context_class);
       __ movl(Address(ECX, Context::class_offset()), EBX);
       // Set the tags.
-      intptr_t tags = 0;
+      uword tags = 0;
       tags = RawObject::SizeTag::update(context_size, tags);
       tags = RawObject::ClassTag::update(context_class.index(), tags);
       __ movl(Address(ECX, Context::tags_offset()), Immediate(tags));
 
       // Set number of variables field to 1 (for captured receiver).
       __ movl(Address(ECX, Context::num_variables_offset()), Immediate(1));
 
       // Set isolate field to isolate of current context.
       __ movl(EDX, FieldAddress(CTX, Context::isolate_offset()));
       __ movl(Address(ECX, Context::isolate_offset()), EDX);
@@ skipping 508 matching lines @@
   __ ret();
 
   __ Bind(&found);
   __ movl(ECX, Address(EDX, kWordSize * SubTypeTestCache::kTestResult));
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32