Fix 11574: Smi is a subtype of parametrizable Compare.

runtime/vm/flow_graph_compiler_mips.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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_MIPS.
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 207 matching lines @@
 FlowGraphCompiler::GenerateInstantiatedTypeWithArgumentsTest(
     intptr_t token_pos,
     const AbstractType& type,
     Label* is_instance_lbl,
     Label* is_not_instance_lbl) {
   __ Comment("InstantiatedTypeWithArgumentsTest");
   ASSERT(type.IsInstantiated());
   const Class& type_class = Class::ZoneHandle(type.type_class());
   ASSERT(type_class.HasTypeArguments());
   const Register kInstanceReg = A0;
-  // A Smi object cannot be the instance of a parameterized class.
+  Error& malformed_error = Error::Handle();
+  const Type& int_type = Type::Handle(Type::IntType());
+  const bool smi_is_ok = int_type.IsSubtypeOf(type, &malformed_error);
+  // Malforrmed type should have been handled at graph construction time.
+  ASSERT(smi_is_ok || malformed_error.IsNull());
   __ andi(CMPRES, kInstanceReg, Immediate(kSmiTagMask));
-  __ beq(CMPRES, ZR, is_not_instance_lbl);
+  if (smi_is_ok) {
+    __ beq(CMPRES, ZR, is_not_instance_lbl);

[regis, 2013/06/28 22:07:09]

is_instance_lbl

[srdjan, 2013/06/28 22:11:34]

Done.

+  } else {
+    __ beq(CMPRES, ZR, is_not_instance_lbl);
+  }
   const AbstractTypeArguments& type_arguments =
       AbstractTypeArguments::ZoneHandle(type.arguments());
   const bool is_raw_type = type_arguments.IsNull() ||
       type_arguments.IsRaw(type_arguments.Length());
   if (is_raw_type) {
     const Register kClassIdReg = T0;
     // dynamic type argument, check only classes.
     __ LoadClassId(kClassIdReg, kInstanceReg);
     __ BranchEqual(kClassIdReg, type_class.id(), is_instance_lbl);
     // List is a very common case.
@@ skipping 251 matching lines @@
     } else {
       __ beq(CMPRES, ZR, is_not_instance_lbl);
       __ LoadClassId(T0, kInstanceReg);
       __ BranchEqual(T0, type_cid, is_instance_lbl);
     }
     __ b(is_not_instance_lbl);
     return SubtypeTestCache::null();
   }
   if (type.IsInstantiated()) {
     const Class& type_class = Class::ZoneHandle(type.type_class());
-    // A Smi object cannot be the instance of a parameterized class.
     // A class equality check is only applicable with a dst type of a
     // non-parameterized class or with a raw dst type of a parameterized class.
     if (type_class.HasTypeArguments()) {
       return GenerateInstantiatedTypeWithArgumentsTest(token_pos,
                                                        type,
                                                        is_instance_lbl,
                                                        is_not_instance_lbl);
       // Fall through to runtime call.
     }
     const bool has_fall_through =
@@ skipping 1399 matching lines @@
   __ AddImmediate(SP, kDoubleSize);
 }
 
 
 #undef __
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS