Index: runtime/vm/stub_code_ia32.cc |
diff --git a/runtime/vm/stub_code_ia32.cc b/runtime/vm/stub_code_ia32.cc |
index 2995bfab503dbe3d8b81dc6d9d6213188425e285..a0cc04a252f04cbb635304f0a222047ac6196c13 100644 |
--- a/runtime/vm/stub_code_ia32.cc |
+++ b/runtime/vm/stub_code_ia32.cc |
@@ -1722,7 +1722,11 @@ static void GenerateSubtypeNTestCacheStub(Assembler* assembler, int n) { |
__ SmiTag(ECX); |
__ cmpl(ECX, Immediate(Smi::RawValue(kClosureCid))); |
__ j(NOT_EQUAL, &loop, Assembler::kNearJump); |
- __ movl(EBX, FieldAddress(EAX, Closure::instantiator_offset())); |
+ __ movl(EBX, FieldAddress(EAX, Closure::function_type_arguments_offset())); |
+ __ cmpl(EBX, raw_null); // Cache cannot be used for generic closures. |
+ __ j(NOT_EQUAL, ¬_found, Assembler::kNearJump); |
+ __ movl(EBX, |
+ FieldAddress(EAX, Closure::instantiator_type_arguments_offset())); |
__ movl(ECX, FieldAddress(EAX, Closure::function_offset())); |
// ECX: instance class id as Smi or function. |
__ Bind(&loop); |