Reviewers: Jakob,
Description:
Version 3.19.18.2.
Merged r15232 into trunk branch.
windows test fix for 15221
[email protected]
Please review this at https://codereview.chromium.org/17496003/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M src/version.cc
M src/x64/stub-cache-x64.cc
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
e415600a4cf24c74aa1a4da3e43ff57319c26736..9c787ae70efd8c683da70ba9165905e90583e860
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 19
#define BUILD_NUMBER 18
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index
79a158c3b385e4814235c2bf9b7b54418d3d94be..0217fad74bd9015b2557a2fd3bbbd27a079283a8
100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -1315,8 +1315,8 @@ void BaseLoadStubCompiler::GenerateLoadCallback(
Register reg,
Handle<ExecutableAccessorInfo> callback) {
// Insert additional parameters into the stack frame above return
address.
- ASSERT(!scratch2().is(reg));
- __ pop(scratch2()); // Get return address to place it below.
+ ASSERT(!scratch4().is(reg));
+ __ pop(scratch4()); // Get return address to place it below.
__ push(receiver()); // receiver
__ push(reg); // holder
@@ -1354,9 +1354,9 @@ void BaseLoadStubCompiler::GenerateLoadCallback(
Register name_arg = rdi;
#endif
- ASSERT(!name_arg.is(scratch2()));
+ ASSERT(!name_arg.is(scratch4()));
__ movq(name_arg, rsp);
- __ push(scratch2()); // Restore return address.
+ __ push(scratch4()); // Restore return address.
// v8::Arguments::values_ and handler for name.
const int kStackSpace = PropertyCallbackArguments::kArgsLength + 1;
--
--
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.
