Revert of [test] Split TurboFan mjsunit expectations for variants.

test/mjsunit/mjsunit.status

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 37 matching lines @@
 
   # Issue 3784: setters-on-elements is flaky
   'setters-on-elements': [PASS, FAIL],
 
   # Issue 3641: The new 'then' semantics suppress some exceptions.
   # These tests may be changed or removed when 'chain' is deprecated.
   'es6/debug-promises/reject-with-throw-in-reject': [FAIL],
   'es6/debug-promises/reject-with-undefined-reject': [FAIL],
   'es6/debug-promises/reject-with-invalid-reject': [FAIL],
 
+  ##############################################################################
+  # TurboFan compiler failures.
+
+  # Some tests are just too slow to run for now.
+  'big-object-literal': [PASS, NO_VARIANTS],
+  'json2': [PASS, NO_VARIANTS],
+  'packed-elements': [PASS, NO_VARIANTS],
+  'unicode-test': [PASS, NO_VARIANTS],
+  'whitespaces': [PASS, NO_VARIANTS],
+  'ignition/regress-599001-verifyheap': [PASS, NO_VARIANTS],
+  'es6/string-fromcodepoint': [PASS, NO_VARIANTS],
+  'regress/regress-2612': [PASS, NO_VARIANTS],
+
   # Issue 3660: Replacing activated TurboFan frames by unoptimized code does
   # not work, but we expect it to not crash.
-  'debug-step-turbofan': [FAIL],
+  'debug-step-turbofan': [PASS, FAIL],
+
+  # TODO(jarin/mstarzinger): Investigate debugger issues with TurboFan.
+  'debug-evaluate-closure': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals-capturing': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals-optimized': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals-optimized-double': [PASS, NO_VARIANTS],
+  'debug-evaluate-recursive': [PASS, NO_VARIANTS],  # only in no-snap debug.
+  'debug-liveedit-check-stack': [PASS, NO_VARIANTS],  # only in no-snap mode.
+  'debug-liveedit-double-call': [PASS, NO_VARIANTS],
+  'debug-set-variable-value': [PASS, NO_VARIANTS],
+  'es6/debug-evaluate-blockscopes': [PASS, NO_VARIANTS],
+
+  # Assumptions about optimization need investigation in TurboFan.
+  'regress-sync-optimized-lists': [PASS, NO_VARIANTS],
+
+  # Fails in --turbo --always-opt mode.
+  'regress/regress-105': [PASS, NO_VARIANTS],
 
   ##############################################################################
   # Too slow in debug mode with --stress-opt mode.
+  'compiler/regress-stacktrace-methods': [PASS, ['mode == debug', SKIP]],
+  'compiler/regress-funcaller': [PASS, ['mode == debug', SKIP]],
   'regress/regress-2318': [PASS, ['mode == debug', SKIP]],
   'regress/regress-create-exception': [PASS, ['mode == debug', SKIP]],
 
   ##############################################################################
   # Too slow in debug mode for validation of elements.
   'regress/regress-430201': [PASS, ['mode == debug', SKIP]],
   'regress/regress-430201b': [PASS, ['mode == debug', SKIP]],
 
   ##############################################################################
   # Too slow in debug mode for GC stress mode.
@@ skipping 460 matching lines @@
   'math-floor-of-div-minus-zero': [SKIP],
 }],  # 'arch == mipsel or arch == mips'
 
 ##############################################################################
 ['arch == mips', {
   # Flaky with TF.
   'mirror-script': [PASS, NO_VARIANTS],
 }],  # 'arch == mips'
 
 ##############################################################################
+
 ['arch == mips64el or arch == mips64', {
 
   # Slow tests which times out in debug mode.
   'try': [PASS, ['mode == debug', SKIP]],
   'debug-scripts-request': [PASS, ['mode == debug', SKIP]],
   'array-constructor': [PASS, ['mode == debug', SKIP]],
 
   # Times out often in release mode on MIPS.
   'compiler/regress-stacktrace-methods': [PASS, PASS, ['mode == release', TIMEOUT]],
   'array-splice': [PASS, TIMEOUT],
@@ skipping 100 matching lines @@
 }],  # 'arch == ppc and simulator_run == True'
 
 ##############################################################################
 ['arch == ppc64', {
 
   # stack overflow
   'big-array-literal': [SKIP],
 }],  # 'arch == ppc64'
 
 ##############################################################################
-['variant == stress', {
-  'debug-evaluate-locals-optimized': [FAIL],
-  'debug-evaluate-locals-optimized-double': [FAIL],
-  'ignition/regress-599001-verifyheap': [SKIP],
-  'unicode-test': [SKIP],
-}],  # variant == stress
-
-##############################################################################
-['variant == turbofan', {
-
-  # Assumptions about optimization need investigation in TurboFan.
-  'regress-sync-optimized-lists': [FAIL],
-
-}],  # variant == turbofan
-
-##############################################################################
-['variant == turbofan_opt', {
-
-  # TODO(jarin/mstarzinger): Investigate debugger issues with TurboFan.
-  'debug-evaluate-closure': [FAIL],
-  'debug-evaluate-locals': [FAIL],
-  'debug-set-variable-value': [FAIL],
-  'debug-evaluate-locals-optimized': [FAIL],
-  'debug-evaluate-locals-optimized-double': [FAIL],
-  'debug-liveedit-double-call': [FAIL],
-  'es6/debug-evaluate-blockscopes': [FAIL],
-
-  # TODO(jgruber): Fails in --turbo --always-opt mode.
-  'regress/regress-105': [FAIL],
-
-  # Too slow.
-  'big-object-literal': [SKIP],
-  'ignition/regress-599001-verifyheap': [SKIP],
-  'unicode-test': [SKIP],
-
-}],  # variant == turbofan_opt
-
-##############################################################################
-['variant == ignition', {
-  'debug-liveedit-double-call': [FAIL],
-  'regress-sync-optimized-lists': [FAIL],
-}],  # variant == ignition
-
-##############################################################################
 ['variant == ignition_staging', {
   'allocation-site-info': [FAIL],
   'array-constructor-feedback': [FAIL],
   'array-feedback': [FAIL],
   'array-literal-feedback': [FAIL],
   'assert-opt-and-deopt': [FAIL],
   'compiler/deopt-inlined-from-call': [FAIL],
   'compiler/increment-typefeedback': [FAIL],
   'compiler/manual-concurrent-recompile': [FAIL],
   'constant-folding-2': [FAIL],
   'debug-is-active': [FAIL],
-  'debug-liveedit-double-call': [FAIL],
   'deopt-with-fp-regs': [FAIL],
   'deserialize-optimize-inner': [FAIL],
   'div-mul-minus-one': [FAIL],
   'elements-transition-hoisting': [FAIL],
   'es6/block-let-crankshaft': [FAIL],
   'es6/block-let-crankshaft-sloppy': [FAIL],
   'getters-on-elements': [FAIL],
   'harmony/do-expressions': [FAIL],
   'math-floor-of-div-minus-zero': [FAIL],
   'regress/regress-2132': [FAIL],
   'regress/regress-2339': [FAIL],
   'regress/regress-3176': [FAIL],
   'regress/regress-3709': [FAIL],
   'regress/regress-385565': [FAIL],
   'regress/regress-4121': [FAIL],
   'regress/regress-crbug-594183': [FAIL],
   'regress/regress-embedded-cons-string': [FAIL],
   'regress/regress-map-invalidation-2': [FAIL],
   'regress/regress-param-local-type': [FAIL],
   'regress/regress-prepare-break-while-recompile': [FAIL],
-  'regress-sync-optimized-lists': [FAIL],
   'shift-for-integer-div': [FAIL],
   'sin-cos': [FAIL],
   'smi-mul-const': [FAIL],
   'smi-mul': [FAIL],
   'unary-minus-deopt': [FAIL],
 
   # Flaky.
   'asm/int32div': [SKIP],
   'asm/int32mod': [SKIP],
   'compiler/uint32': [SKIP],
   'regress/regress-454725': [SKIP],
 
-  # Might trigger stack overflow.
-  'unicode-test': [SKIP],
-
 }],  # variant == ignition_staging
 
 ##############################################################################
 ['variant == ignition_turbofan', {
-  'debug-liveedit-double-call': [FAIL],
-
-  # Might trigger stack overflow.
-  'unicode-test': [SKIP],
-
   # TODO(mythria, 4780): Related to type feedback for calls in interpreter.
   'array-literal-feedback': [FAIL],
   'regress/regress-4121': [FAIL],
   'array-constructor-feedback': [FAIL],
   'array-feedback': [FAIL],
   'allocation-site-info': [FAIL],
 
   'wasm/asm-wasm-f32': [PASS, ['arch in [arm64]', SKIP]],
   'wasm/asm-wasm-f64': [PASS, ['arch in [arm64]', SKIP]],
 
@@ skipping 45 matching lines @@
 ##############################################################################
 ['gcov_coverage', {
   # Tests taking too long.
   'array-functions-prototype-misc': [SKIP],
 
   # Stack overflow.
   'big-array-literal': [SKIP],
 }],  # 'gcov_coverage'
 
 ]