A64: Synchronize with r18444.

src/a64/stub-cache-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 873 matching lines @@
   ASSERT(!AreAliased(receiver, scratch));
 
   typedef FunctionCallbackArguments FCA;
   const int stack_space = kFastApiCallArguments + argc + 1;
   // Assign stack space for the call arguments.
   __ Claim(stack_space);
   // Write holder to stack frame.
   __ Poke(receiver, FCA::kHolderIndex * kPointerSize);
   // Write receiver to stack frame.
   int index = stack_space - 1;
-  __ Poke(receiver, index * kPointerSize);
+  __ Poke(receiver, index-- * kPointerSize);
   // Write the arguments to stack frame.
   for (int i = 0; i < argc; i++) {
-    // TODO(jbramley): This is broken, but it is broken on ARM too.
     ASSERT(!AreAliased(receiver, scratch, values[i]));
-    __ Poke(receiver, index-- * kPointerSize);
+    __ Poke(values[i], index-- * kPointerSize);
   }
 
   GenerateFastApiDirectCall(masm, optimization, argc, true);
 }
 
 
 class CallInterceptorCompiler BASE_EMBEDDED {
  public:
   CallInterceptorCompiler(CallStubCompiler* stub_compiler,
                           const ParameterCount& arguments,
-                          Register name,
-                          ExtraICState extra_ic_state)
+                          Register name)
       : stub_compiler_(stub_compiler),
         arguments_(arguments),
-        name_(name),
-        extra_ic_state_(extra_ic_state) {}
+        name_(name) { }
 
   void Compile(MacroAssembler* masm,
                Handle<JSObject> object,
                Handle<JSObject> holder,
                Handle<Name> name,
                LookupResult* lookup,
                Register receiver,
                Register scratch1,
                Register scratch2,
                Register scratch3,
@@ skipping 71 matching lines @@
     LoadWithInterceptor(masm, receiver, holder, interceptor_holder, scratch2,
                         &regular_invoke);
 
     // Interceptor returned nothing for this property.  Try to use cached
     // constant function.
 
     // Check that the maps from interceptor's holder to constant function's
     // holder haven't changed and thus we can use cached constant function.
     if (*interceptor_holder != lookup->holder()) {
       stub_compiler_->CheckPrototypes(
-          IC::CurrentTypeOf(interceptor_holder, masm->isolate()), receiver,
+          IC::CurrentTypeOf(interceptor_holder, masm->isolate()), holder,
           handle(lookup->holder()), scratch1, scratch2, scratch3,
           name, depth2, miss);
     } else {
       // CheckPrototypes has a side effect of fetching a 'holder'
       // for API (object which is instanceof for the signature).  It's
       // safe to omit it here, as if present, it should be fetched
       // by the previous CheckPrototypes.
       ASSERT(depth2 == kInvalidProtoDepth);
     }
 
     // Invoke function.
     if (can_do_fast_api_call) {
       GenerateFastApiDirectCall(
           masm, optimization, arguments_.immediate(), false);
     } else {
       Handle<JSFunction> function = optimization.constant_function();
-      stub_compiler_->GenerateJumpFunctionIgnoreReceiver(function);
+      __ Mov(x0, receiver);
+      stub_compiler_->GenerateJumpFunction(object, function);
     }
 
     // Deferred code for fast API call case, clean preallocated space.
     if (can_do_fast_api_call) {
       __ Bind(&miss_cleanup);
       FreeSpaceForFastApiCall(masm);
       __ B(miss_label);
     }
 
     // Invoke a regular function.
@@ skipping 31 matching lines @@
 
 
   void LoadWithInterceptor(MacroAssembler* masm,
                            Register receiver,
                            Register holder,
                            Handle<JSObject> holder_obj,
                            Register scratch,
                            Label* interceptor_succeeded) {
     {
       FrameScope scope(masm, StackFrame::INTERNAL);
-      __ Push(holder, name_);
+      __ Push(receiver, holder, name_);
       CompileCallLoadPropertyWithInterceptor(
           masm, receiver, holder, name_, holder_obj,
           IC::kLoadPropertyWithInterceptorOnly);
-      __ Pop(name_, receiver);
+      // TODO(jbramley): We need two pops because holder and receiver can be
+      // the same. In that case, we only need to preserve it once, but this is
+      // fixed on ARM later anyway so I've left it alone for now.
+      __ Pop(name_, holder);
+      __ Pop(receiver);
     }
 
     // If interceptor returns no-result sentinel, call the constant function.
     __ JumpIfNotRoot(x0,
                      Heap::kNoInterceptorResultSentinelRootIndex,
                      interceptor_succeeded);
   }
 
   CallStubCompiler* stub_compiler_;
   const ParameterCount& arguments_;
   Register name_;
-  ExtraICState extra_ic_state_;
 };
 
 
 void StubCompiler::GenerateTailCall(MacroAssembler* masm, Handle<Code> code) {
   __ Jump(code, RelocInfo::CODE_TARGET);
 }
 
 
 #undef __
 #define __ ACCESS_MASM(masm())
@@ skipping 1398 matching lines @@
   GenerateNameCheck(name, &miss);
 
   const int argc = arguments().immediate();
   LookupResult lookup(isolate());
   LookupPostInterceptor(holder, name, &lookup);
 
   // Get the receiver from the stack.
   Register receiver = x5;
   __ Peek(receiver, argc * kPointerSize);
 
-  CallInterceptorCompiler compiler(this, arguments(), name_reg, extra_state());
+  CallInterceptorCompiler compiler(this, arguments(), name_reg);
   compiler.Compile(
       masm(), object, holder, name, &lookup, receiver, x3, x4, x0, &miss);
 
   // Move returned value, the function to call, to x1 (this is required by
   // GenerateCallFunction).
   Register function = x1;
   __ Mov(function, x0);
 
   // Restore receiver.
   __ Peek(receiver, argc * kPointerSize);
@@ skipping 406 matching lines @@
 
   // Miss case, call the runtime.
   __ Bind(&miss);
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64