Request for comments on overall approach.

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 182 matching lines @@
   bool IsCanonical() const {
     ASSERT(!IsNull());
     return raw()->IsCanonical();
   }
   void SetCanonical() const {
     ASSERT(!IsNull());
     raw()->SetCanonical();
   }
 
   inline RawClass* clazz() const;
-  static intptr_t class_offset() { return OFFSET_OF(RawObject, class_); }
   static intptr_t tags_offset() { return OFFSET_OF(RawObject, tags_); }
 
   // Class testers.
 #define DEFINE_CLASS_TESTER(clazz)                                             \
   virtual bool Is##clazz() const { return false; }
 CLASS_LIST_NO_OBJECT(DEFINE_CLASS_TESTER);
 #undef DEFINE_CLASS_TESTER
 
   bool IsNull() const { return raw_ == null_; }
 
@@ skipping 489 matching lines @@
   // class of signature_function.
   static RawClass* NewSignatureClass(const String& name,
                                      const Function& signature_function,
                                      const Script& script);
 
   // Return a class object corresponding to the specified kind. If
   // a canonicalized version of it exists then that object is returned
   // otherwise a new object is allocated and returned.
   static RawClass* GetClass(ObjectKind kind);
 
+  void ForceSetRaw(RawClass* raw) {
+    raw_ = raw;
+  }
+
  private:
   void set_name(const String& value) const;
   void set_script(const Script& value) const;
   void set_token_index(intptr_t value) const;
   void set_signature_function(const Function& value) const;
   void set_signature_type(const AbstractType& value) const;
   void set_class_state(int8_t state) const;
 
   void set_constants(const Array& value) const;
 
@@ skipping 1521 matching lines @@
     ASSERT(sizeof(RawCode) == OFFSET_OF(RawCode, data_));
     return 0;
   }
   static intptr_t InstanceSize(intptr_t pointer_offsets_length) {
     return RoundedAllocationSize(
         sizeof(RawCode) + (pointer_offsets_length * kEntrySize));
   }
   static RawCode* FinalizeCode(const Function& function, Assembler* assembler);
   static RawCode* FinalizeCode(const char* name, Assembler* assembler);
   static RawCode* LookupCode(uword pc);
+#ifdef DEBUG
+  static void FindAndPrint(uword pc);
+#endif
 
   int32_t GetPointerOffsetAt(int index) const {
     return *PointerOffsetAddrAt(index);
   }
   intptr_t GetTokenIndexOfPC(uword pc) const;
 
   // Find pc of patch code buffer. Return 0 if not found.
   uword GetPatchCodePc() const;
 
   uword GetDeoptPcAtNodeId(intptr_t node_id) const;
@@ skipping 2606 matching lines @@
   friend class Class;
 };
 
 
 // Breaking cycles and loops.
 RawClass* Object::clazz() const {
   uword raw_value = reinterpret_cast<uword>(raw_);
   if ((raw_value & kSmiTagMask) == kSmiTag) {
     return Smi::Class();
   }
-  RawClass* result = raw_->ptr()->class_;
-  ASSERT(result->ptr()->index_ ==
-      RawObject::ClassTag::decode(raw_->ptr()->tags_));
-  ASSERT(Isolate::Current()->class_table()->At(
-      RawObject::ClassTag::decode(raw_->ptr()->tags_)) == result);
-  return result;
+
+  return raw_->GetClass();

[Ivan Posva, 2012/05/26 04:34:46]

Please no functionality on RawObjects.

[Vyacheslav Egorov (Google), 2012/05/26 16:48:22]

ok. There is RawObject::Size so I assumed that RawObject::GetClass would be also
fine. 

will fix.

 }
 
 
 void Object::SetRaw(RawObject* value) {
   // NOTE: The assignment "raw_ = value" should be the first statement in
   // this function. Also do not use 'value' in this function after the
   // assignment (use 'raw_' instead).
   raw_ = value;
   if ((reinterpret_cast<uword>(raw_) & kSmiTagMask) == kSmiTag) {
     set_vtable(Smi::handle_vtable_);
     return;
   }
 #ifdef DEBUG
   Heap* isolate_heap = Isolate::Current()->heap();
   Heap* vm_isolate_heap = Dart::vm_isolate()->heap();
   ASSERT(isolate_heap->Contains(reinterpret_cast<uword>(raw_->ptr())) ||
          vm_isolate_heap->Contains(reinterpret_cast<uword>(raw_->ptr())));
 #endif
   set_vtable((raw_ == null_) ?
-             handle_vtable_ : raw_->ptr()->class_->ptr()->handle_vtable_);
+             handle_vtable_ : raw_->GetClass()->ptr()->handle_vtable_);
 }
 
 
 bool Function::HasCode() const {
   return raw_ptr()->code_ != Code::null();
 }
 
 
 intptr_t Field::Offset() const {
   ASSERT(!is_static());  // Offset is valid only for instance fields.
@@ skipping 32 matching lines @@
 }
 
 
 intptr_t Stackmap::SizeInBits() const {
   return (Smi::Value(raw_ptr()->bitmap_size_in_bytes_) * kBitsPerByte);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_