When canonicalize instances check if all fields are canonical. If a field is a non-canonical number…

runtime/vm/dart_entry.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/dart_entry.h"
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
@@ skipping 222 matching lines @@
     }
     // Insert pair in descriptor array.
     descriptor.SetAt(insert_index + kNameOffset, name);
     descriptor.SetAt(insert_index + kPositionOffset, pos);
   }
   // Set terminating null.
   descriptor.SetAt(descriptor_len - 1, Object::Handle());
 
   // Share the immutable descriptor when possible by canonicalizing it.
   descriptor.MakeImmutable();
-  descriptor ^= descriptor.Canonicalize();
+  descriptor ^= descriptor.CheckAndCanonicalize(NULL);
+  ASSERT(!descriptor.IsNull());
   return descriptor.raw();
 }
 
 
 RawArray* ArgumentsDescriptor::New(intptr_t num_arguments) {
   ASSERT(num_arguments >= 0);
   if (num_arguments < kCachedDescriptorCount) {
     return cached_args_descriptors_[num_arguments];
   }
   return NewNonCached(num_arguments);
@@ skipping 14 matching lines @@
 
   // Set number of positional arguments.
   descriptor.SetAt(kPositionalCountIndex, arg_count);
 
   // Set terminating null.
   descriptor.SetAt((descriptor_len - 1), Object::Handle());
 
   // Share the immutable descriptor when possible by canonicalizing it.
   descriptor.MakeImmutable();
   if (canonicalize) {
-    descriptor ^= descriptor.Canonicalize();
+    descriptor ^= descriptor.CheckAndCanonicalize(NULL);
   }
+  ASSERT(!descriptor.IsNull());
   return descriptor.raw();
 }
 
 
 void ArgumentsDescriptor::InitOnce() {
   for (int i = 0; i < kCachedDescriptorCount; i++) {
     cached_args_descriptors_[i] = ArgumentsDescriptor::NewNonCached(i, false);
   }
 }
 
@@ skipping 185 matching lines @@
           String::Handle(Field::GetterName(Symbols::_id()))));
   const Function& func = Function::Handle(cls.LookupDynamicFunction(func_name));
   ASSERT(!func.IsNull());
   const Array& args = Array::Handle(Array::New(1));
   args.SetAt(0, port);
   return DartEntry::InvokeFunction(func, args);
 }
 
 
 }  // namespace dart