From d19410f8e7237240ea870652d32f7147b8873822 Mon Sep 17 00:00:00 2001 From: bmeurer Date: Mon, 15 Jun 2015 02:42:57 -0700 Subject: [PATCH] [mjsunit] Remove unsupported flag --turbo-deoptimization from tests. R=svenpanne@chromium.org Review URL: https://codereview.chromium.org/1183123002 Cr-Commit-Position: refs/heads/master@{#29018} --- test/mjsunit/big-array-literal.js | 1 - test/mjsunit/compiler/osr-maze1.js | 2 +- test/mjsunit/compiler/osr-maze2.js | 2 +- test/mjsunit/compiler/regress-445907.js | 2 -- test/mjsunit/compiler/regress-446647.js | 2 +- test/mjsunit/compiler/regress-447567.js | 2 -- test/mjsunit/compiler/regress-uint8-deopt.js | 2 +- test/mjsunit/compiler/try-deopt.js | 2 +- test/mjsunit/debug-backtrace-text.js | 2 +- test/mjsunit/debug-break-inline.js | 2 +- test/mjsunit/debug-clearbreakpointgroup.js | 1 - test/mjsunit/debug-evaluate-arguments.js | 2 +- test/mjsunit/debug-evaluate-closure.js | 1 - test/mjsunit/debug-evaluate-with.js | 1 - test/mjsunit/debug-receiver.js | 2 +- test/mjsunit/debug-references.js | 3 +-- test/mjsunit/debug-scopes.js | 2 +- test/mjsunit/debug-step-2.js | 1 - test/mjsunit/harmony/proxies.js | 3 +-- test/mjsunit/regress/poly_count_operation.js | 2 +- test/mjsunit/regress/regress-1170187.js | 1 - test/mjsunit/regress/regress-119609.js | 1 - test/mjsunit/regress/regress-131994.js | 1 - test/mjsunit/regress/regress-325676.js | 1 - test/mjsunit/regress/regress-417709a.js | 2 +- test/mjsunit/regress/regress-78270.js | 2 -- test/mjsunit/regress/regress-assignment-in-test-context.js | 3 +-- test/mjsunit/regress/regress-crbug-107996.js | 1 - test/mjsunit/regress/regress-crbug-171715.js | 1 - test/mjsunit/regress/regress-crbug-222893.js | 1 - test/mjsunit/regress/regress-crbug-480819.js | 2 +- test/mjsunit/regress/regress-crbug-489293.js | 2 +- test/mjsunit/regress/regress-debug-deopt-while-recompile.js | 1 - test/mjsunit/regress/regress-opt-after-debug-deopt.js | 1 - test/mjsunit/regress/string-set-char-deopt.js | 2 +- test/mjsunit/strict-mode.js | 2 -- 36 files changed, 18 insertions(+), 43 deletions(-) diff --git a/test/mjsunit/big-array-literal.js b/test/mjsunit/big-array-literal.js index 7e19c0a..5f4396e 100644 --- a/test/mjsunit/big-array-literal.js +++ b/test/mjsunit/big-array-literal.js @@ -28,7 +28,6 @@ // On MacOS X 10.7.5, this test needs a stack size of at least 788 kBytes. // On PPC64, this test needs a stack size of at least 698 kBytes. // Flags: --stack-size=800 -// Flags: --turbo-deoptimization // Test that we can make large object literals that work. // Also test that we can attempt to make even larger object literals without diff --git a/test/mjsunit/compiler/osr-maze1.js b/test/mjsunit/compiler/osr-maze1.js index 6e192c1..da17282 100644 --- a/test/mjsunit/compiler/osr-maze1.js +++ b/test/mjsunit/compiler/osr-maze1.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --allow-natives-syntax --use-osr --turbo-deoptimization +// Flags: --allow-natives-syntax --use-osr function bar(goal) { var count = 0; diff --git a/test/mjsunit/compiler/osr-maze2.js b/test/mjsunit/compiler/osr-maze2.js index 96838a4..1fc1cd2 100644 --- a/test/mjsunit/compiler/osr-maze2.js +++ b/test/mjsunit/compiler/osr-maze2.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --allow-natives-syntax --use-osr --turbo-deoptimization +// Flags: --allow-natives-syntax --use-osr function bar() { var sum = 11; diff --git a/test/mjsunit/compiler/regress-445907.js b/test/mjsunit/compiler/regress-445907.js index c820753..8cde944 100644 --- a/test/mjsunit/compiler/regress-445907.js +++ b/test/mjsunit/compiler/regress-445907.js @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --turbo-deoptimization - v = []; v.length = (1 << 30); diff --git a/test/mjsunit/compiler/regress-446647.js b/test/mjsunit/compiler/regress-446647.js index 77757ab..6387aaa 100644 --- a/test/mjsunit/compiler/regress-446647.js +++ b/test/mjsunit/compiler/regress-446647.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --always-opt --turbo-filter=* --turbo-deoptimization --allow-natives-syntax +// Flags: --always-opt --turbo-filter=* --allow-natives-syntax function f(a,b) { a%b diff --git a/test/mjsunit/compiler/regress-447567.js b/test/mjsunit/compiler/regress-447567.js index b6dc653..c348deb 100644 --- a/test/mjsunit/compiler/regress-447567.js +++ b/test/mjsunit/compiler/regress-447567.js @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --turbo-deoptimization - assertThrows(function() { [0].every(function(){ Object.seal((new Int8Array())); }); }) diff --git a/test/mjsunit/compiler/regress-uint8-deopt.js b/test/mjsunit/compiler/regress-uint8-deopt.js index ba2823f..5be2d0c 100644 --- a/test/mjsunit/compiler/regress-uint8-deopt.js +++ b/test/mjsunit/compiler/regress-uint8-deopt.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --turbo-asm --turbo-deoptimization --allow-natives-syntax +// Flags: --turbo-asm --turbo-asm-deoptimization --allow-natives-syntax function Module(heap) { "use asm"; diff --git a/test/mjsunit/compiler/try-deopt.js b/test/mjsunit/compiler/try-deopt.js index 0613173..a4a6eb0 100644 --- a/test/mjsunit/compiler/try-deopt.js +++ b/test/mjsunit/compiler/try-deopt.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --allow-natives-syntax --turbo-deoptimization +// Flags: --allow-natives-syntax function DeoptFromTry(x) { try { diff --git a/test/mjsunit/debug-backtrace-text.js b/test/mjsunit/debug-backtrace-text.js index 3bfaeb0..61648fa 100644 --- a/test/mjsunit/debug-backtrace-text.js +++ b/test/mjsunit/debug-backtrace-text.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --expose-debug-as debug --turbo-deoptimization +// Flags: --expose-debug-as debug // The functions used for testing backtraces. function Point(x, y) { diff --git a/test/mjsunit/debug-break-inline.js b/test/mjsunit/debug-break-inline.js index 3ef4d4e..4418fa8 100644 --- a/test/mjsunit/debug-break-inline.js +++ b/test/mjsunit/debug-break-inline.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --expose-debug-as debug --allow-natives-syntax --turbo-deoptimization +// Flags: --expose-debug-as debug --allow-natives-syntax // This test tests that deoptimization due to debug breaks works for // inlined functions where the full-code is generated before the diff --git a/test/mjsunit/debug-clearbreakpointgroup.js b/test/mjsunit/debug-clearbreakpointgroup.js index 3c03bda..b0ff383 100644 --- a/test/mjsunit/debug-clearbreakpointgroup.js +++ b/test/mjsunit/debug-clearbreakpointgroup.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization // Get the Debug object exposed from the debug context global object. var Debug = debug.Debug diff --git a/test/mjsunit/debug-evaluate-arguments.js b/test/mjsunit/debug-evaluate-arguments.js index 9765f19..92b745f 100644 --- a/test/mjsunit/debug-evaluate-arguments.js +++ b/test/mjsunit/debug-evaluate-arguments.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --expose-debug-as debug --turbo-deoptimization +// Flags: --expose-debug-as debug // Get the Debug object exposed from the debug context global object. Debug = debug.Debug diff --git a/test/mjsunit/debug-evaluate-closure.js b/test/mjsunit/debug-evaluate-closure.js index cf507b5..778defd 100644 --- a/test/mjsunit/debug-evaluate-closure.js +++ b/test/mjsunit/debug-evaluate-closure.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug --allow-natives-syntax -// Flags: --turbo-deoptimization Debug = debug.Debug; var listened = false; diff --git a/test/mjsunit/debug-evaluate-with.js b/test/mjsunit/debug-evaluate-with.js index 3f3310f..4e02d9e 100644 --- a/test/mjsunit/debug-evaluate-with.js +++ b/test/mjsunit/debug-evaluate-with.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization // Get the Debug object exposed from the debug context global object. Debug = debug.Debug diff --git a/test/mjsunit/debug-receiver.js b/test/mjsunit/debug-receiver.js index 2d5d2e0..21cdde8 100644 --- a/test/mjsunit/debug-receiver.js +++ b/test/mjsunit/debug-receiver.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --expose-debug-as debug --turbo-deoptimization +// Flags: --expose-debug-as debug // Get the Debug object exposed from the debug context global object. Debug = debug.Debug; diff --git a/test/mjsunit/debug-references.js b/test/mjsunit/debug-references.js index cb9f370..f1a0508 100644 --- a/test/mjsunit/debug-references.js +++ b/test/mjsunit/debug-references.js @@ -25,8 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --expose-debug-as debug --turbo-deoptimization -// Flags: --stack-trace-on-illegal +// Flags: --expose-debug-as debug --stack-trace-on-illegal // Get the Debug object exposed from the debug context global object. Debug = debug.Debug diff --git a/test/mjsunit/debug-scopes.js b/test/mjsunit/debug-scopes.js index 1e1e22a..c388a67 100644 --- a/test/mjsunit/debug-scopes.js +++ b/test/mjsunit/debug-scopes.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --expose-debug-as debug --allow-natives-syntax --turbo-deoptimization +// Flags: --expose-debug-as debug --allow-natives-syntax // The functions used for testing backtraces. They are at the top to make the // testing of source line/column easier. diff --git a/test/mjsunit/debug-step-2.js b/test/mjsunit/debug-step-2.js index 5fe7466..502b426 100644 --- a/test/mjsunit/debug-step-2.js +++ b/test/mjsunit/debug-step-2.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization // This test tests that full code compiled without debug break slots // is recompiled with debug break slots when debugging is started. diff --git a/test/mjsunit/harmony/proxies.js b/test/mjsunit/harmony/proxies.js index 2500ecc..585574e 100644 --- a/test/mjsunit/harmony/proxies.js +++ b/test/mjsunit/harmony/proxies.js @@ -29,8 +29,7 @@ // test enters an infinite recursion which goes through the runtime and we // overflow the system stack before the simulator stack. -// Flags: --harmony-proxies --sim-stack-size=500 --turbo-deoptimization -// Flags: --allow-natives-syntax +// Flags: --harmony-proxies --sim-stack-size=500 --allow-natives-syntax // Helper. diff --git a/test/mjsunit/regress/poly_count_operation.js b/test/mjsunit/regress/poly_count_operation.js index 99f041b..a8a1ed2 100644 --- a/test/mjsunit/regress/poly_count_operation.js +++ b/test/mjsunit/regress/poly_count_operation.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --allow-natives-syntax --turbo-deoptimization +// Flags: --allow-natives-syntax var o1 = {x:1}; var o2 = {}; diff --git a/test/mjsunit/regress/regress-1170187.js b/test/mjsunit/regress/regress-1170187.js index 3621bc4..6aa2896 100644 --- a/test/mjsunit/regress/regress-1170187.js +++ b/test/mjsunit/regress/regress-1170187.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization // Make sure that the retreival of local variables are performed correctly even // when an adapter frame is present. diff --git a/test/mjsunit/regress/regress-119609.js b/test/mjsunit/regress/regress-119609.js index 0c85063..99041ad 100644 --- a/test/mjsunit/regress/regress-119609.js +++ b/test/mjsunit/regress/regress-119609.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization Debug = debug.Debug; diff --git a/test/mjsunit/regress/regress-131994.js b/test/mjsunit/regress/regress-131994.js index 3de3813..7f60095 100644 --- a/test/mjsunit/regress/regress-131994.js +++ b/test/mjsunit/regress/regress-131994.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization // Test that a variable in the local scope that shadows a context-allocated // variable is correctly resolved when being evaluated in the debugger. diff --git a/test/mjsunit/regress/regress-325676.js b/test/mjsunit/regress/regress-325676.js index 7450a6d..427bbc3 100644 --- a/test/mjsunit/regress/regress-325676.js +++ b/test/mjsunit/regress/regress-325676.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization // If a function parameter is forced to be context allocated, // debug evaluate need to resolve it to a context slot instead of diff --git a/test/mjsunit/regress/regress-417709a.js b/test/mjsunit/regress/regress-417709a.js index 7c4d4f7..d210c10 100644 --- a/test/mjsunit/regress/regress-417709a.js +++ b/test/mjsunit/regress/regress-417709a.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --stack-size=100 --turbo-deoptimization +// Flags: --stack-size=100 var a = []; diff --git a/test/mjsunit/regress/regress-78270.js b/test/mjsunit/regress/regress-78270.js index 02c4b14..b9ce286 100644 --- a/test/mjsunit/regress/regress-78270.js +++ b/test/mjsunit/regress/regress-78270.js @@ -25,8 +25,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --turbo-deoptimization - for (var i = 0; i < 10000; i++) { try { var object = { }; diff --git a/test/mjsunit/regress/regress-assignment-in-test-context.js b/test/mjsunit/regress/regress-assignment-in-test-context.js index bc40985..61ca220 100644 --- a/test/mjsunit/regress/regress-assignment-in-test-context.js +++ b/test/mjsunit/regress/regress-assignment-in-test-context.js @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --allow-natives-syntax --always-opt -// Flags: --turbo-filter=* --turbo-deoptimization +// Flags: --allow-natives-syntax --always-opt --turbo-filter=* function assertEquals() {} diff --git a/test/mjsunit/regress/regress-crbug-107996.js b/test/mjsunit/regress/regress-crbug-107996.js index b4907f3..dfe07e5 100644 --- a/test/mjsunit/regress/regress-crbug-107996.js +++ b/test/mjsunit/regress/regress-crbug-107996.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization Debug = debug.Debug; diff --git a/test/mjsunit/regress/regress-crbug-171715.js b/test/mjsunit/regress/regress-crbug-171715.js index 309f50a..040c381 100644 --- a/test/mjsunit/regress/regress-crbug-171715.js +++ b/test/mjsunit/regress/regress-crbug-171715.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization Debug = debug.Debug diff --git a/test/mjsunit/regress/regress-crbug-222893.js b/test/mjsunit/regress/regress-crbug-222893.js index 75e1728..39363bc 100644 --- a/test/mjsunit/regress/regress-crbug-222893.js +++ b/test/mjsunit/regress/regress-crbug-222893.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug -// Flags: --turbo-deoptimization Debug = debug.Debug diff --git a/test/mjsunit/regress/regress-crbug-480819.js b/test/mjsunit/regress/regress-crbug-480819.js index 8d3b7ee..086f6c8 100644 --- a/test/mjsunit/regress/regress-crbug-480819.js +++ b/test/mjsunit/regress/regress-crbug-480819.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --turbo-filter=* --always-opt --turbo-deoptimization --noanalyze-environment-liveness +// Flags: --turbo-filter=* --always-opt --noanalyze-environment-liveness (function() { "use strict"; diff --git a/test/mjsunit/regress/regress-crbug-489293.js b/test/mjsunit/regress/regress-crbug-489293.js index 38d58e7..bcfc702 100644 --- a/test/mjsunit/regress/regress-crbug-489293.js +++ b/test/mjsunit/regress/regress-crbug-489293.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --allow-natives-syntax --turbo-filter=f --turbo-deoptimization +// Flags: --allow-natives-syntax --turbo-filter=f // Flags: --noanalyze-environment-liveness function f() { diff --git a/test/mjsunit/regress/regress-debug-deopt-while-recompile.js b/test/mjsunit/regress/regress-debug-deopt-while-recompile.js index ce5220a..52c32e9 100644 --- a/test/mjsunit/regress/regress-debug-deopt-while-recompile.js +++ b/test/mjsunit/regress/regress-debug-deopt-while-recompile.js @@ -26,7 +26,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --expose-debug-as debug --allow-natives-syntax -// Flags: --turbo-deoptimization Debug = debug.Debug; diff --git a/test/mjsunit/regress/regress-opt-after-debug-deopt.js b/test/mjsunit/regress/regress-opt-after-debug-deopt.js index 5cbaabc..c637be5 100644 --- a/test/mjsunit/regress/regress-opt-after-debug-deopt.js +++ b/test/mjsunit/regress/regress-opt-after-debug-deopt.js @@ -27,7 +27,6 @@ // Flags: --expose-debug-as debug --allow-natives-syntax // Flags: --concurrent-recompilation --block-concurrent-recompilation -// Flags: --turbo-deoptimization if (!%IsConcurrentRecompilationSupported()) { print("Concurrent recompilation is disabled. Skipping this test."); diff --git a/test/mjsunit/regress/string-set-char-deopt.js b/test/mjsunit/regress/string-set-char-deopt.js index 03100a3..8956e28 100644 --- a/test/mjsunit/regress/string-set-char-deopt.js +++ b/test/mjsunit/regress/string-set-char-deopt.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --allow-natives-syntax --turbo-deoptimization +// Flags: --allow-natives-syntax (function OneByteSeqStringSetCharDeoptOsr() { function deopt() { diff --git a/test/mjsunit/strict-mode.js b/test/mjsunit/strict-mode.js index 326e725..d993976 100644 --- a/test/mjsunit/strict-mode.js +++ b/test/mjsunit/strict-mode.js @@ -25,8 +25,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Flags: --turbo-deoptimization - function CheckStrictMode(code, exception) { assertDoesNotThrow(code); assertThrows("'use strict';\n" + code, exception); -- 2.7.4