Skip to content

Commit 4887c72

Browse files
committed
[GR-46498] Do not pass invalid -XX flags to Native Image in clone-uninitialized-checks
PullRequest: truffleruby/4010
2 parents 4de76ef + 0dc5809 commit 4887c72

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

test/truffle/compiler/clone-uninitialized-checks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source test/truffle/common.sh.inc
55
export TRUFFLERUBY_CHECK_PREINITIALIZED_SPEC=false
66

77
# --always-clone-all covers more than just --core-always-clone, but is much slower (6 min vs 1 min)
8-
jt test fast -- --vm.XX:-UseJVMCICompiler --engine.Compilation=false --core-always-clone --check-clone-uninitialized-correctness
8+
JT_SPECS_COMPILATION=false JT_SPECS_SPLITTING=true jt test fast -- --core-always-clone --check-clone-uninitialized-correctness

tool/jt.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161

6262
JT_PROFILE_SUBCOMMANDS = ENV['JT_PROFILE_SUBCOMMANDS'] == 'true'
6363
JT_SPECS_COMPILATION = ENV['JT_SPECS_COMPILATION'] == 'false' ? false : true
64+
JT_SPECS_SPLITTING = ENV['JT_SPECS_SPLITTING'] == 'true' ? true : JT_SPECS_COMPILATION
6465

6566
# Expand GEM_HOME relative to cwd so it cannot be misinterpreted later.
6667
ENV['GEM_HOME'] = File.expand_path(ENV['GEM_HOME']) if ENV['GEM_HOME']
@@ -1687,7 +1688,8 @@ def mspec(*args)
16871688
vm_args, ruby_args, parsed_options = ruby_options({}, ['--reveal', *ruby_args])
16881689

16891690
if !JT_SPECS_COMPILATION && truffleruby_compiler? && truffleruby_jvm?
1690-
vm_args << '--vm.XX:-UseJVMCICompiler' << '--engine.Compilation=false' << '--engine.Splitting=false'
1691+
vm_args << '--vm.XX:-UseJVMCICompiler' << '--engine.Compilation=false'
1692+
vm_args << '--engine.Splitting=false' unless JT_SPECS_SPLITTING
16911693
end
16921694

16931695

0 commit comments

Comments
 (0)