Reviewers: fschneider,
Description:
Merge r6649 from bleeding_edge to the 3.0 branch.
Please review this at http://codereview.chromium.org/6334108/
SVN Base: http://v8.googlecode.com/svn/branches/3.0/
Affected files:
M src/ia32/lithium-codegen-ia32.cc
M src/version.cc
A + test/mjsunit/regress/regress-1099.js
### BEGIN SVN COPY METADATA
#$ cp branches/bleeding_edge/test/mjsunit/regress/regress-1099.js
test/mjsunit/regress/regress-1099.js
### END SVN COPY METADATA
Index: src/ia32/lithium-codegen-ia32.cc
===================================================================
--- src/ia32/lithium-codegen-ia32.cc (revision 6649)
+++ src/ia32/lithium-codegen-ia32.cc (working copy)
@@ -2142,6 +2142,9 @@
ASSERT(receiver.is(eax));
v8::internal::ParameterCount actual(eax);
__ InvokeFunction(edi, actual, CALL_FUNCTION, &safepoint_generator);
+
+ // Restore context.
+ __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
}
Index: src/version.cc
===================================================================
--- src/version.cc (revision 6649)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 0
#define BUILD_NUMBER 12
-#define PATCH_LEVEL 11
+#define PATCH_LEVEL 12
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
Index: test/mjsunit/regress/regress-1099.js
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
