- Promote objects from new gen to old space if they survived a scavenge.

vm/raw_object.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/raw_object.h"
 
 #include "vm/freelist.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/visitor.h"
 
 
 namespace dart {
 
 void RawObject::Validate() const {
   // All Smi values are valid.
   if (!IsHeapObject()) {
     return;
   }
   // Validate that the class_ field is sensible.
   RawClass* raw_class = ptr()->class_;
   ASSERT(raw_class->IsHeapObject());
   RawClass* raw_class_class = raw_class->ptr()->class_;
   ASSERT(raw_class_class->IsHeapObject());
   ASSERT(raw_class_class->ptr()->instance_kind_ == kClass);
+
+  // Validate that the tags_ field is sensible.
+  intptr_t tags = ptr()->tags_;
+  ASSERT((tags & 0xfffffff0) == 0);
 }
 
 
 intptr_t RawObject::Size() const {
   NoHandleScope no_handles(Isolate::Current());
 
   // Only reasonable to be called on heap objects.
   ASSERT(IsHeapObject());
 
   RawClass* raw_class = ptr()->class_;
-  if (IsMarked()) {
-    // If the object is marked we need to remove the marking bits from the
-    // raw_class which we loaded above.
-    uword header_bits = reinterpret_cast<uword>(raw_class);
-    header_bits = (header_bits & ~kMarkingMask) | kNotMarked;
-    raw_class = reinterpret_cast<RawClass*>(header_bits);
-  }
   intptr_t instance_size = raw_class->ptr()->instance_size_;
   ObjectKind instance_kind = raw_class->ptr()->instance_kind_;
 
   if (instance_size == 0) {
     switch (instance_kind) {
       case kTokenStream: {
         const RawTokenStream* raw_tokens =
             reinterpret_cast<const RawTokenStream*>(this);
         intptr_t tokens_length = Smi::Value(raw_tokens->ptr()->length_);
         instance_size = TokenStream::InstanceSize(tokens_length);
@@ skipping 114 matching lines @@
 
 intptr_t RawObject::VisitPointers(ObjectPointerVisitor* visitor) {
   intptr_t size = 0;
   NoHandleScope no_handles(Isolate::Current());
 
   // Only reasonable to be called on heap objects.
   ASSERT(IsHeapObject());
 
   // Read the necessary data out of the class before visting the class itself.
   RawClass* raw_class = ptr()->class_;
-  if (IsMarked()) {
-    // If the object is marked we need to remove the marking bits from the
-    // raw_class which we loaded above.
-    uword header_bits = reinterpret_cast<uword>(raw_class);
-    header_bits = (header_bits & ~kMarkingMask) | kNotMarked;
-    raw_class = reinterpret_cast<RawClass*>(header_bits);
-  }
   ObjectKind kind = raw_class->ptr()->instance_kind_;
 
   // Visit the class before visting the fields.
-  if (!IsMarked()) {
-    visitor->VisitPointer(reinterpret_cast<RawObject**>(&ptr()->class_));
-  }
+  visitor->VisitPointer(reinterpret_cast<RawObject**>(&ptr()->class_));
 
   switch (kind) {
 #define RAW_VISITPOINTERS(clazz) \
     case clazz::kInstanceKind: { \
       Raw##clazz* raw_obj = reinterpret_cast<Raw##clazz*>(this); \
       size = Raw##clazz::Visit##clazz##Pointers(raw_obj, visitor); \
       break; \
     }
     CLASS_LIST_NO_OBJECT(RAW_VISITPOINTERS)
 #undef RAW_VISITPOINTERS
@@ skipping 384 matching lines @@
 intptr_t RawJSRegExp::VisitJSRegExpPointers(RawJSRegExp* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   intptr_t length = Smi::Value(raw_obj->ptr()->data_length_);
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return JSRegExp::InstanceSize(length);
 }
 
 }  // namespace dart