A64: Synchronize with r18642.

src/mips/stub-cache-mips.cc

 // Copyright 2012 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 2319 matching lines @@
   Label success;
   // Check that the object is a boolean.
   __ LoadRoot(at, Heap::kTrueValueRootIndex);
   __ Branch(&success, eq, object, Operand(at));
   __ LoadRoot(at, Heap::kFalseValueRootIndex);
   __ Branch(miss, ne, object, Operand(at));
   __ bind(&success);
 }
 
 
-void CallStubCompiler::PatchGlobalProxy(Handle<Object> object,
-                                        Handle<JSFunction> function) {
+void CallStubCompiler::PatchImplicitReceiver(Handle<Object> object) {
   if (object->IsGlobalObject()) {
     const int argc = arguments().immediate();
     const int receiver_offset = argc * kPointerSize;
-    __ li(a3, handle(function->context()->global_proxy()));
+    __ LoadRoot(a3, Heap::kUndefinedValueRootIndex);
     __ sw(a3, MemOperand(sp, receiver_offset));
   }
 }
-
-
-void CallStubCompiler::PatchGlobalProxy(Handle<Object> object,
-                                        Register function) {
-  if (object->IsGlobalObject()) {
-    FetchGlobalProxy(masm(), a3, function);
-    const int argc = arguments().immediate();
-    const int receiver_offset = argc * kPointerSize;
-    __ sw(a3, MemOperand(sp, receiver_offset));
-  }
-}
 
 
 Register CallStubCompiler::HandlerFrontendHeader(Handle<Object> object,
                                                  Handle<JSObject> holder,
                                                  Handle<Name> name,
                                                  CheckType check,
                                                  Label* miss) {
   // ----------- S t a t e -------------
   //  -- a2    : name
   //  -- ra    : return address
@@ skipping 75 matching lines @@
   return reg;
 }
 
 
 void CallStubCompiler::GenerateJumpFunction(Handle<Object> object,
                                             Register function,
                                             Label* miss) {
   ASSERT(function.is(a1));
   // Check that the function really is a function.
   GenerateFunctionCheck(function, a3, miss);
-  PatchGlobalProxy(object, function);
+  PatchImplicitReceiver(object);
+
   // Invoke the function.
-  __ InvokeFunction(a1, arguments(), JUMP_FUNCTION,
-                    NullCallWrapper(), call_kind());
+  __ InvokeFunction(a1, arguments(), JUMP_FUNCTION, NullCallWrapper());
 }
 
 
 Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object,
                                                       Handle<JSObject> holder,
                                                       Handle<Name> name) {
   Label miss;
 
   GenerateNameCheck(name, &miss);
 
@@ skipping 94 matching lines @@
 
   // Return the generated code.
   return GetCode(kind(), Code::FAST, name);
 }
 
 
 #undef __
 #define __ ACCESS_MASM(masm)
 
 
-void CallStubCompiler::FetchGlobalProxy(MacroAssembler* masm,
-                                        Register target,
-                                        Register function) {
-  __ lw(target, FieldMemOperand(function, JSFunction::kContextOffset));
-  __ lw(target, ContextOperand(target, Context::GLOBAL_OBJECT_INDEX));
-  __ lw(target, FieldMemOperand(target, GlobalObject::kGlobalReceiverOffset));
-}
-
-
 void StoreStubCompiler::GenerateStoreViaSetter(
     MacroAssembler* masm,
     Handle<JSFunction> setter) {
   // ----------- S t a t e -------------
   //  -- a0    : value
   //  -- a1    : receiver
   //  -- a2    : name
   //  -- ra    : return address
   // -----------------------------------
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
 
     // Save value register, so we can restore it later.
     __ push(a0);
 
     if (!setter.is_null()) {
       // Call the JavaScript setter with receiver and value on the stack.
       __ push(a1);
       __ push(a0);
       ParameterCount actual(1);
       ParameterCount expected(setter);
       __ InvokeFunction(setter, expected, actual,
-                        CALL_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
+                        CALL_FUNCTION, NullCallWrapper());
     } else {
       // If we generate a global code snippet for deoptimization only, remember
       // the place to continue after deoptimization.
       masm->isolate()->heap()->SetSetterStubDeoptPCOffset(masm->pc_offset());
     }
 
     // We have to return the passed value, not the return value of the setter.
     __ pop(v0);
 
     // Restore context register.
@@ skipping 111 matching lines @@
   // -----------------------------------
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
 
     if (!getter.is_null()) {
       // Call the JavaScript getter with the receiver on the stack.
       __ push(receiver);
       ParameterCount actual(0);
       ParameterCount expected(getter);
       __ InvokeFunction(getter, expected, actual,
-                        CALL_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
+                        CALL_FUNCTION, NullCallWrapper());
     } else {
       // If we generate a global code snippet for deoptimization only, remember
       // the place to continue after deoptimization.
       masm->isolate()->heap()->SetGetterStubDeoptPCOffset(masm->pc_offset());
     }
 
     // Restore context register.
     __ lw(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
   }
   __ Ret();
@@ skipping 158 matching lines @@
   // -----------------------------------
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_MIPS