Reland v8:18458 "Load the global proxy from the context of the target function."

src/arm/stub-cache-arm.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 2323 matching lines @@
   __ LoadRoot(ip, Heap::kTrueValueRootIndex);
   __ cmp(object, ip);
   __ b(eq, &success);
   __ LoadRoot(ip, Heap::kFalseValueRootIndex);
   __ cmp(object, ip);
   __ b(ne, miss);
   __ bind(&success);
 }
 
 
-void CallStubCompiler::PatchGlobalProxy(Handle<Object> object) {
+void CallStubCompiler::PatchGlobalProxy(Handle<Object> object,
+                                        Handle<JSFunction> function) {
   if (object->IsGlobalObject()) {
     const int argc = arguments().immediate();
     const int receiver_offset = argc * kPointerSize;
-    __ ldr(r3, FieldMemOperand(r0, GlobalObject::kGlobalReceiverOffset));
+    __ Move(r3, handle(function->context()->global_proxy()));
     __ str(r3, MemOperand(sp, receiver_offset));
   }
 }
+
+
+void CallStubCompiler::PatchGlobalProxy(Handle<Object> object,
+                                        Register function) {
+  if (object->IsGlobalObject()) {
+    FetchGlobalProxy(masm(), r3, function);
+    const int argc = arguments().immediate();
+    const int receiver_offset = argc * kPointerSize;
+    __ str(r3, 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 -------------
   //  -- r2    : name
   //  -- lr    : return address
@@ skipping 75 matching lines @@
   return reg;
 }
 
 
 void CallStubCompiler::GenerateJumpFunction(Handle<Object> object,
                                             Register function,
                                             Label* miss) {
   ASSERT(function.is(r1));
   // Check that the function really is a function.
   GenerateFunctionCheck(function, r3, miss);
-  PatchGlobalProxy(object);
+  PatchGlobalProxy(object, function);
 
   // Invoke the function.
   __ InvokeFunction(r1, arguments(), JUMP_FUNCTION,
                     NullCallWrapper(), call_kind());
 }
 
 
 Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object,
                                                       Handle<JSObject> holder,
                                                       Handle<Name> name) {
@@ skipping 97 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) {
+  __ ldr(target, FieldMemOperand(function, JSFunction::kContextOffset));
+  __ ldr(target, ContextOperand(target, Context::GLOBAL_OBJECT_INDEX));
+  __ ldr(target, FieldMemOperand(target, GlobalObject::kGlobalReceiverOffset));
+}
+
+
 void StoreStubCompiler::GenerateStoreViaSetter(
     MacroAssembler* masm,
     Handle<JSFunction> setter) {
   // ----------- S t a t e -------------
   //  -- r0    : value
   //  -- r1    : receiver
   //  -- r2    : name
   //  -- lr    : return address
   // -----------------------------------
   {
@@ skipping 316 matching lines @@
   // -----------------------------------
   TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM