Cleanup change.

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/become.h"
@@ skipping 16702 matching lines @@
 
 RawType* Type::DartFunctionType() {
   return Isolate::Current()->object_store()->function_type();
 }
 
 
 RawType* Type::NewNonParameterizedType(const Class& type_class) {
   ASSERT(type_class.NumTypeArguments() == 0);
   Type& type = Type::Handle(type_class.CanonicalType());
   if (type.IsNull()) {
-    const TypeArguments& no_type_arguments = TypeArguments::Handle();
-    type ^= Type::New(Object::Handle(type_class.raw()), no_type_arguments,
-                      TokenPosition::kNoSource);
+    type ^= Type::New(Object::Handle(type_class.raw()),
+                      Object::null_type_arguments(), TokenPosition::kNoSource);
     type.SetIsFinalized();
     type ^= type.Canonicalize();
   }
   ASSERT(type.IsFinalized());
   return type.raw();
 }
 
 
 void Type::SetIsFinalized() const {
   ASSERT(!IsFinalized());
@@ skipping 271 matching lines @@
       } else if (other_type_args.IsNull()) {
         // Ignore from_index.
         if (!type_args.IsRaw(0, num_type_args)) {
           return false;
         }
       } else if (!type_args.IsSubvectorEquivalent(other_type_args, from_index,
                                                   num_type_params, trail)) {
         return false;
       }
 #ifdef DEBUG
-      if (from_index > 0) {
+      if ((from_index > 0) && !type_args.IsNull() &&
+          !other_type_args.IsNull()) {
         // Verify that the type arguments of the super class match, since they
         // depend solely on the type parameters that were just verified to
         // match.
         ASSERT(type_args.Length() >= (from_index + num_type_params));
         ASSERT(other_type_args.Length() >= (from_index + num_type_params));
         AbstractType& type_arg = AbstractType::Handle(zone);
         AbstractType& other_type_arg = AbstractType::Handle(zone);
         for (intptr_t i = 0; i < from_index; i++) {
           type_arg = type_args.TypeAt(i);
           other_type_arg = other_type_args.TypeAt(i);
@@ skipping 6058 matching lines @@
   return UserTag::null();
 }
 
 
 const char* UserTag::ToCString() const {
   const String& tag_label = String::Handle(label());
   return tag_label.ToCString();
 }
 
 }  // namespace dart