Address warnings about --engine options which moved to --compiler

Author: eregon

test/truffle/compiler/can-we-fold-yet.sh

@@ -2,7 +2,7 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --engine.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/can-we-fold-yet/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
+jt ruby --experimental-options --compiler.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/can-we-fold-yet/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
 
 if ! cmp test/truffle/compiler/can-we-fold-yet/expected.txt actual.txt
 then

test/truffle/compiler/can-we-fold-yet/can-we-fold-yet.rb

@@ -6,7 +6,7 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-# Use --experimental-options --engine.IterativePartialEscape --engine.MultiTier=false
+# Use --experimental-options --compiler.IterativePartialEscape --engine.MultiTier=false
 
 require 'readline'
 

test/truffle/compiler/pe.sh

@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --experimental-options --check-compilation --engine.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/pe/pe.rb "$@"
+jt ruby --experimental-options --check-compilation --compiler.IterativePartialEscape --engine.MultiTier=false test/truffle/compiler/pe/pe.rb "$@"

test/truffle/compiler/pe/pe.rb

@@ -24,7 +24,7 @@
 #
 # Run with:
 #
-#   jt --env jvm-ce ruby --experimental-options --engine.TraceCompilation --check-compilation --engine.IterativePartialEscape --engine.MultiTier=false test.rb
+#   jt --env jvm-ce ruby --experimental-options --engine.TraceCompilation --check-compilation --compiler.IterativePartialEscape --engine.MultiTier=false test.rb
 
 require_relative 'pe_harness'
 

tool/docker.rb

@@ -264,7 +264,7 @@ def docker(*args)
         end
 
         configs.each do |c|
-          lines << "RUN ruby #{c} --experimental-options --engine.CompilationFailureAction=ExitVM --engine.TreatPerformanceWarningsAsErrors=all --engine.IterativePartialEscape  --engine.MultiTier=false pe/pe.rb || true"
+          lines << "RUN ruby #{c} --experimental-options --engine.CompilationFailureAction=ExitVM --compiler.TreatPerformanceWarningsAsErrors=all --compiler.IterativePartialEscape  --engine.MultiTier=false pe/pe.rb || true"
         end
       end
 

tool/jt.rb

@@ -1016,7 +1016,7 @@ def rebuild(*options)
       when '--check-compilation'
         add_experimental_options.call
         vm_args << '--engine.CompilationFailureAction=ExitVM'
-        vm_args << '--engine.TreatPerformanceWarningsAsErrors=all'
+        vm_args << '--compiler.TreatPerformanceWarningsAsErrors=all'
       when '--stress'
         add_experimental_options.call
         vm_args << '--engine.CompileImmediately'
@@ -1035,7 +1035,7 @@ def rebuild(*options)
         if truffleruby_jvm?
           vm_args << '--vm.XX:+UnlockDiagnosticVMOptions' << '--vm.XX:+DebugNonSafepoints'
         end
-        vm_args << '--engine.NodeSourcePositions=true'
+        vm_args << '--compiler.NodeSourcePositions=true'
       when '--fg'
         add_experimental_options.call
         vm_args << '--engine.BackgroundCompilation=false'
@@ -2186,7 +2186,7 @@ def graph(*args)
       '--engine.BackgroundCompilation=false',
       "--engine.CompileOnly=#{method}",
       '--engine.MultiTier=false',
-      '--engine.NodeSourcePositions',
+      '--compiler.NodeSourcePositions',
       '--vm.Dgraal.PrintGraphWithSchedule=true',
       *('--vm.Dgraal.PrintBackendCFG=true' if cfg2asm),
       '--vm.Dgraal.Dump=Truffle:1',