Revert change 6946.

runtime/vm/stub_code_ia32.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/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
@@ skipping 1715 matching lines @@
   __ j(EQUAL, &ic_cache_one_arg, Assembler::kNearJump);
   __ jmp(&StubCode::TwoArgsCheckInlineCacheLabel());
   __ Bind(&ic_cache_one_arg);
   __ jmp(&StubCode::OneArgCheckInlineCacheLabel());
 }
 
 
 // Check if an instance class is a subtype of class/interface using simple
 // superchain and interface array traversal. Does not take type parameters into
 // account.
-// EAX: instance (to be preserved).
-// ECX: class to test.
+// EAX: instance (preserved)
 // EDX: class/interface to test against (is class of instance a subtype of it).
 //      (preserved).
 // Result in EBX: 1 is subtype, 0 maybe not.
 // Destroys EBX, EDI, ECX.
 void StubCode::GenerateIsRawSubTypeStub(Assembler* assembler) {
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
-  Label test_class, not_found, found;
+  Label test_class, not_found, found, class_loaded_in_ECX, smi_value;
+  __ EnterFrame(0);
+  __ testl(EAX, Immediate(kSmiTagMask));
+  __ j(ZERO, &smi_value, Assembler::kNearJump);
+  __ movl(ECX, FieldAddress(EAX, Object::class_offset()));
+  __ jmp(&class_loaded_in_ECX, Assembler::kNearJump);
+  __ Bind(&smi_value);
+  __ movl(ECX, FieldAddress(CTX, Context::isolate_offset()));
+  __ movl(ECX, Address(ECX, Isolate::object_store_offset()));
+  __ movl(ECX, Address(ECX, ObjectStore::smi_class_offset()));
+  __ Bind(&class_loaded_in_ECX);
 
   __ movzxb(EBX, FieldAddress(EDX, Class::is_interface_offset()));
   // Check if we are comparing against class or interface.
   __ cmpl(EBX, Immediate(0));
   __ j(EQUAL, &test_class, Assembler::kNearJump);
 
   // Get interfaces array from instance class.
   __ movl(EBX, FieldAddress(ECX, Class::interfaces_offset()));
   __ cmpl(EBX, raw_null);
   __ j(EQUAL, &not_found, Assembler::kNearJump);
   __ movl(EDI, FieldAddress(EBX, Array::length_offset()));
   // EDI: array index.
   // EBX: interface array.
   // EDX: interface searched
   Label array_loop;
   __ Bind(&array_loop);
   __ subl(EDI, Immediate(Smi::RawValue(1)));
+  // __ cmpl(EDI, Immediate(0));
   __ j(LESS, &not_found, Assembler::kNearJump);
   // EDI is Smi therefore TIMES_2 instead of TIMES_4.
   // Get type from array.
   __ movl(ECX, FieldAddress(EBX, EDI, TIMES_2, Array::data_offset()));
   __ movl(ECX, FieldAddress(ECX, Type::type_class_offset()));
   __ cmpl(ECX, EDX);
   __ j(EQUAL, &found, Assembler::kNearJump);
   __ jmp(&array_loop, Assembler::kNearJump);
 
   __ Bind(&not_found);
   __ xorl(EBX, EBX);
+  __ LeaveFrame();
   __ ret();
 
   __ Bind(&found);
   __ movl(EBX, Immediate(1));
+  __ LeaveFrame();
   __ ret();
 
   __ Bind(&test_class);
   // EDX: test class.
   __ cmpl(ECX, EDX);
   __ j(EQUAL, &found, Assembler::kNearJump);
 
   // Check superclasses using a loop (faster than runtime call).
   Label super_loop;
   __ Bind(&super_loop);
   // ECX: class -> super.
   __ movl(ECX, FieldAddress(ECX, Class::super_type_offset()));
   // The supertype of Object is a null object.
   __ cmpl(ECX, raw_null);
   __ j(EQUAL, &not_found, Assembler::kNearJump);
   __ movl(ECX, FieldAddress(ECX, Type::type_class_offset()));
   __ cmpl(EDX, ECX);
   __ j(NOT_EQUAL, &super_loop, Assembler::kNearJump);
   __ jmp(&found, Assembler::kNearJump);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32