Revision: 18502
Author: [email protected]
Date: Wed Jan 8 21:39:43 2014 UTC
Log: Merged r18443 into 3.22 branch.
MIPS: Fix loading of global object in LWrapReceiver.
BUG=318420
LOG=N
[email protected]
Review URL: https://codereview.chromium.org/128903002
http://code.google.com/p/v8/source/detail?r=18502
Modified:
/branches/3.22/src/mips/lithium-codegen-mips.cc
/branches/3.22/src/version.cc
=======================================
--- /branches/3.22/src/mips/lithium-codegen-mips.cc Wed Jan 8 15:21:56
2014 UTC
+++ /branches/3.22/src/mips/lithium-codegen-mips.cc Wed Jan 8 21:39:43
2014 UTC
@@ -3325,7 +3325,8 @@
__ Branch(&receiver_ok);
__ bind(&global_object);
- __ lw(receiver, GlobalObjectOperand());
+ __ lw(receiver, MemOperand(fp, StandardFrameConstants::kContextOffset));
+ __ lw(receiver, ContextOperand(receiver, Context::GLOBAL_OBJECT_INDEX));
__ lw(receiver,
FieldMemOperand(receiver, JSGlobalObject::kGlobalReceiverOffset));
__ bind(&receiver_ok);
=======================================
--- /branches/3.22/src/version.cc Wed Jan 8 17:30:05 2014 UTC
+++ /branches/3.22/src/version.cc Wed Jan 8 21:39:43 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 22
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 12
+#define PATCH_LEVEL 13
// 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.
