VM: Clean up generated code for NoSuchMethod invocation of closures.

runtime/vm/stub_code_arm64.cc

 // Copyright (c) 2014, 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_ARM64)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 1223 matching lines @@
   __ ret();
 }
 
 
 // Called for invoking "dynamic noSuchMethod(Invocation invocation)" function
 // from the entry code of a dart function after an error in passed argument
 // name or number is detected.
 // Input parameters:
 //  LR : return address.
 //  SP : address of last argument.
-//  R5: inline cache data object.
 //  R4: arguments descriptor array.
 void StubCode::GenerateCallNoSuchMethodFunctionStub(Assembler* assembler) {
   __ EnterStubFrame(true);
 
   // Load the receiver.
   __ LoadFieldFromOffset(R2, R4, ArgumentsDescriptor::count_offset(), kNoPP);
   __ add(TMP, FP, Operand(R2, LSL, 2));  // R2 is Smi.
   __ LoadFromOffset(R6, TMP, kParamEndSlotFromFp * kWordSize, kNoPP);
 
   // Push space for the return value.
   // Push the receiver.
   // Push IC data object.

[Vyacheslav Egorov (Google), 2014/09/02 22:28:04]

comment is obsolete.

[Florian Schneider, 2014/09/03 09:05:00]

Done.

   // Push arguments descriptor array.
   __ PushObject(Object::null_object(), PP);
   __ Push(R6);
-  __ Push(R5);
   __ Push(R4);
 
   // R2: Smi-tagged arguments array length.
   PushArgumentsArray(assembler);
 
-  __ CallRuntime(kInvokeNoSuchMethodFunctionRuntimeEntry, 4);
+  const intptr_t kNumArgs = 3;
+  __ CallRuntime(kInvokeNoSuchMethodFunctionRuntimeEntry, kNumArgs);
   // Remove arguments.
-  __ Drop(4);
+  __ Drop(kNumArgs);
   __ Pop(R0);  // Get result into R0.

[Vyacheslav Egorov (Google), 2014/09/02 22:28:04]

something is off here with amount of pushed args / dropped arguments and the
result. 

[Florian Schneider, 2014/09/03 09:05:00]

I'm sure PushArgumentsArray is the missing piece here.

   __ LeaveStubFrame();
   __ ret();
 }
 
 
 //  R6: function object.
 //  R5: inline cache data object.
 // Cannot use function object from ICData as it may be the inlined
 // function and not the top-scope function.
 void StubCode::GenerateOptimizedUsageCounterIncrement(Assembler* assembler) {
@@ skipping 786 matching lines @@
   const Register right = R0;
   __ LoadFromOffset(left, SP, 1 * kWordSize, kNoPP);
   __ LoadFromOffset(right, SP, 0 * kWordSize, kNoPP);
   GenerateIdenticalWithNumberCheckStub(assembler, left, right, temp);
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64