From bea3014d9ed9c7e550dfb48ba53c4c5575452d9d Mon Sep 17 00:00:00 2001 From: "palfia@homejinni.com" Date: Tue, 28 Jan 2014 20:25:38 +0000 Subject: [PATCH] ARM: Fix global object loading in DoWrapReceiver. This commit fixes the global object loading to load the result into the "result" register instead of the "receiver" register. BUG= R=verwaest@chromium.org Review URL: https://codereview.chromium.org/134903004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18889 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/lithium-codegen-arm.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc index a8d960f..d10663c 100644 --- a/src/arm/lithium-codegen-arm.cc +++ b/src/arm/lithium-codegen-arm.cc @@ -3520,11 +3520,11 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) { __ b(&result_in_receiver); __ bind(&global_object); - __ ldr(receiver, FieldMemOperand(function, JSFunction::kContextOffset)); - __ ldr(receiver, - ContextOperand(receiver, Context::GLOBAL_OBJECT_INDEX)); - __ ldr(receiver, - FieldMemOperand(receiver, GlobalObject::kGlobalReceiverOffset)); + __ ldr(result, FieldMemOperand(function, JSFunction::kContextOffset)); + __ ldr(result, + ContextOperand(result, Context::GLOBAL_OBJECT_INDEX)); + __ ldr(result, + FieldMemOperand(result, GlobalObject::kGlobalReceiverOffset)); if (result.is(receiver)) { __ bind(&result_in_receiver); -- 2.7.4