Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 5350b6bb4e654784ea9b0697cc442593ec1022f8..f26f834e59b921d29edeba8e482360ff6cb5f45e 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -2341,23 +2341,11 @@ void StubCompiler::GenerateBooleanCheck(Register object, Label* miss) { |
} |
-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; |
- __ 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; |
+ __ LoadRoot(r3, Heap::kUndefinedValueRootIndex); |
__ str(r3, MemOperand(sp, receiver_offset)); |
} |
} |
@@ -2456,7 +2444,7 @@ void CallStubCompiler::GenerateJumpFunction(Handle<Object> object, |
ASSERT(function.is(r1)); |
// Check that the function really is a function. |
GenerateFunctionCheck(function, r3, miss); |
- PatchGlobalProxy(object, function); |
+ PatchImplicitReceiver(object); |
// Invoke the function. |
__ InvokeFunction(r1, arguments(), JUMP_FUNCTION, |
@@ -2574,15 +2562,6 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
#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) { |