Use special allocation functions for object creation while deserializing from a full snapshot in ...

vm/object.h

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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 "vm/assert.h"
 #include "vm/dart.h"
 #include "vm/globals.h"
 #include "vm/handles.h"
@@ skipping 150 matching lines @@
     kUnwindErrorClass,
     kMaxId,
     kInvalidIndex = -1,
   };
 
   virtual ~Object() { }
 
   RawObject* raw() const { return raw_; }
   void operator=(RawObject* value) { SetRaw(value); }
 
-  void set_tags(intptr_t value) {
+  void set_tags(intptr_t value) const {
     // TODO(asiva): Remove the capability of setting tags in general. The mask
     // here only allows for canonical and from_snapshot flags to be set.
     ASSERT(!IsNull());
     uword tags = raw()->ptr()->tags_ & ~0x0000000c;
     raw()->ptr()->tags_ = tags | (value & 0x0000000c);
   }
   void SetCreatedFromSnapshot() const {
     ASSERT(!IsNull());
     raw()->SetCreatedFromSnapshot();
   }
@@ skipping 158 matching lines @@
 
   static RawObject* Allocate(const Class& cls,
                              intptr_t size,
                              Heap::Space space);
 
   static intptr_t RoundedAllocationSize(intptr_t size) {
     return Utils::RoundUp(size, kObjectAlignment);
   }
 
   template<typename type> void StorePointer(type* addr, type value) const {
-    ASSERT(Isolate::Current()->no_gc_scope_depth() == 0);
     // TODO(iposva): Implement real store barrier here.
     *addr = value;
     // Filter stores based on source and target.
     if (value->IsNewObject() && raw()->IsOldObject()) {
       uword ptr = reinterpret_cast<uword>(addr);
       Isolate::Current()->store_buffer()->AddPointer(ptr);
     }
   }
 
   RawObject* raw_;  // The raw object reference.
@@ skipping 38 matching lines @@
   static RawClass* var_descriptors_class_;  // Class of LocalVarDescriptors.
   static RawClass* exception_handlers_class_;  // Class of ExceptionHandlers.
   static RawClass* context_class_;  // Class of the Context vm object.
   static RawClass* context_scope_class_;  // Class of ContextScope vm object.
   static RawClass* api_error_class_;  // Class of ApiError.
   static RawClass* language_error_class_;  // Class of LanguageError.
   static RawClass* unhandled_exception_class_;  // Class of UnhandledException.
   static RawClass* unwind_error_class_;  // Class of UnwindError.
 
   friend void RawObject::Validate() const;
+  friend class SnapshotReader;
 
   // Disallow allocation.
   void* operator new(size_t size);
   // Disallow copy constructor.
   DISALLOW_COPY_AND_ASSIGN(Object);
 };
 
 
 class Class : public Object {
  public:
@@ skipping 2325 matching lines @@
     raw_ptr()->length_ = Smi::New(value);
   }
 
   void SetHash(intptr_t value) const {
     // This is only safe because we create a new Smi, which does not cause
     // heap allocation.
     raw_ptr()->hash_ = Smi::New(value);
   }
 
   template<typename HandleType, typename ElementType>
-  static RawString* ReadFromImpl(SnapshotReader* reader,
-                                 intptr_t object_id,
-                                 intptr_t tags,
-                                 Snapshot::Kind kind);
+  static void ReadFromImpl(SnapshotReader* reader,
+                           HandleType* str_obj,
+                           intptr_t len,
+                           intptr_t hash,
+                           intptr_t tags);
 
   HEAP_OBJECT_IMPLEMENTATION(String, Instance);
 };
 
 
 class OneByteString : public String {
  public:
   virtual int32_t CharAt(intptr_t index) const {
     return *CharAddr(index);
   }
@@ skipping 347 matching lines @@
   static intptr_t InstanceSize(intptr_t len) {
     // Ensure that variable length data is not adding to the object length.
     ASSERT(sizeof(RawArray) == (sizeof(RawObject) + (2 * kWordSize)));
     return RoundedAllocationSize(sizeof(RawArray) + (len * kWordSize));
   }
 
   // Make the array immutable to Dart code by switching the class pointer
   // to ImmutableArray.
   void MakeImmutable() const;
 
-  static RawArray* New(intptr_t len, Heap::Space space = Heap::kNew) {
-    return New(len, false, space);
-  }
+  static RawArray* New(intptr_t len, Heap::Space space = Heap::kNew);
 
   // Creates and returns a new array with 'new_length'. Copies all elements from
   // 'source' to the new array. 'new_length' must be greater than or equal to
   // 'source.Length()'. 'source' can be null.
   static RawArray* Grow(const Array& source,
                         int new_length,
                         Heap::Space space = Heap::kNew);
 
   // Returns the preallocated empty array, used to initialize array fields.
   static RawArray* Empty();
 
  protected:
-  static RawArray* New(intptr_t len,
-                       bool immutable,
+  static RawArray* New(const Class& cls,
+                       intptr_t len,
                        Heap::Space space = Heap::kNew);
 
  private:
   // Make sure that the array size cannot wrap around.
   static const intptr_t kMaxArrayElements = 512 * 1024 * 1024;
 
   RawObject** ObjectAddr(intptr_t index) const {
     // TODO(iposva): Determine if we should throw an exception here.
     ASSERT((index >= 0) && (index < Length()));
     return &raw_ptr()->data()[index];
   }
 
   void SetLength(intptr_t value) {
     // This is only safe because we create a new Smi, which does not cause
     // heap allocation.
     raw_ptr()->length_ = Smi::New(value);
   }
 
   HEAP_OBJECT_IMPLEMENTATION(Array, Instance);
   friend class Class;
 };
 
 
 class ImmutableArray : public Array {
  public:
-  static RawImmutableArray* New(intptr_t len, Heap::Space space = Heap::kNew) {
-    return reinterpret_cast<RawImmutableArray*>(Array::New(len, true, space));
-  }
+  static RawImmutableArray* New(intptr_t len, Heap::Space space = Heap::kNew);
 
  private:
   HEAP_OBJECT_IMPLEMENTATION(ImmutableArray, Array);
   friend class Class;
 };
 
 
 class ByteBuffer : public Instance {
  public:
   intptr_t Length() const {
@@ skipping 264 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_