Revert change 6946.

runtime/vm/code_generator_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/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 1267 matching lines @@
 
 static const Class* CoreClass(const char* c_name) {
   const String& class_name = String::Handle(String::NewSymbol(c_name));
   const Class& cls = Class::ZoneHandle(Library::Handle(
       Library::CoreImplLibrary()).LookupClass(class_name));
   ASSERT(!cls.IsNull());
   return &cls;
 }
 
 
-// Instance to test is in EAX, test if it is a subtype of type_class.
-// The instance may not be a Smi (test before calling this).
-// The instance may not be NULL (test before calling this).
-// 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).
-void CodeGenerator::GenerateClassTestCache(intptr_t node_id,
-                                           intptr_t token_index,
-                                           const Class& type_class,
-                                           Label* is_instance_lbl,
-                                           Label* is_not_instance_lbl) {
-  const Bool& bool_true = Bool::ZoneHandle(Bool::True());
-  const Immediate raw_null =
-      Immediate(reinterpret_cast<intptr_t>(Object::null()));
-  Label loop, found_in_cache, runtime_call;
-  // Check immediate equality.
-  __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
-  // ECX: instance class.
-  __ CompareObject(ECX, type_class);
-  __ j(EQUAL, is_instance_lbl);
-
-  // Check immediate superclass equality.
-  __ movl(EDI, FieldAddress(ECX, Class::super_type_offset()));
-  __ movl(EDI, FieldAddress(EDI, Type::type_class_offset()));
-  __ CompareObject(EDI, type_class);
-  __ j(EQUAL, is_instance_lbl);
-
-  // ECX: instance class.
-  AddCurrentDescriptor(PcDescriptors::kTypeTest, node_id, token_index);
-  __ LoadObject(EDX, Array::ZoneHandle(Array::New(2)));
-  __ addl(EDX, Immediate(Array::data_offset() - kHeapObjectTag));
-  __ Bind(&loop);
-  __ movl(EBX, Address(EDX, 0));
-  __ cmpl(ECX, EBX);
-  __ j(EQUAL, &found_in_cache, Assembler::kNearJump);
-  __ addl(EDX, Immediate(kWordSize * 2));
-  __ cmpl(EBX, raw_null);
-  __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
-  __ jmp(&runtime_call, Assembler::kNearJump);
-
-  __ Bind(&found_in_cache);
-  __ movl(EDX, Address(EDX, kWordSize));
-  __ CompareObject(EDX, bool_true);
-  __ j(EQUAL, is_instance_lbl);
-  __ jmp(is_not_instance_lbl);
-  __ Bind(&runtime_call);
-}
-
-
 // Inline tests according to the 'type' being tested. Jump to labels
 // if we can compute the type-test, otherwise fallthrough.
 // EAX: instance to be tested.
 // Clobbers many registers.
 void CodeGenerator::GenerateInlineInstanceof(intptr_t node_id,
                                              intptr_t token_index,
                                              const AbstractType& type,
                                              Label* is_instance_lbl,
                                              Label* is_not_instance_lbl) {
   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()) {
-      GenerateInstantiatedTypeWithArgumentsTest(node_id,
-                                                token_index,
-                                                type,
+      GenerateInstantiatedTypeWithArgumentsTest(type,
                                                 is_instance_lbl,
                                                 is_not_instance_lbl);
       // Fall through to runtime call.
     } else {
       GenerateInstantiatedTypeNoArgumentsTest(node_id,
                                               token_index,
                                               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.
-      GenerateClassTestCache(node_id, token_index, type_class,
-                             is_instance_lbl, is_not_instance_lbl);
+      const Bool& bool_true = Bool::ZoneHandle(Bool::True());
+      const Immediate raw_null =
+          Immediate(reinterpret_cast<intptr_t>(Object::null()));
+      __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
+      AddCurrentDescriptor(PcDescriptors::kTypeTest, node_id, token_index);
+      __ LoadObject(EDX, Array::ZoneHandle(Array::New(2)));
+      __ addl(EDX, Immediate(Array::data_offset() - kHeapObjectTag));
+      Label loop, found_in_cache, runtime_call;
+      __ Bind(&loop);
+      __ movl(EBX, Address(EDX, 0));
+      __ cmpl(ECX, EBX);
+      __ j(EQUAL, &found_in_cache, Assembler::kNearJump);
+      __ addl(EDX, Immediate(kWordSize * 2));
+      __ cmpl(EBX, raw_null);
+      __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
+      __ jmp(&runtime_call, Assembler::kNearJump);
+
+      __ Bind(&found_in_cache);
+      __ movl(EDX, Address(EDX, kWordSize));
+      __ CompareObject(EDX, bool_true);
+      __ j(EQUAL, is_instance_lbl);
+      __ jmp(is_not_instance_lbl);
+      __ Bind(&runtime_call);
     }
   } else {
     GenerateUninstantiatedTypeTest(type,
                                    token_index,
                                    is_instance_lbl);
   }
 }
 
 
 // If instanceof type test cannot be performed successfully at compile time and
@@ skipping 112 matching lines @@
   __ Bind(&done);
 }
 
 
 // EAX: instance to test.
 // Clobbers: ECX.
 // Jumps to labels 'is_instance' or 'is_not_instance' respectively, if
 // type test is conclusive, otherwise fallthrough if a type test could not
 // be completed.
 void CodeGenerator::GenerateInstantiatedTypeWithArgumentsTest(
-    intptr_t node_id,
-    intptr_t token_index,
     const AbstractType& type,
     Label* is_instance_lbl,
     Label* is_not_instance_lbl) {
   ASSERT(type.IsInstantiated());
   const Class& type_class = Class::ZoneHandle(type.type_class());
   ASSERT(type_class.HasTypeArguments());
   // 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.
   __ testl(EAX, Immediate(kSmiTagMask));
   __ j(ZERO, is_not_instance_lbl);
   const AbstractTypeArguments& type_arguments =
       AbstractTypeArguments::Handle(type.arguments());
   const bool is_raw_type = type_arguments.IsNull() ||
       type_arguments.IsRaw(type_arguments.Length());
   if (is_raw_type) {
     // Dynamic type argument, check only classes.
     __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
     if (type.IsListInterface()) {
       // TODO(srdjan) also accept List<Object>.
       __ CompareObject(ECX, *CoreClass("ObjectArray"));
       __ j(EQUAL, is_instance_lbl);
       __ CompareObject(ECX, *CoreClass("GrowableObjectArray"));
       __ j(EQUAL, is_instance_lbl);
+    } else if (!type_class.is_interface()) {
+      __ CompareObject(ECX, type_class);
+      __ j(EQUAL, is_instance_lbl);
     }
-    GenerateClassTestCache(node_id, token_index, type_class,
-                           is_instance_lbl, is_not_instance_lbl);
+  } else {
+    // TODO(srdjan): do type test on type arguments.
   }
-  // TODO(srdjan): do type test on type arguments.
   // Fall through if type test is not conclusive
 }
 
 
 // EAX: instance to test.
 // Clobbers: EBX, ECX, EDX.
 void CodeGenerator::GenerateInstantiatedTypeNoArgumentsTest(
     intptr_t node_id,
     intptr_t token_index,
     const AbstractType& type,
@@ skipping 136 matching lines @@
     // InstantiatedType. It is therefore necessary to check its class.
     __ movl(ECX, FieldAddress(EDX, Object::class_offset()));
     __ CompareObject(ECX, Object::ZoneHandle(Object::type_class()));
     __ j(NOT_EQUAL, &fall_through, Assembler::kNearJump);
 
     __ movl(EDX, FieldAddress(EDX, Type::type_class_offset()));
     __ movl(ECX, FieldAddress(EDX, Class::type_parameters_offset()));
     // Check that class of type has no type parameters.
     __ cmpl(ECX, raw_null);
     __ j(NOT_EQUAL, &fall_through, Assembler::kNearJump);
-    // EAX has non-parameterized class.
-    // Check class equality
-    __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
-    __ movl(ECX, FieldAddress(ECX, Type::Type::type_class_offset()));
-    __ cmpl(ECX, EDX);
-    __ j(EQUAL, is_instance_lbl);
-
     // We have a non-parameterized class in EDX, compare with class of
     // value in EAX. EAX, EDX are preserved in stub.
-    __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
     __ call(&StubCode::IsRawSubTypeLabel());
     // Result in EBX: 1 is raw subtype.
     __ cmpl(EBX, Immediate(1));
     __ j(EQUAL, is_instance_lbl);
 
     // Test not conclusive.
     __ Bind(&fall_through);
   }
 }
 
@@ skipping 1212 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32