Cleanup change.

runtime/vm/jit_optimizer.cc

 // Copyright (c) 2013, 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 DART_PRECOMPILED_RUNTIME
 #include "vm/jit_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/branch_optimizer.h"
 #include "vm/cha.h"
 #include "vm/compiler.h"
@@ skipping 1193 matching lines @@
     if (cls.NumTypeArguments() > 0) {
       return Bool::null();
     }
     // As of Dart 1.5, the Null type is a subtype of (and is more specific than)
     // any type. However, we are checking instances here and not types. The
     // null instance is only an instance of Null, Object, and dynamic.
     const bool is_subtype =
         cls.IsNullClass()
             ? (type_class.IsNullClass() || type_class.IsObjectClass() ||
                type_class.IsDynamicClass())
-            : cls.IsSubtypeOf(TypeArguments::Handle(Z), type_class,
-                              TypeArguments::Handle(Z), NULL, NULL, Heap::kOld);
+            : cls.IsSubtypeOf(Object::null_type_arguments(), type_class,
+                              Object::null_type_arguments(), NULL, NULL,
+                              Heap::kOld);
     results->Add(cls.id());
     results->Add(is_subtype);
     if (prev.IsNull()) {
       prev = Bool::Get(is_subtype).raw();
     } else {
       if (is_subtype != prev.value()) {
         results_differ = true;
       }
     }
   }
@@ skipping 71 matching lines @@
 // necessary.
 // TODO(srdjan): Do also for other than 'int' type.
 static bool TryExpandTestCidsResult(ZoneGrowableArray<intptr_t>* results,
                                     const AbstractType& type) {
   ASSERT(results->length() >= 2);  // At least on eentry.
   const ClassTable& class_table = *Isolate::Current()->class_table();
   if ((*results)[0] != kSmiCid) {
     const Class& cls = Class::Handle(class_table.At(kSmiCid));
     const Class& type_class = Class::Handle(type.type_class());
     const bool smi_is_subtype =
-        cls.IsSubtypeOf(TypeArguments::Handle(), type_class,
-                        TypeArguments::Handle(), NULL, NULL, Heap::kOld);
+        cls.IsSubtypeOf(Object::null_type_arguments(), type_class,
+                        Object::null_type_arguments(), NULL, NULL, Heap::kOld);
     results->Add((*results)[results->length() - 2]);
     results->Add((*results)[results->length() - 2]);
     for (intptr_t i = results->length() - 3; i > 1; --i) {
       (*results)[i] = (*results)[i - 2];
     }
     (*results)[0] = kSmiCid;
     (*results)[1] = smi_is_subtype;
   }
 
   ASSERT(type.IsInstantiated() && !type.IsMalformedOrMalbounded());
@@ skipping 549 matching lines @@
   // Discard the environment from the original instruction because the store
   // can't deoptimize.
   instr->RemoveEnvironment();
   ReplaceCall(instr, store);
   return true;
 }
 
 
 }  // namespace dart
 #endif  // DART_PRECOMPILED_RUNTIME