- Always write a Null Object for Code objects

vm/object_store.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/object_store.h"
 
 #include "vm/exceptions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
@@ skipping 36 matching lines @@
     core_library_(Library::null()),
     core_impl_library_(Library::null()),
     native_wrappers_library_(Library::null()),
     root_library_(Library::null()),
     registered_libraries_(Library::null()),
     pending_classes_(Array::null()),
     sticky_error_(Error::null()),
     empty_context_(Context::null()),
     stack_overflow_(Instance::null()),
     out_of_memory_(Instance::null()),
-    keyword_symbols_(Array::null()),
-    preallocate_objects_called_(false) {
+    keyword_symbols_(Array::null()) {
 }
 
 
 ObjectStore::~ObjectStore() {
 }
 
 
 void ObjectStore::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   ASSERT(visitor != NULL);
   visitor->VisitPointers(from(), to());
 }
 
 
 void ObjectStore::Init(Isolate* isolate) {
   ASSERT(isolate->object_store() == NULL);
   ObjectStore* store = new ObjectStore();
   isolate->set_object_store(store);
 }
 
 
 bool ObjectStore::PreallocateObjects() {
-  if (preallocate_objects_called_) {
+  Isolate* isolate = Isolate::Current();
+  ASSERT(isolate != NULL && isolate->object_store() == this);
+  if (this->stack_overflow() != Instance::null() &&
+      this->out_of_memory() != Instance::null()) {
     return true;
   }
-  Isolate* isolate = Isolate::Current();
-  ASSERT(isolate != NULL && isolate->object_store() == this);
+  ASSERT(this->stack_overflow() == Instance::null());
+  ASSERT(this->out_of_memory() == Instance::null());
   GrowableArray<const Object*> args;
   Object& result = Object::Handle();
   Instance& exception = Instance::Handle();
 
   result = Exceptions::Create(Exceptions::kStackOverflow, args);
   if (result.IsError()) {
     return false;
   }
   exception ^= result.raw();
   set_stack_overflow(exception);
 
   result = Exceptions::Create(Exceptions::kOutOfMemory, args);
   if (result.IsError()) {
     return false;
   }
   exception ^= result.raw();
   set_out_of_memory(exception);
-
-  preallocate_objects_called_ = true;
   return true;
 }
 
 
 void ObjectStore::InitKeywordTable() {
   // Set up the keywords symbol array so that we can access it while scanning.
   Array& keywords = Array::Handle(keyword_symbols());
   ASSERT(keywords.IsNull());
   keywords = Array::New(Token::numKeywords, Heap::kOld);
   ASSERT(!keywords.IsError() && !keywords.IsNull());
@@ skipping 116 matching lines @@
     return kStringInterface;
   } else if (raw_type == list_interface()) {
     return kListInterface;
   } else if (raw_type == byte_array_interface()) {
     return kByteArrayInterface;
   }
   return kInvalidIndex;
 }
 
 }  // namespace dart