- Add extra checking when validating objects.

vm/stub_code_x64.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.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
@@ skipping 1128 matching lines @@
       __ cmpq(RCX, RBX);
       __ j(EQUAL, &type_arguments_ready, Assembler::kNearJump);
       // Initialize InstantiatedTypeArguments object at RCX.
       __ movq(Address(RCX,
           InstantiatedTypeArguments::uninstantiated_type_arguments_offset()),
               RDI);
       __ movq(RDX, Address(RSP, kInstantiatorTypeArgumentsOffset));
       __ movq(Address(RCX,
           InstantiatedTypeArguments::instantiator_type_arguments_offset()),
               RDX);
-      __ LoadObject(RDX,
-          Class::ZoneHandle(Object::instantiated_type_arguments_class()));
+      const Class& ita_cls =
+          Class::ZoneHandle(Object::instantiated_type_arguments_class());
+      __ LoadObject(RDX, ita_cls);
       __ movq(Address(RCX, Instance::class_offset()), RDX);  // Set its class.
       // Set the tags.
-      __ movq(Address(RCX, 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);
+      __ movq(Address(RCX, Instance::tags_offset()), Immediate(tags));
       // Set the new InstantiatedTypeArguments object (RCX) as the type
       // arguments (RDI) of the new object (RAX).
       __ movq(RDI, RCX);
       __ addq(RDI, Immediate(kHeapObjectTag));
       // Set RBX to new object end.
       __ movq(RBX, RCX);
       __ Bind(&type_arguments_ready);
       // RAX: new object.
       // RDI: new object type arguments.
     }
 
     // Initialize the class field in the object.
     // RAX: new object start.
     // RBX: next object start.
     // RDI: new object type arguments (if is_cls_parameterized).
     __ LoadObject(RDX, cls);  // Load class of object to be allocated.
     __ movq(Address(RAX, Instance::class_offset()), RDX);
     // 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);
     __ movq(Address(RAX, Instance::tags_offset()), Immediate(tags));
 
     // Initialize the remaining words of the object.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
     // RAX: new object start.
@@ skipping 134 matching lines @@
     // next object start and initialize the object.
     __ movq(RDI, Immediate(heap->TopAddress()));
     __ movq(Address(RDI, 0), R13);
 
     // Initialize the class field in the object.
     // RAX: new closure object.
     // RBX: new context object (only if is_implicit_closure).
     __ LoadObject(R10, cls);  // Load signature class of closure.
     __ movq(Address(RAX, Closure::class_offset()), R10);
     // Set the tags.
-    intptr_t tags = 0;
+    uword tags = 0;
     tags = RawObject::SizeTag::update(closure_size, tags);
     tags = RawObject::ClassTag::update(cls.index(), tags);
     __ movq(Address(RAX, Closure::tags_offset()), Immediate(tags));
 
     // Initialize the function field in the object.
     // RAX: new closure object.
     // RBX: new context object (only if is_implicit_closure).
     // R13: next object start.
     __ LoadObject(R10, func);  // Load function of closure to be allocated.
     __ movq(Address(RAX, Closure::function_offset()), R10);
 
     // 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(R10, empty_context);
       __ movq(Address(RAX, Closure::context_offset()), R10);
     } 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(R13, context_class);
       __ movq(Address(RBX, Context::class_offset()), R13);
       // 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);
       __ movq(Address(RBX, Context::tags_offset()), Immediate(tags));
 
       // Set number of variables field to 1 (for captured receiver).
       __ movq(Address(RBX, Context::num_variables_offset()), Immediate(1));
 
       // Set isolate field to isolate of current context.
       __ movq(R10, FieldAddress(CTX, Context::isolate_offset()));
       __ movq(Address(RBX, Context::isolate_offset()), R10);
@@ skipping 434 matching lines @@
 }
 
 
 void StubCode::GenerateSubtypeTestCacheStub(Assembler* assembler) {
   __ Unimplemented("SubtypeTestCache Stub");
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64