Shorter code for simple type comparisons.

runtime/vm/flow_graph_compiler_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 200 matching lines @@
     __ j(EQUAL, is_equal_lbl);
   }
   __ jmp(is_not_equal_lbl);
 }
 
 
 // Testing against an instantiated type with no arguments, without
 // SubtypeTestCache.
 // EAX: instance to test against (preserved).
 // Clobbers ECX, EDI.
-void FlowGraphCompiler::GenerateInstantiatedTypeNoArgumentsTest(
+// Returns true if there is a fallthrough.
+bool FlowGraphCompiler::GenerateInstantiatedTypeNoArgumentsTest(
     intptr_t cid,
     intptr_t token_pos,
     const AbstractType& type,
     Label* is_instance_lbl,
     Label* is_not_instance_lbl) {
   ASSERT(type.IsInstantiated());
   const Class& type_class = Class::Handle(type.type_class());
   ASSERT(!type_class.HasTypeArguments());
 
   const Register kInstanceReg = EAX;
@@ skipping 19 matching lines @@
   if (!type_class.is_interface()) {
     __ cmpl(kClassIdReg, Immediate(type_class.id()));
     __ j(EQUAL, is_instance_lbl);
   }
   // Bool interface can be implemented only by core class Bool.
   // (see ClassFinalizer::ResolveInterfaces for list of restricted interfaces).
   if (type.IsBoolInterface()) {
     __ cmpl(kClassIdReg, Immediate(kBool));
     __ j(EQUAL, is_instance_lbl);
     __ jmp(is_not_instance_lbl);
-    return;
+    return false;
   }
   if (type.IsFunctionInterface()) {
     // Check if instance is a closure.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
     __ LoadClassById(EDI, kClassIdReg);
     __ movl(EDI, FieldAddress(EDI, Class::signature_function_offset()));
     __ cmpl(EDI, raw_null);
     __ j(NOT_EQUAL, is_instance_lbl);
     __ jmp(is_not_instance_lbl);
-    return;
+    return false;
   }
   // Custom checking for numbers (Smi, Mint, Bigint and Double).
-  // Note that instance is not Smi(checked above).
+  // Note that instance is not Smi (checked above).
   if (type.IsSubtypeOf(
           Type::Handle(Type::NumberInterface()), &malformed_error)) {
     GenerateNumberTypeCheck(
         kClassIdReg, type, is_instance_lbl, is_not_instance_lbl);
-    return;
+    return false;
   }
   if (type.IsStringInterface()) {
     GenerateStringTypeCheck(kClassIdReg, is_instance_lbl, is_not_instance_lbl);
-    return;
+    return false;
   }
   // Otherwise fallthrough.
+  return true;
 }
 
 
 // Uses SubtypeTestCache to store instance class and result.
 // EAX: instance to test.
 // Clobbers EDI, ECX.
 // Immediate class test already done.
 // TODO(srdjan): Implement a quicker subtype check, as type test
 // arrays can grow too high, but they may be useful when optimizing
 // code (type-feedback).
@@ skipping 135 matching lines @@
     // 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(cid,
                                                        token_pos,
                                                        type,
                                                        is_instance_lbl,
                                                        is_not_instance_lbl);
       // Fall through to runtime call.
     }
-    GenerateInstantiatedTypeNoArgumentsTest(cid,
-                                            token_pos,
-                                            type,
-                                            is_instance_lbl,
-                                            is_not_instance_lbl);
-    // If test non-conclusive so far, try the inlined type-test cache.
-    // 'type' is known at compile time.
-    return GenerateSubtype1TestCacheLookup(
-        cid, token_pos, type_class,
-        is_instance_lbl, is_not_instance_lbl);
+    const bool has_fall_through =
+        GenerateInstantiatedTypeNoArgumentsTest(cid,
+                                                token_pos,
+                                                type,
+                                                is_instance_lbl,
+                                                is_not_instance_lbl);
+    if (has_fall_through) {
+      // If test non-conclusive so far, try the inlined type-test cache.
+      // 'type' is known at compile time.
+      return GenerateSubtype1TestCacheLookup(
+          cid, token_pos, type_class,
+          is_instance_lbl, is_not_instance_lbl);
+    } else {
+      return SubtypeTestCache::null();
+    }
   }
   return GenerateUninstantiatedTypeTest(cid,
                                         token_pos,
                                         type,
                                         is_instance_lbl,
                                         is_not_instance_lbl);
 }
 
 
 // If instanceof type test cannot be performed successfully at compile time and
@@ skipping 32 matching lines @@
     // Dynamic at run time.
     __ cmpl(EAX, raw_null);
     __ j(EQUAL, &is_not_instance);
   }
 
   // Generate inline instanceof test.
   SubtypeTestCache& test_cache = SubtypeTestCache::ZoneHandle();
   test_cache = GenerateInlineInstanceof(cid, token_pos, type,
                                         &is_instance, &is_not_instance);
 
-  // Generate runtime call.
-  __ movl(EDX, Address(ESP, 0));  // Get instantiator type arguments.
-  __ movl(ECX, Address(ESP, kWordSize));  // Get instantiator.
-  __ PushObject(Object::ZoneHandle());  // Make room for the result.
-  __ pushl(Immediate(Smi::RawValue(cid)));  // Computation id.
-  __ pushl(EAX);  // Push the instance.
-  __ PushObject(type);  // Push the type.
-  __ pushl(ECX);  // TODO(srdjan): Pass instantiator instead of null.
-  __ pushl(EDX);  // Instantiator type arguments.
-  __ LoadObject(EAX, test_cache);
-  __ pushl(EAX);
-  GenerateCallRuntime(cid, token_pos, try_index, kInstanceofRuntimeEntry);
-  // Pop the parameters supplied to the runtime entry. The result of the
-  // instanceof runtime call will be left as the result of the operation.
-  __ Drop(6);
+  // test_cache is null if there is no fall-through.
   Label done;
-  if (negate_result) {
-    __ popl(EDX);
-    __ LoadObject(EAX, bool_true());
-    __ cmpl(EDX, EAX);
-    __ j(NOT_EQUAL, &done, Assembler::kNearJump);
-    __ LoadObject(EAX, bool_false());
-  } else {
-    __ popl(EAX);
+  if (!test_cache.IsNull()) {
+    // Generate runtime call.
+    __ movl(EDX, Address(ESP, 0));  // Get instantiator type arguments.
+    __ movl(ECX, Address(ESP, kWordSize));  // Get instantiator.
+    __ PushObject(Object::ZoneHandle());  // Make room for the result.
+    __ pushl(Immediate(Smi::RawValue(cid)));  // Computation id.
+    __ pushl(EAX);  // Push the instance.
+    __ PushObject(type);  // Push the type.
+    __ pushl(ECX);  // Instantiator.
+    __ pushl(EDX);  // Instantiator type arguments.
+    __ LoadObject(EAX, test_cache);
+    __ pushl(EAX);
+    GenerateCallRuntime(cid, token_pos, try_index, kInstanceofRuntimeEntry);
+    // Pop the parameters supplied to the runtime entry. The result of the
+    // instanceof runtime call will be left as the result of the operation.
+    __ Drop(6);
+    if (negate_result) {
+      __ popl(EDX);
+      __ LoadObject(EAX, bool_true());
+      __ cmpl(EDX, EAX);
+      __ j(NOT_EQUAL, &done, Assembler::kNearJump);
+      __ LoadObject(EAX, bool_false());
+    } else {
+      __ popl(EAX);
+    }
+    __ jmp(&done, Assembler::kNearJump);
   }
-  __ jmp(&done, Assembler::kNearJump);
-
   __ Bind(&is_not_instance);
   __ LoadObject(EAX, negate_result ? bool_true() : bool_false());
   __ jmp(&done, Assembler::kNearJump);
 
   __ Bind(&is_instance);
   __ LoadObject(EAX, negate_result ? bool_false() : bool_true());
   __ Bind(&done);
   __ popl(EDX);  // Remove pushed instantiator type arguments.
   __ popl(ECX);  // Remove pushed instantiator.
 }
@@ skipping 598 matching lines @@
     }
   }
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32