Revision: 15242
Author: [email protected]
Date: Thu Jun 20 06:09:46 2013
Log: Version 3.19.18.2.
Merged r15232 into trunk branch.
windows test fix for 15221
[email protected]
Review URL: https://codereview.chromium.org/17496003
http://code.google.com/p/v8/source/detail?r=15242
Modified:
/trunk/src/version.cc
/trunk/src/x64/stub-cache-x64.cc
=======================================
--- /trunk/src/version.cc Wed Jun 19 11:17:45 2013
+++ /trunk/src/version.cc Thu Jun 20 06:09:46 2013
@@ -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
=======================================
--- /trunk/src/x64/stub-cache-x64.cc Tue Jun 18 04:54:54 2013
+++ /trunk/src/x64/stub-cache-x64.cc Thu Jun 20 06:09:46 2013
@@ -1315,8 +1315,8 @@
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 @@
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.
