Fix type check to perform a subtype test at top level instead of an

runtime/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 395 matching lines @@
         String::New(malformed_error.ToErrorCString()));
     const String& no_name = String::Handle(String::NewSymbol(""));
     Exceptions::CreateAndThrowTypeError(
         location, no_name, no_name, no_name, malformed_error_message);
     UNREACHABLE();
   }
   arguments.SetReturn(result);
 }
 
 
-// Check that the type of the given instance is assignable to the given type.
+// Check that the type of the given instance is a subtype of the given type and
+// can therefore be assigned.
 // Arg0: index of the token of the assignment (source location).
 // Arg1: instance being assigned.
 // Arg2: type being assigned to.
 // Arg3: type arguments of the instantiator of the type being assigned to.
-// Arg4: name of instance being assigned to.
-// Return value: instance if assignable, otherwise throw a TypeError.
+// Arg4: name of variable being assigned to.
+// Return value: instance if a subtype, otherwise throw a TypeError.
 DEFINE_RUNTIME_ENTRY(TypeCheck, 5) {
   ASSERT(arguments.Count() == kTypeCheckRuntimeEntry.argument_count());
   // TODO(regis): Get the token index from the PcDesc (via DartFrame).
   intptr_t location = Smi::CheckedHandle(arguments.At(0)).Value();
   const Instance& src_instance = Instance::CheckedHandle(arguments.At(1));
   const AbstractType& dst_type = AbstractType::CheckedHandle(arguments.At(2));
   const AbstractTypeArguments& dst_type_instantiator =
       AbstractTypeArguments::CheckedHandle(arguments.At(3));
   const String& dst_name = String::CheckedHandle(arguments.At(4));
   ASSERT(!dst_type.IsDynamicType());  // No need to check assignment.
+  ASSERT(!dst_type.IsMalformed());  // Already checked in code generator.
   ASSERT(!src_instance.IsNull());  // Already checked in inlined code.
 
   Error& malformed_error = Error::Handle();
-  const bool is_assignable = src_instance.IsAssignableTo(
+  const bool is_instance_of = src_instance.IsInstanceOf(
       dst_type, dst_type_instantiator, &malformed_error);
 
   if (FLAG_trace_type_checks) {
     const Type& src_type = Type::Handle(src_instance.GetType());
     if (dst_type.IsInstantiated()) {
-      OS::Print("TypeCheck: '%s' %s assignable to '%s' of '%s'.\n",
+      OS::Print("TypeCheck: type '%s' %s a subtype of type '%s' of '%s'.\n",
                 String::Handle(src_type.Name()).ToCString(),
-                is_assignable ? "is" : "is not",
+                is_instance_of ? "is" : "is not",
                 String::Handle(dst_type.Name()).ToCString(),
                 dst_name.ToCString());
     } else {
       // Instantiate dst_type before printing.
       const AbstractType& instantiated_dst_type = AbstractType::Handle(
           dst_type.InstantiateFrom(dst_type_instantiator));
-      OS::Print("TypeCheck: '%s' %s assignable to '%s' of '%s' "
+      OS::Print("TypeCheck: type '%s' %s a subtype of type '%s' of '%s' "
                 "instantiated from '%s'.\n",
                 String::Handle(src_type.Name()).ToCString(),
-                is_assignable ? "is" : "is not",
+                is_instance_of ? "is" : "is not",
                 String::Handle(instantiated_dst_type.Name()).ToCString(),
                 dst_name.ToCString(),
                 String::Handle(dst_type.Name()).ToCString());
     }
     DartFrameIterator iterator;
     DartFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const Function& function = Function::Handle(
         caller_frame->LookupDartFunction());
     OS::Print(" -> Function %s\n", function.ToFullyQualifiedCString());
   }
-  if (!is_assignable) {
+  if (!is_instance_of) {
     const Type& src_type = Type::Handle(src_instance.GetType());
     const String& src_type_name = String::Handle(src_type.Name());
     String& dst_type_name = String::Handle();
     if (!dst_type.IsInstantiated()) {
       // Instantiate dst_type before reporting the error.
       const AbstractType& instantiated_dst_type = AbstractType::Handle(
           dst_type.InstantiateFrom(dst_type_instantiator));
       dst_type_name = instantiated_dst_type.Name();
     } else {
       dst_type_name = dst_type.Name();
@@ skipping 50 matching lines @@
   const String& malformed_error = String::CheckedHandle(arguments.At(3));
   const String& dst_type_name = String::Handle(String::NewSymbol("malformed"));
   const String& src_type_name =
       String::Handle(Type::Handle(src_value.GetType()).Name());
   Exceptions::CreateAndThrowTypeError(location, src_type_name,
                                       dst_type_name, dst_name, malformed_error);
   UNREACHABLE();
 }
 
 
+// TODO(regis): Function rest arguments are not supported anymore, but they may
+// come back.
 // Check that the type of each element of the given array is assignable to the
 // given type.
 // Arg0: index of the token of the rest argument declaration (source location).
 // Arg1: rest argument array.
 // Arg2: element declaration type.
 // Arg3: type arguments of the instantiator of the element declaration type.
 // Arg4: name of object being assigned to, i.e. name of rest argument.
 // Return value: null if assignable, otherwise allocate and throw a TypeError.
 DEFINE_RUNTIME_ENTRY(RestArgumentTypeCheck, 5) {
   ASSERT(arguments.Count() ==
       kRestArgumentTypeCheckRuntimeEntry.argument_count());
   // TODO(regis): Get the token index from the PcDesc (via DartFrame).
   intptr_t location = Smi::CheckedHandle(arguments.At(0)).Value();
   const Array& rest_array = Array::CheckedHandle(arguments.At(1));
   const AbstractType& element_type =
       AbstractType::CheckedHandle(arguments.At(2));
   const AbstractTypeArguments& element_type_instantiator =
       AbstractTypeArguments::CheckedHandle(arguments.At(3));
   const String& rest_name = String::CheckedHandle(arguments.At(4));
   ASSERT(!element_type.IsDynamicType());  // No need to check assignment.
+  ASSERT(!element_type.IsMalformed());  // Already checked in code generator.
   ASSERT(!rest_array.IsNull());
 
   Instance& elem = Instance::Handle();
   Error& malformed_error = Error::Handle();
   for (intptr_t i = 0; i < rest_array.Length(); i++) {
     elem ^= rest_array.At(i);
     // The previous successful type check may have set malformed_error.
     // Note that a returned malformed_error is ignored if a type check succeeds.
     malformed_error = Error::null();
-    if (!elem.IsNull() && !elem.IsAssignableTo(element_type,
-                                               element_type_instantiator,
-                                               &malformed_error)) {
+    if (!elem.IsNull() && !elem.IsInstanceOf(element_type,
+                                             element_type_instantiator,
+                                             &malformed_error)) {
       // Allocate and throw a new instance of TypeError.
       char buf[256];
       OS::SNPrint(buf, sizeof(buf), "%s[%d]",
                   rest_name.ToCString(), static_cast<int>(i));
       const String& src_type_name =
           String::Handle(Type::Handle(elem.GetType()).Name());
       String& dst_type_name = String::Handle();
       if (!element_type.IsInstantiated()) {
         // Instantiate element_type before reporting the error.
         const AbstractType& instantiated_element_type = AbstractType::Handle(
@@ skipping 849 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart