diff --git a/src/flag-definitions.h b/src/flag-definitions.h index 8362990be7..2cabda8443 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h @@ -297,8 +297,6 @@ DEFINE_BOOL(string_slices, true, "use string slices") // Flags for Ignition. DEFINE_BOOL(ignition, false, "use ignition interpreter") DEFINE_STRING(ignition_filter, "*", "filter for ignition interpreter") -DEFINE_BOOL(ignition_fake_try_catch, false, - "enable fake try-catch-finally blocks in ignition for testing") DEFINE_BOOL(ignition_fallback_on_catch, false, "fallback to full-codegen for functions which contain catch blocks") DEFINE_BOOL(print_bytecode, false, diff --git a/src/interpreter/bytecode-generator.cc b/src/interpreter/bytecode-generator.cc index f5df790e71..0b74a8dd3b 100644 --- a/src/interpreter/bytecode-generator.cc +++ b/src/interpreter/bytecode-generator.cc @@ -900,7 +900,6 @@ void BytecodeGenerator::VisitForOfStatement(ForOfStatement* stmt) { void BytecodeGenerator::VisitTryCatchStatement(TryCatchStatement* stmt) { TryCatchBuilder try_control_builder(builder()); - if (!FLAG_ignition_fake_try_catch) UNIMPLEMENTED(); // Preserve the context in a dedicated register, so that it can be restored // when the handler is entered by the stack-unwinding machinery. @@ -938,7 +937,6 @@ void BytecodeGenerator::VisitTryCatchStatement(TryCatchStatement* stmt) { void BytecodeGenerator::VisitTryFinallyStatement(TryFinallyStatement* stmt) { TryFinallyBuilder try_control_builder(builder()); - if (!FLAG_ignition_fake_try_catch) UNIMPLEMENTED(); // Preserve the context in a dedicated register, so that it can be restored // when the handler is entered by the stack-unwinding machinery. diff --git a/test/cctest/interpreter/test-bytecode-generator.cc b/test/cctest/interpreter/test-bytecode-generator.cc index 3f4236146d..84716db7bf 100644 --- a/test/cctest/interpreter/test-bytecode-generator.cc +++ b/test/cctest/interpreter/test-bytecode-generator.cc @@ -24,7 +24,6 @@ class BytecodeGeneratorHelper { BytecodeGeneratorHelper() { i::FLAG_ignition = true; - i::FLAG_ignition_fake_try_catch = true; i::FLAG_ignition_fallback_on_catch = false; i::FLAG_ignition_filter = StrDup(kFunctionName); i::FLAG_always_opt = false; diff --git a/test/cctest/interpreter/test-interpreter.cc b/test/cctest/interpreter/test-interpreter.cc index b2df1e3459..3f93bee2ed 100644 --- a/test/cctest/interpreter/test-interpreter.cc +++ b/test/cctest/interpreter/test-interpreter.cc @@ -65,7 +65,6 @@ class InterpreterTester { bytecode_(bytecode), feedback_vector_(feedback_vector) { i::FLAG_ignition = true; - i::FLAG_ignition_fake_try_catch = true; i::FLAG_ignition_fallback_on_catch = false; i::FLAG_always_opt = false; // Set ignition filter flag via SetFlagsFromString to avoid double-free diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py index 0bd4489ab7..211e8473d7 100644 --- a/tools/testrunner/local/testsuite.py +++ b/tools/testrunner/local/testsuite.py @@ -41,7 +41,7 @@ ALL_VARIANT_FLAGS = { "turbofan": [["--turbo"]], "turbofan_opt": [["--turbo", "--always-opt"]], "nocrankshaft": [["--nocrankshaft"]], - "ignition": [["--ignition", "--turbo", "--ignition-fake-try-catch", + "ignition": [["--ignition", "--turbo", "--ignition-fallback-on-catch"]], "preparser": [["--min-preparse-length=0"]], } @@ -52,7 +52,7 @@ FAST_VARIANT_FLAGS = { "stress": [["--stress-opt"]], "turbofan": [["--turbo"]], "nocrankshaft": [["--nocrankshaft"]], - "ignition": [["--ignition", "--turbo", "--ignition-fake-try-catch", + "ignition": [["--ignition", "--turbo", "--ignition-fallback-on-catch"]], "preparser": [["--min-preparse-length=0"]], }