diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h index 4a197d460d..ed361e3357 100644 --- a/src/flags/flag-definitions.h +++ b/src/flags/flag-definitions.h @@ -684,7 +684,6 @@ DEFINE_BOOL_READONLY(concurrent_sparkplug, false, #else DEFINE_BOOL(concurrent_sparkplug, false, "compile Sparkplug code in a background thread") -DEFINE_IMPLICATION(concurrent_sparkplug, sparkplug) DEFINE_WEAK_IMPLICATION(future, concurrent_sparkplug) DEFINE_NEG_IMPLICATION(predictable, concurrent_sparkplug) DEFINE_NEG_IMPLICATION(single_threaded, concurrent_sparkplug) diff --git a/tools/testrunner/local/variants.py b/tools/testrunner/local/variants.py index f973b9d4d8..3feee7dfd3 100644 --- a/tools/testrunner/local/variants.py +++ b/tools/testrunner/local/variants.py @@ -15,6 +15,7 @@ ALL_VARIANT_FLAGS = { "experimental_regexp": [["--default-to-experimental-regexp-engine"]], "jitless": [["--jitless"]], "sparkplug": [["--sparkplug"]], + "concurrent_sparkplug": [["--concurrent-sparkplug", "--sparkplug"]], "always_sparkplug": [[ "--always-sparkplug", "--sparkplug"]], "minor_mc": [["--minor-mc"]], "no_lfa": [["--no-lazy-feedback-allocation"]], @@ -50,8 +51,8 @@ ALL_VARIANT_FLAGS = { # implications defined in flag-definitions.h. INCOMPATIBLE_FLAGS_PER_VARIANT = { "jitless": ["--opt", "--always-opt", "--liftoff", "--track-field-types", - "--validate-asm", "--sparkplug", "--always-sparkplug", - "--regexp-tier-up", "--no-regexp-interpret-all"], + "--validate-asm", "--sparkplug", "--concurrent-sparkplug", + "--always-sparkplug", "--regexp-tier-up", "--no-regexp-interpret-all"], "nooptimization": ["--always-opt"], "slow_path": ["--no-force-slow-path"], "stress_concurrent_allocation": ["--single-threaded-gc", "--predictable"], @@ -70,6 +71,7 @@ INCOMPATIBLE_FLAGS_PER_VARIANT = { "--liftoff-only", "--wasm-speculative-inlining", "--wasm-dynamic-tiering"], "sparkplug": ["--jitless"], + "concurrent_sparkplug": ["--jitless"], "always_sparkplug": ["--jitless"], "code_serializer": ["--cache=after-execute", "--cache=full-code-cache", "--cache=none"],