Index: src/ia32/stub-cache-ia32.cc |
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc |
index d63c2bb9cfec3a30f21ba620e500b85302870f30..6ab3964b80f75b469e0004d32c0ee75d82e00278 100644 |
--- a/src/ia32/stub-cache-ia32.cc |
+++ b/src/ia32/stub-cache-ia32.cc |
@@ -2468,23 +2468,11 @@ void StubCompiler::GenerateBooleanCheck(Register object, Label* miss) { |
} |
-void CallStubCompiler::PatchGlobalProxy(Handle<Object> object, |
- Handle<JSFunction> function) { |
+void CallStubCompiler::PatchGlobalProxy(Handle<Object> object) { |
if (object->IsGlobalObject()) { |
const int argc = arguments().immediate(); |
const int receiver_offset = (argc + 1) * kPointerSize; |
- __ LoadHeapObject(edx, handle(function->context()->global_proxy())); |
- __ mov(Operand(esp, receiver_offset), edx); |
- } |
-} |
- |
- |
-void CallStubCompiler::PatchGlobalProxy(Handle<Object> object, |
- Register function) { |
- if (object->IsGlobalObject()) { |
- FetchGlobalProxy(masm(), edx, function); |
- const int argc = arguments().immediate(); |
- const int receiver_offset = (argc + 1) * kPointerSize; |
+ __ mov(edx, FieldOperand(edx, GlobalObject::kGlobalReceiverOffset)); |
__ mov(Operand(esp, receiver_offset), edx); |
} |
} |
@@ -2578,7 +2566,7 @@ void CallStubCompiler::GenerateJumpFunction(Handle<Object> object, |
GenerateFunctionCheck(function, ebx, miss); |
if (!function.is(edi)) __ mov(edi, function); |
- PatchGlobalProxy(object, function); |
+ PatchGlobalProxy(object); |
// Invoke the function. |
__ InvokeFunction(edi, arguments(), JUMP_FUNCTION, |
@@ -2693,15 +2681,6 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
#define __ ACCESS_MASM(masm) |
-void CallStubCompiler::FetchGlobalProxy(MacroAssembler* masm, |
- Register target, |
- Register function) { |
- __ mov(target, FieldOperand(function, JSFunction::kContextOffset)); |
- __ mov(target, ContextOperand(target, Context::GLOBAL_OBJECT_INDEX)); |
- __ mov(target, FieldOperand(target, GlobalObject::kGlobalReceiverOffset)); |
-} |
- |
- |
void StoreStubCompiler::GenerateStoreViaSetter( |
MacroAssembler* masm, |
Handle<JSFunction> setter) { |