- Do not mix scalar values and object fields in RawInstance to

runtime/vm/raw_object.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/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 575 matching lines @@
     RawUnwindError* raw_obj, ObjectPointerVisitor* visitor) {
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return UnwindError::InstanceSize();
 }
 
 
 intptr_t RawInstance::VisitInstancePointers(RawInstance* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
-  RawClass* cls = visitor->isolate()->class_table()->At(raw_obj->GetClassId());
-  intptr_t instance_size = cls->ptr()->instance_size_;
-  intptr_t num_native_fields = cls->ptr()->num_native_fields_;
+  uword tags = raw_obj->ptr()->tags_;

[cshapiro, 2012/11/12 18:48:45]

Any reason we are not just using RawObject::Size() to populate instance_size?

[Ivan Posva, 2012/11/12 22:01:03]

I tried to keep it as similar as possible to the original code, and since I
think one of the next steps is to explode this code into VisitPointers directly,
I did not prettify it much.

+  intptr_t instance_size = SizeTag::decode(tags);
+  if (instance_size == 0) {
+    RawClass* cls =
+        visitor->isolate()->class_table()->At(raw_obj->GetClassId());
+    instance_size = cls->ptr()->instance_size_;
+  }
 
   // Calculate the first and last raw object pointer fields.
   uword obj_addr = RawObject::ToAddr(raw_obj);
-  uword from = obj_addr + sizeof(RawObject) + num_native_fields * kWordSize;
+  uword from = obj_addr + sizeof(RawObject);
   uword to = obj_addr + instance_size - kWordSize;
   visitor->VisitPointers(reinterpret_cast<RawObject**>(from),
                          reinterpret_cast<RawObject**>(to));
   return instance_size;
 }
 
 
 intptr_t RawNumber::VisitNumberPointers(RawNumber* raw_obj,
                                         ObjectPointerVisitor* visitor) {
   // Number is an abstract class.
@@ skipping 342 matching lines @@
 
 intptr_t RawWeakProperty::VisitWeakPropertyPointers(
     RawWeakProperty* raw_obj, ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return WeakProperty::InstanceSize();
 }
 
 }  // namespace dart