Reviewers: Jakob,
Description:
Merged r15231 into 3.19 branch.
Skip parallel recompilation tests if parallel recompilation is disabled.
BUG=v8:2733
[email protected]
Please review this at https://codereview.chromium.org/17635009/
SVN Base: https://v8.googlecode.com/svn/branches/3.19
Affected files:
src/version.cc
test/mjsunit/compiler/parallel-proto-change.js
test/mjsunit/manual-parallel-recompile.js
test/mjsunit/parallel-initial-prototype-change.js
test/mjsunit/parallel-invalidate-transition-map.js
test/mjsunit/parallel-optimize-disabled.js
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
4ac9f6d88c351fb78b19a690da304fcb82c0fdbd..57098a9e521c7db439c52be11c49b4d1711faebb
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 8
+#define PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/compiler/parallel-proto-change.js
diff --git a/test/mjsunit/compiler/parallel-proto-change.js
b/test/mjsunit/compiler/parallel-proto-change.js
index
aa1ac6de90952c3a0f5e2e3ea28c4f1d1dcdd9f1..2392a37c95504e94c6688e9d048118e0e376c77a
100644
--- a/test/mjsunit/compiler/parallel-proto-change.js
+++ b/test/mjsunit/compiler/parallel-proto-change.js
@@ -28,6 +28,11 @@
// Flags: --allow-natives-syntax
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
Index: test/mjsunit/manual-parallel-recompile.js
diff --git a/test/mjsunit/manual-parallel-recompile.js
b/test/mjsunit/manual-parallel-recompile.js
index
5253487f4bb8bb9623dd0af9888b23d4afe01ef3..b502fb19ade7fb216e132dec6ed7ad112de4a059
100644
--- a/test/mjsunit/manual-parallel-recompile.js
+++ b/test/mjsunit/manual-parallel-recompile.js
@@ -28,6 +28,11 @@
// Flags: --allow-natives-syntax --expose-gc
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
@@ -60,10 +65,8 @@ assertUnoptimized(g);
%OptimizeFunctionOnNextCall(g, "parallel");
f(g(2)); // Trigger optimization.
-if (%IsParallelRecompilationSupported()) {
- assertUnoptimized(f); // Not yet optimized.
- assertUnoptimized(g);
-}
+assertUnoptimized(f); // Not yet optimized.
+assertUnoptimized(g);
%CompleteOptimization(f); // Wait till optimized code is installed.
%CompleteOptimization(g);
Index: test/mjsunit/parallel-initial-prototype-change.js
diff --git a/test/mjsunit/parallel-initial-prototype-change.js
b/test/mjsunit/parallel-initial-prototype-change.js
index
5544bebc1d49256f50b00a42d71a06f740ed7aaa..9f698bae6301603ac9db208b037609b51ff64ec8
100644
--- a/test/mjsunit/parallel-initial-prototype-change.js
+++ b/test/mjsunit/parallel-initial-prototype-change.js
@@ -28,6 +28,11 @@
// Flags: --allow-natives-syntax
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
Index: test/mjsunit/parallel-invalidate-transition-map.js
diff --git a/test/mjsunit/parallel-invalidate-transition-map.js
b/test/mjsunit/parallel-invalidate-transition-map.js
index
42a266f556e6ea0f75a83ad453a6d96ce11c81f0..2a2276f1e238bb1c19efe07ff50262d0e983fae6
100644
--- a/test/mjsunit/parallel-invalidate-transition-map.js
+++ b/test/mjsunit/parallel-invalidate-transition-map.js
@@ -28,6 +28,11 @@
// Flags: --track-fields --track-double-fields --allow-natives-syntax
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
Index: test/mjsunit/parallel-optimize-disabled.js
diff --git a/test/mjsunit/parallel-optimize-disabled.js
b/test/mjsunit/parallel-optimize-disabled.js
index
479684d40721d37124081a7d8f99e0be2696d6c3..b56303e08f4f14aec362764becec0f5b75d7cbb6
100644
--- a/test/mjsunit/parallel-optimize-disabled.js
+++ b/test/mjsunit/parallel-optimize-disabled.js
@@ -28,6 +28,11 @@
// Flags: --nodead-code-elimination --parallel-recompilation
// Flags: --allow-natives-syntax
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function g() { // g() cannot be optimized.
const x = 1;
x++;
--
--
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.
