Add missing --experimental-options

eregon · andrykonchin · commit fd1813a93ed0 · 2024-01-30T18:21:31.000+02:00
* Those were not noticed before because of `--experimental-options --pattern-matching` always passed for specs.
diff --git a/test/truffle/compiler/clone-uninitialized-checks.sh b/test/truffle/compiler/clone-uninitialized-checks.sh
@@ -5,4 +5,4 @@ source test/truffle/common.sh.inc
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
 
 # --always-clone-all covers more than just --core-always-clone, but is much slower (6 min vs 1 min)
-JT_SPECS_COMPILATION=false JT_SPECS_SPLITTING=true jt test fast -- --core-always-clone --check-clone-uninitialized-correctness
+JT_SPECS_COMPILATION=false JT_SPECS_SPLITTING=true jt test fast -- --experimental-options --core-always-clone --check-clone-uninitialized-correctness
diff --git a/test/truffle/compiler/compile-immediately.sh b/test/truffle/compiler/compile-immediately.sh
@@ -6,6 +6,6 @@ code="puts 'hello'"
 
 # Test both without and with BackgroundCompilation, it catches different issues
 
-jt ruby --engine.UsePreInitializedContext=false --check-compilation --engine.CompileImmediately --engine.BackgroundCompilation=false --trace -e "$code"
+jt ruby --engine.UsePreInitializedContext=false --check-compilation --experimental-options --engine.CompileImmediately --engine.BackgroundCompilation=false --trace -e "$code"
 
-jt ruby --engine.UsePreInitializedContext=false --check-compilation --engine.CompileImmediately --trace -e "$code"
+jt ruby --engine.UsePreInitializedContext=false --check-compilation --experimental-options --engine.CompileImmediately --trace -e "$code"
diff --git a/test/truffle/compiler/optional-assignment-lazy-load.sh b/test/truffle/compiler/optional-assignment-lazy-load.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --check-compilation --engine.MultiTier=false test/truffle/compiler/optional-assignment-lazy-load/optional-assignment-lazy-load.rb
+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/optional-assignment-lazy-load/optional-assignment-lazy-load.rb
diff --git a/test/truffle/compiler/osr.sh b/test/truffle/compiler/osr.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation test/truffle/compiler/osr/osr.rb
+jt ruby --check-compilation test/truffle/compiler/osr/osr.rb
diff --git a/test/truffle/compiler/pe.sh b/test/truffle/compiler/pe.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --compiler.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/pe/pe.rb "$@"
+jt ruby --check-compilation --experimental-options --compiler.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/pe/pe.rb "$@"
diff --git a/test/truffle/compiler/stf-optimises.sh b/test/truffle/compiler/stf-optimises.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --engine.MultiTier=false test/truffle/compiler/stf-optimises/stf-optimises.rb
+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/stf-optimises/stf-optimises.rb
diff --git a/test/truffle/compiler/tp-optimises.sh_excluded b/test/truffle/compiler/tp-optimises.sh_excluded
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --engine.MultiTier=false test/truffle/compiler/tp-optimises/tp-optimises.rb
+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/tp-optimises/tp-optimises.rb
diff --git a/test/truffle/integration/code-sharing-test-fast.sh b/test/truffle/integration/code-sharing-test-fast.sh
@@ -3,4 +3,4 @@
 source test/truffle/common.sh.inc
 
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
-jt test fast -- --engine.ForceCodeSharing --experimental-engine-caching
+jt test fast -- --experimental-options --engine.ForceCodeSharing --experimental-engine-caching
diff --git a/test/truffle/integration/intrument-all-nodes.sh b/test/truffle/integration/intrument-all-nodes.sh
@@ -3,4 +3,4 @@
 source test/truffle/common.sh.inc
 
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
-jt test fast -- --instrument-all-nodes
+jt test fast -- --experimental-options --instrument-all-nodes
diff --git a/test/truffle/integration/limit-zero.sh b/test/truffle/integration/limit-zero.sh
@@ -3,4 +3,4 @@
 source test/truffle/common.sh.inc
 
 export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
-jt test fast -- --default-cache=0 --identity-cache=0 --class-cache=0 --array-dup-cache=0 --array-strategy-cache=0 --pack-unroll=0 --global-variable-max-invalidations=0
+jt test fast -- --experimental-options --default-cache=0 --identity-cache=0 --class-cache=0 --array-dup-cache=0 --array-strategy-cache=0 --pack-unroll=0 --global-variable-max-invalidations=0
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -1700,7 +1700,7 @@ def mspec(*args)
     vm_args, ruby_args, parsed_options = ruby_options({}, ['--reveal', *ruby_args])
 
     if !JT_SPECS_COMPILATION && truffleruby_compiler? && truffleruby_jvm?
-      vm_args << '--vm.XX:-UseJVMCICompiler' << '--engine.Compilation=false'
+      vm_args << '--vm.XX:-UseJVMCICompiler' << '--experimental-options' << '--engine.Compilation=false'
       vm_args << '--engine.Splitting=false' unless JT_SPECS_SPLITTING
     end
 

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`source test/truffle/common.sh.inc`
`4`	`4`
`5`		`-jt ruby --check-compilation --engine.MultiTier=false test/truffle/compiler/optional-assignment-lazy-load/optional-assignment-lazy-load.rb`
	`5`	`+jt ruby --check-compilation --experimental-options --engine.MultiTier=false test/truffle/compiler/optional-assignment-lazy-load/optional-assignment-lazy-load.rb`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`source test/truffle/common.sh.inc`
`4`	`4`
`5`		`-jt ruby --experimental-options --check-compilation test/truffle/compiler/osr/osr.rb`
	`5`	`+jt ruby --check-compilation test/truffle/compiler/osr/osr.rb`