Reload: Don't crash when a tearoff adds arguments and is called with too few.

runtime/vm/parser.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/parser.h"
 #include "vm/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 1596 matching lines @@
   if (target.raw() != parent.raw()) {
     ASSERT(Isolate::Current()->HasAttemptedReload());
     if (target.IsNull() ||
         (target.is_static() != parent.is_static()) ||
         (target.kind() != parent.kind())) {
       target = Function::null();
     }
   }
 
   AstNode* call = NULL;
-  if (!target.IsNull()) {
+  // Check the target still exists and has compatible parameters. If not,
+  // throw NSME/call nSM instead of forwarding the call. Note we compare the
+  // parent not func because func has an extra parameter for the closure
+  // receiver.
+  if (!target.IsNull() &&
+      (parent.num_fixed_parameters() == target.num_fixed_parameters())) {
     call = new StaticCallNode(token_pos, target, func_args);
   } else if (!parent.is_static()) {
     ASSERT(Isolate::Current()->HasAttemptedReload());
     // If a subsequent reload reintroduces the target in the middle of the
     // Invocation object being constructed, we won't be able to successfully
     // deopt because the generated AST will change.
-    current_function().SetIsOptimizable(false);
+    func.SetIsOptimizable(false);
 
     ArgumentListNode* arguments = BuildNoSuchMethodArguments(
         token_pos, func_name, *func_args, NULL, false);
     const intptr_t kNumArguments = 2;  // Receiver, InvocationMirror.
     ArgumentsDescriptor args_desc(
         Array::Handle(Z, ArgumentsDescriptor::New(kNumArguments)));
     Function& no_such_method = Function::ZoneHandle(Z,
     Resolver::ResolveDynamicForReceiverClass(owner,
                                              Symbols::NoSuchMethod(),
                                              args_desc));
     if (no_such_method.IsNull()) {
       // If noSuchMethod(i) is not found, call Object:noSuchMethod.
       no_such_method ^= Resolver::ResolveDynamicForReceiverClass(
           Class::Handle(Z, I->object_store()->object_class()),
           Symbols::NoSuchMethod(),
           args_desc);
     }
     call = new StaticCallNode(token_pos, no_such_method, arguments);
   } else {
     ASSERT(Isolate::Current()->HasAttemptedReload());
     // If a subsequent reload reintroduces the target in the middle of the
     // arguments array being constructed, we won't be able to successfully
     // deopt because the generated AST will change.
-    current_function().SetIsOptimizable(false);
+    func.SetIsOptimizable(false);
 
     InvocationMirror::Type im_type;
     if (parent.IsImplicitGetterFunction()) {
       im_type = InvocationMirror::kGetter;
     } else if (parent.IsImplicitSetterFunction()) {
       im_type = InvocationMirror::kSetter;
     } else {
       im_type = InvocationMirror::kMethod;
     }
     call = ThrowNoSuchMethodError(TokenPos(),
@@ skipping 13117 matching lines @@
     const ArgumentListNode& function_args,
     const LocalVariable* temp_for_last_arg,
     bool is_super_invocation) {
   UNREACHABLE();
   return NULL;
 }
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME