- Always write a Null Object for Code objects

vm/code_generator.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/code_generator.h"
 
 #include "vm/code_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1118 matching lines @@
       Smi::Handle(Smi::New(num_arguments)));
   cache.SetAt(i + FunctionsCache::kNamedArgCount,
       Smi::Handle(Smi::New(num_named_arguments)));
   cache.SetAt(i + FunctionsCache::kFunction, function);
 }
 
 
 void FunctionsCache::AddCompiledFunction(const Function& function,
                                          int num_arguments,
                                          int num_named_arguments) {
+// TODO(srdjan): Evaluate if populating the function cache is needed.
+// It is turned off currently because we do not populate code objects
+// in snapshot and hence end up in an inconsistent state as function
+// cache is populated but there are no code objects.
+#if 0
   ASSERT(function.HasCode());
   Array& cache = Array::Handle(class_.functions_cache());
   // Search for first free slot. Last entry is always NULL object.
   for (intptr_t i = 0; i < (cache.Length() - kNumEntries); i += kNumEntries) {
     if (Object::Handle(cache.At(i)).IsNull()) {
       EnterFunctionAt(i,
                       cache,
                       function,
                       num_arguments,
                       num_named_arguments);
       return;
     }
   }
   intptr_t ix = cache.Length() - kNumEntries;
   // Grow by 8 entries.
   cache = Array::Grow(cache, cache.Length() + (8 * kNumEntries));
   class_.set_functions_cache(cache);
   EnterFunctionAt(ix,
                   cache,
                   function,
                   num_arguments,
                   num_named_arguments);
+#endif
 }
 
 
 // Only the number of named arguments is checked, but not the actual names.
 RawCode* FunctionsCache::LookupCode(const String& function_name,
                                     int num_arguments,
                                     int num_named_arguments) {
   const Array& cache = Array::Handle(class_.functions_cache());
   String& test_name = String::Handle();
   for (intptr_t i = 0; i < cache.Length(); i += kNumEntries) {
@@ skipping 17 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart