Reviewers: Jakob,
Description:
Merged r18421 into 3.22 branch.
ARM: fix loading of global object in LWrapReceiver.
BUG=318420
[email protected]
LOG=N
Please review this at https://codereview.chromium.org/128403004/
SVN Base: https://v8.googlecode.com/svn/branches/3.22
Affected files (+3, -2 lines):
M src/arm/lithium-codegen-arm.cc
M src/version.cc
Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index
e76b4a5a456a485ed9fa7759a4b72d0a1bc071b0..647ce723e257ee388081a4f777984051bb11fdb4
100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -3456,7 +3456,8 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
__ jmp(&receiver_ok);
__ bind(&global_object);
- __ ldr(receiver, GlobalObjectOperand());
+ __ ldr(receiver, MemOperand(fp, StandardFrameConstants::kContextOffset));
+ __ ldr(receiver, ContextOperand(receiver, Context::GLOBAL_OBJECT_INDEX));
__ ldr(receiver,
FieldMemOperand(receiver, JSGlobalObject::kGlobalReceiverOffset));
__ bind(&receiver_ok);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
12660db56e4d8cb2fb0fc5a6986786f42c48b0f2..8db1b7bbec649cd403a53dba28c9546c7c9f2dd1
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 22
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 11
+#define PATCH_LEVEL 12
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
