Reviewers: Søren Gjesse,
Message:
Please check.
Description:
Fix bug in X64 code on trunk. See Chromium issue 32436.
(Fixed on bleeding edge in revision 3644).
Please review this at http://codereview.chromium.org/552041
Affected files:
M src/version.cc
M src/x64/macro-assembler-x64.cc
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
b6369210c710178d971c9a217ac0d2cf622c0cc0..00052d1cb6df8e152b5b302dd53afea34d10c241
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 0
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index
5cf09f2675476b437753518cfd0c6c99735cef11..dc77c894853f21d930069f6df430ff800aa5f830
100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -2374,7 +2374,7 @@ void MacroAssembler::LoadContext(Register dst, int
context_chain_length) {
// Move up the chain of contexts to the context containing the slot.
movq(dst, Operand(rsi, Context::SlotOffset(Context::CLOSURE_INDEX)));
// Load the function context (which is the incoming, outer context).
- movq(rax, FieldOperand(rax, JSFunction::kContextOffset));
+ movq(dst, FieldOperand(dst, JSFunction::kContextOffset));
for (int i = 1; i < context_chain_length; i++) {
movq(dst, Operand(dst, Context::SlotOffset(Context::CLOSURE_INDEX)));
movq(dst, FieldOperand(dst, JSFunction::kContextOffset));
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
