- Fix the type test failure for implicit native closures.

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 104 matching lines @@
 }
 
 
 void FlowGraphCompiler::CopyParameters() {
   const Function& function = parsed_function().function();
   const bool is_native_instance_closure =
       function.is_native() && function.IsImplicitInstanceClosureFunction();
   LocalScope* scope = parsed_function().node_sequence()->scope();
   const int num_fixed_params = function.num_fixed_parameters();
   const int num_opt_params = function.num_optional_parameters();
+  int implicit_this_param_pos = is_native_instance_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_native_instance_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_native_instance_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 882 matching lines @@
   __ cvtsi2sd(result, temp);
   __ Bind(&done);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32