Progress toward inlined type checks for classes with type arguments: factor out code, optimize typ…

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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 2721 matching lines @@
     const AbstractType& uninstantiated_type,
     const AbstractTypeArguments& instantiator_type_arguments) {
   const InstantiatedType& result =
       InstantiatedType::Handle(InstantiatedType::New());
   result.set_uninstantiated_type(uninstantiated_type);
   result.set_instantiator_type_arguments(instantiator_type_arguments);
   return result.raw();
 }
 
 
+bool InstantiatedType::Equals(const AbstractType& other) const {
+  if (raw() == other.raw()) {
+    return true;
+  }
+  if (!other.IsInstantiatedType()) {
+    return false;
+  }
+  InstantiatedType& other_instantiated = InstantiatedType::Handle();
+  other_instantiated ^= other.raw();
+  if (IsFinalized() != other_instantiated.IsFinalized()) {

[regis, 2012/04/25 01:53:53]

I do not think this is necessary. An InstantiatedType is only created at run
time and finalization has meaning at compile time only. We mark an
InstantiatedType as finalized upon creation. 

[srdjan, 2012/04/25 16:38:01]

Is is used for canonicalization. Will try to do it without canonicalization.

+    return false;
+  }
+  const AbstractType& this_type = AbstractType::Handle(uninstantiated_type());
+  const AbstractType& other_type =
+      AbstractType::Handle(other_instantiated.uninstantiated_type());
+  if (!this_type.Equals(other_type)) {
+    return false;
+  }
+  if (instantiator_type_arguments() !=

[regis, 2012/04/25 01:53:53]

Using != is not correct. You should be using Equals.

[srdjan, 2012/04/25 16:38:01]

Using AreEqual.

+      other_instantiated.instantiator_type_arguments()) {
+    return false;
+  }
+  return true;
+}
+
+
 const char* InstantiatedType::ToCString() const {
   return "InstantiatedType";
 }
 
 
 intptr_t AbstractTypeArguments::Length() const  {
   // AbstractTypeArguments is an abstract class.
   UNREACHABLE();
   return -1;
 }
@@ skipping 6481 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart