Reviewers: Jakob,
Description:
Merged r14614, r15489 into 3.18 branch.
Skip flaky regress-crbug-160010 regression test.
MIPS: Fix bug in StringConstructCode builtin.
BUG=chromium:160010
[email protected]
Please review this at https://codereview.chromium.org/19058003/
SVN Base: https://v8.googlecode.com/svn/branches/3.18
Affected files:
M src/mips/builtins-mips.cc
M src/version.cc
M test/mjsunit/mjsunit.status
Index: src/mips/builtins-mips.cc
diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc
old mode 100644
new mode 100755
index
700bcc4a536862e16950b59189a28a094e94615d..27efe748cf892e621802c44f1b8d0fd497527649
--- a/src/mips/builtins-mips.cc
+++ b/src/mips/builtins-mips.cc
@@ -681,7 +681,7 @@ void
Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
__ IncrementCounter(counters->string_ctor_conversions(), 1, a3, t0);
{
FrameScope scope(masm, StackFrame::INTERNAL);
- __ push(v0);
+ __ push(a0);
__ InvokeBuiltin(Builtins::TO_STRING, CALL_FUNCTION);
}
__ pop(function);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
20a08054c0ee03aa32f297b19cf09e3223ba854a..498063c4e6f65a117e26bce781f8638fc54f5ba8
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 18
#define BUILD_NUMBER 5
-#define PATCH_LEVEL 9
+#define PATCH_LEVEL 10
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index
09097db9f52b5728d2abff7dc221fb1bd8afecb7..585d503a0fcaa64ea986e422cf9f2dda9eb934f8
100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -40,6 +40,9 @@ regress/regress-524: SKIP
# Skip long running test in debug and allow it to timeout in release mode.
# regress/regress-524: (PASS || TIMEOUT), SKIP if $mode == debug
+# This test non-deterministically runs out of memory on Windows ia32.
+regress/regress-crbug-160010: SKIP
+
# Deferred stack trace formatting is temporarily disabled.
stack-traces-gc: PASS || FAIL
@@ -74,8 +77,7 @@ unicode-case-overoptimization: PASS, TIMEOUT if ($arch ==
arm || $arch == androi
json-recursive: PASS, (PASS || FAIL) if $mode == debug
##############################################################################
-# Skip long running test that times out in debug mode or goes OOM on
android.
-regress/regress-crbug-160010: PASS, SKIP if ($mode == debug || $arch ==
android_arm)
+# Skip long running tests that time out in debug mode.
generated-transition-stub: PASS, SKIP if $mode == debug
##############################################################################
--
--
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.
