- Fix the type test failure for implicit native closures.

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 405 matching lines @@
       if (function.IsClosureFunction()) {
         GenerateCallRuntime(AstNode::kNoId,
                             0,
                             kClosureArgumentMismatchRuntimeEntry);
       } else {
         __ Stop("Wrong number of arguments");
       }
       __ Bind(&argc_in_range);
     }
   } else {
+    int implicit_this_param_pos = is_instance_native_closure ? -1 : 0;
     ASSERT(parsed_function_.first_parameter_index() ==
-           ParsedFunction::kFirstLocalSlotIndex);
+           (ParsedFunction::kFirstLocalSlotIndex + implicit_this_param_pos));
     // Copy positional arguments.
     // Check that no fewer than num_fixed_params positional arguments are passed
     // in and that no more than num_params arguments are passed in.
     // Passed argument i at fp[1 + argc - i] copied to
     // fp[ParsedFunction::kFirstLocalSlotIndex - i].
     const int num_params = num_fixed_params + num_opt_params;
 
     // Total number of args is the first Smi in args descriptor array (EDX).
     __ movl(EBX, FieldAddress(EDX, Array::data_offset()));
     // Check that num_args <= num_params.
     Label wrong_num_arguments;
     __ cmpl(EBX, Immediate(Smi::RawValue(num_params)));
     __ j(GREATER, &wrong_num_arguments);
     // Number of positional args is the second Smi in descriptor array (EDX).
     __ movl(ECX, FieldAddress(EDX, Array::data_offset() + (1 * kWordSize)));
     // Check that num_pos_args >= num_fixed_params.
     __ cmpl(ECX, Immediate(Smi::RawValue(num_fixed_params)));
     __ j(LESS, &wrong_num_arguments);
 
     // Since EBX and ECX are Smi, use TIMES_2 instead of TIMES_4.
     // Let EBX point to the last passed positional argument, i.e. to
     // fp[1 + num_args - (num_pos_args - 1)].
     __ subl(EBX, ECX);
     __ leal(EBX, Address(EBP, EBX, TIMES_2, 2 * kWordSize));
     // Let EDI point to the last copied positional argument, i.e. to
     // fp[ParsedFunction::kFirstLocalSlotIndex - (num_pos_args - 1)].
-    int implicit_this_param_pos = is_instance_native_closure ? -1 : 0;
     const int index =
         ParsedFunction::kFirstLocalSlotIndex + 1 + implicit_this_param_pos;
     // First copy captured receiver if function is an implicit native closure.
     if (is_instance_native_closure) {
       __ movl(EAX, FieldAddress(CTX, Context::variable_offset(0)));
       __ movl(Address(EBP, (index * kWordSize)), EAX);
     }
     __ leal(EDI, Address(EBP, (index * kWordSize)));
     __ subl(EDI, ECX);  // ECX is a Smi, subtract twice for TIMES_4 scaling.
     __ subl(EDI, ECX);
@@ skipping 2499 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