Reviewers: Toon Verwaest,
Description:
Merged r18443 into 3.23 branch.
MIPS: Fix loading of global object in LWrapReceiver.
BUG=318420
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/128693002/
SVN Base: https://v8.googlecode.com/svn/branches/3.23
Affected files (+4, -2 lines):
M src/mips/lithium-codegen-mips.cc
M src/version.cc
Index: src/mips/lithium-codegen-mips.cc
diff --git a/src/mips/lithium-codegen-mips.cc
b/src/mips/lithium-codegen-mips.cc
index
9f3c088db9f11c1230ade84e72df896922914b1c..757b67a548c79f1a6ed289599f528173668d7b51
100644
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -3410,7 +3410,9 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
__ Branch(&result_in_receiver);
__ bind(&global_object);
- __ lw(result, GlobalObjectOperand());
+
+ __ lw(result, MemOperand(fp, StandardFrameConstants::kContextOffset));
+ __ lw(result, ContextOperand(result, Context::GLOBAL_OBJECT_INDEX));
__ lw(result,
FieldMemOperand(result, JSGlobalObject::kGlobalReceiverOffset));
if (result.is(receiver)) {
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
18c93588736387fe9024f7397d57686f6a4eccac..ba4f7345049162764cdd6e3fec8a32dcd58f6aee
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 23
#define BUILD_NUMBER 17
-#define PATCH_LEVEL 3
+#define PATCH_LEVEL 4
// 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.
