Revert "Do not call ResolveCompileInstanceFunction from the lookup stub."

runtime/vm/stub_code_x64.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"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/assembler_macros.h"
 #include "vm/compiler.h"
@@ skipping 257 matching lines @@
 
   // Preserve values across call to resolving.
   // Stack at this point:
   // TOS + 0: PC marker => RawInstruction object.
   // TOS + 1: Saved RBP of previous frame. <== RBP
   // TOS + 2: Dart code return address
   // TOS + 3: Last argument of caller.
   // ....
   __ movq(RAX, FieldAddress(R10, ArgumentsDescriptor::count_offset()));
   __ movq(RAX, Address(RBP, RAX, TIMES_4, kWordSize));  // Get receiver.
+  __ pushq(R10);  // Preserve arguments descriptor array.
+  __ pushq(RAX);  // Preserve receiver.
+  __ pushq(RBX);  // Preserve ic-data.
+  // First resolve the function to get the function object.
+
+  __ pushq(raw_null);  // Setup space on stack for return value.
+  __ pushq(RAX);  // Pass receiver.
+  __ pushq(RBX);  // Pass IC data object.
+  __ pushq(R10);  // Pass arguments descriptor array.
+  __ CallRuntime(kResolveCompileInstanceFunctionRuntimeEntry);
+  __ popq(RAX);  // Remove arguments pushed earlier.
+  __ popq(RAX);
+  __ popq(RAX);
+  __ popq(RBX);  // Pop returned code object into RBX.
+  // Pop preserved values
+  __ popq(R10);  // Restore ic-data.
+  __ popq(RAX);  // Restore receiver.
+  __ popq(R13);  // Restore arguments descriptor array.
+
+  __ cmpq(RBX, raw_null);
+  Label check_implicit_closure;
+  __ j(EQUAL, &check_implicit_closure, Assembler::kNearJump);
+
+  // Remove the stub frame as we are about to jump to the dart function.
+  __ LeaveFrame();
+
+  __ movq(R10, R13);
+  __ movq(RBX, FieldAddress(RBX, Code::instructions_offset()));
+  __ addq(RBX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
+  __ jmp(RBX);
+
+  __ Bind(&check_implicit_closure);
   // RAX: receiver.
-  // RBX: ic-data.
-  // R10: arguments descriptor array.
+  // R10: ic-data.
+  // RBX: raw_null.
+  // R13: arguments descriptor array.
   // The target function was not found.
   // First check to see if this is a getter function and we are
   // trying to create a closure of an instance function.
   // Push values that need to be preserved across runtime call.
   __ pushq(RAX);  // Preserve receiver.
-  __ pushq(RBX);  // Preserve ic-data.
-  __ pushq(R10);  // Preserve arguments descriptor array.
+  __ pushq(R10);  // Preserve ic-data.
+  __ pushq(R13);  // Preserve arguments descriptor array.
 
   __ pushq(raw_null);  // Setup space on stack for return value.
   __ pushq(RAX);  // Push receiver.
-  __ pushq(RBX);  // Ic-data array.
+  __ pushq(R10);  // Ic-data array.
   __ CallRuntime(kResolveImplicitClosureFunctionRuntimeEntry);
   __ popq(RAX);
   __ popq(RAX);
-  __ popq(RCX);  // Get return value into RCX, might be Closure object.
+  __ popq(RBX);  // Get return value into RBX, might be Closure object.
 
   // Pop preserved values.
-  __ popq(R10);  // Restore arguments descriptor array.
-  __ popq(RBX);  // Restore ic-data.
+  __ popq(R13);  // Restore arguments descriptor array.
+  __ popq(R10);  // Restore ic-data.
   __ popq(RAX);  // Restore receiver.
 
-  __ cmpq(RCX, raw_null);
+  __ cmpq(RBX, raw_null);
   Label check_implicit_closure_through_getter;
   __ j(EQUAL, &check_implicit_closure_through_getter, Assembler::kNearJump);
 
-  __ movq(RAX, RCX);  // Return value is the closure object.
+  __ movq(RAX, RBX);  // Return value is the closure object.
   // Remove the stub frame as we are about return.
   __ LeaveFrame();
   __ ret();
 
   __ Bind(&check_implicit_closure_through_getter);
   // RAX: receiver.
-  // RBX: ic-data.
-  // R10: arguments descriptor array.
+  // R10: ic-data.
+  // RBX: raw_null.
+  // R13: arguments descriptor array.
   // This is not the case of an instance so invoke the getter of the
   // same name and see if we get a closure back which we are then
   // supposed to invoke.
   // Push values that need to be preserved across runtime call.
   __ pushq(RAX);  // Preserve receiver.
-  __ pushq(RBX);  // Preserve ic-data.
-  __ pushq(R10);  // Preserve arguments descriptor array.
+  __ pushq(R10);  // Preserve ic-data.
+  __ pushq(R13);  // Preserve arguments descriptor array.
 
   __ pushq(raw_null);  // Setup space on stack for return value.
   __ pushq(RAX);  // Push receiver.
-  __ pushq(RBX);  // Ic-data array.
+  __ pushq(R10);  // Ic-data array.
   __ CallRuntime(kResolveImplicitClosureThroughGetterRuntimeEntry);
+  __ popq(R10);  // Pop argument.
   __ popq(RAX);  // Pop argument.
-  __ popq(RAX);  // Pop argument.
-  __ popq(RCX);  // get return value into RCX, might be Closure object.
+  __ popq(RBX);  // get return value into RBX, might be Closure object.
 
   // Pop preserved values.
-  __ popq(R10);  // Restore arguments descriptor array.
-  __ popq(RBX);  // Restore ic-data.
+  __ popq(R13);  // Restore arguments descriptor array.
+  __ popq(R10);  // Restore ic-data.
   __ popq(RAX);  // Restore receiver.
 
-  __ cmpq(RCX, raw_null);
+  __ cmpq(RBX, raw_null);
   Label function_not_found;
-  __ j(EQUAL, &function_not_found, Assembler::kNearJump);
+  __ j(EQUAL, &function_not_found);
 
-  // RCX: Closure object.
-  // R10: Arguments descriptor array.
+  // RBX: Closure object.
+  // R13: Arguments descriptor array.
   __ pushq(raw_null);  // Setup space on stack for result from invoking Closure.
-  __ pushq(RCX);  // Closure object.
-  __ pushq(R10);  // Arguments descriptor.
-  __ movq(R13, FieldAddress(R10, ArgumentsDescriptor::count_offset()));
+  __ pushq(RBX);  // Closure object.
+  __ pushq(R13);  // Arguments descriptor.
+  __ movq(R13, FieldAddress(R13, ArgumentsDescriptor::count_offset()));
   __ SmiUntag(R13);
   __ subq(R13, Immediate(1));  // Arguments array length, minus the receiver.
   PushArgumentsArray(assembler, (kWordSize * 6));
   // Stack layout explaining "(kWordSize * 6)" offset.
   // TOS + 0: Argument array.
   // TOS + 1: Arguments descriptor array.
   // TOS + 2: Closure object.
   // TOS + 3: Place for result from closure function.
   // TOS + 4: PC marker => RawInstruction object.
   // TOS + 5: Saved RBP of previous frame. <== RBP
   // TOS + 6: Dart code return address
   // TOS + 7: Last argument of caller.
   // ....
 
   __ CallRuntime(kInvokeImplicitClosureFunctionRuntimeEntry);
   // Remove arguments.
   __ popq(RAX);
   __ popq(RAX);
   __ popq(RAX);
   __ popq(RAX);  // Get result into RAX.
 
   // Remove the stub frame as we are about to return.
   __ LeaveFrame();
   __ ret();
 
   __ Bind(&function_not_found);
   // The target function was not found, so invoke method
   // "void noSuchMethod(function_name, args_array)".
   //   RAX: receiver.
-  //   RBX: ic-data.
-  //   R10: arguments descriptor array.
+  //   R10: ic-data.
+  //   RBX: raw_null.
+  //   R13: arguments descriptor array.
 
   __ pushq(raw_null);  // Setup space on stack for result from noSuchMethod.
   __ pushq(RAX);  // Receiver.
-  __ pushq(RBX);  // IC-data array.
-  __ pushq(R10);  // Arguments descriptor array.
-  __ movq(R13, FieldAddress(R10, ArgumentsDescriptor::count_offset()));
+  __ pushq(R10);  // IC-data array.
+  __ pushq(R13);  // Arguments descriptor array.
+  __ movq(R13, FieldAddress(R13, ArgumentsDescriptor::count_offset()));
   __ SmiUntag(R13);
   __ subq(R13, Immediate(1));  // Arguments array length, minus the receiver.
   // See stack layout below explaining "wordSize * 7" offset.
   PushArgumentsArray(assembler, (kWordSize * 7));
 
   // Stack:
   // TOS + 0: Arguments array.
   // TOS + 1: Arguments descriptor array.
   // TOS + 2: IC-data array.
   // TOS + 3: Receiver.
@@ skipping 1739 matching lines @@
   __ cmpq(left, right);
   __ Bind(&done);
   __ popq(right);
   __ popq(left);
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64