jruby · Dec 24, 2015 · Dec 24, 2015 · Dec 24, 2015
Showing with 17 additions and 10 deletions.

+6 −0 bin/jruby.bash

+1 −1 test/truffle/attachments-optimise.rb

+1 −1 test/truffle/can-we-fold-yet.rb

+1 −1 test/truffle/pe/pe.rb

+8 −7 tool/jt.rb
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -238,6 +238,12 @@ do
                 opt="${opt:1}=false" ;;
             esac
             java_args=("${java_args[@]}" "-Djvmci.option.$opt")
+        elif [ "${val:0:15}" = "-Djvmci.option." ]; then # Graal options
+            opt=${val:15}
+            java_args=("${java_args[@]}" "-Djvmci.option.$opt")
+        elif [ "${val:0:15}" = "-Dgraal.option." ]; then # Graal options
+            opt=${val:15}
+            java_args=("${java_args[@]}" "-Djvmci.option.$opt")
         else
             if [ "${val:0:3}" = "-ea" ]; then
                 VERIFY_JRUBY="yes"

diff --git a/test/truffle/attachments-optimise.rb b/test/truffle/attachments-optimise.rb
@@ -1,4 +1,4 @@
-# -J-Djvmci.option.TruffleCompilationExceptionsAreFatal=true
+# -J-G:+TruffleCompilationExceptionsAreFatal
 
 def foo
   foo = 14

diff --git a/test/truffle/can-we-fold-yet.rb b/test/truffle/can-we-fold-yet.rb
@@ -6,7 +6,7 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-# Use -J-Djvmci.option.TruffleIterativePartialEscape=true
+# Use -J-G:+TruffleIterativePartialEscape
 
 unless Truffle.graal?
   puts 'You need Graal to run this'

diff --git a/test/truffle/pe/pe.rb b/test/truffle/pe/pe.rb
@@ -24,7 +24,7 @@
 #
 # Run with:
 #
-#   jt run --graal -J-Djvmci.option.TraceTruffleCompilation=true -J-Djvmci.option.TruffleCompilationExceptionsAreFatal=true -J-Djvmci.option.TruffleIterativePartialEscape=true test.rb
+#   jt run --graal -J-G:+TraceTruffleCompilation -J-G:+TruffleCompilationExceptionsAreFatal -J-G:+TruffleIterativePartialEscape test.rb
 
 TIMEOUT = 10
 

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -257,6 +257,7 @@ def irb(*args)
   end
 
   def rebuild
+    FileUtils.cp('bin/jruby.bash', 'bin/jruby')
     clean
     build
   end
@@ -294,9 +295,9 @@ def run(*args)
       warn "warning: --igv might not work on master - if it does not, use truffle-head instead which builds against latest graal" if Utilities.git_branch == 'master'
       Utilities.ensure_igv_running
       if args.delete('--full')
-        jruby_args += %w[-J-Djvmci.option.Dump=Truffle]
+        jruby_args += %w[-J-G:Dump=Truffle]
       else
-        jruby_args += %w[-J-Djvmci.option.Dump=TrufflePartialEscape]
+        jruby_args += %w[-J-G:Dump=TrufflePartialEscape]
       end
     end
 
@@ -365,8 +366,8 @@ def test(*args)
 
   def test_pe(*args)
     file = args.pop if args.last and File.exist?(args.last)
-    args.push('-J-Djvmci.option.TruffleIterativePartialEscape=true')
-    args.push('-J-Djvmci.option.TruffleCompilationExceptionsAreThrown=true')
+    args.push('-J-G:+TruffleIterativePartialEscape')
+    args.push('-J-G:+TruffleCompilationExceptionsAreThrown')
     run('--graal', *args, 'test/truffle/pe/pe.rb', *file)
   end
   private :test_pe
@@ -444,11 +445,11 @@ def bench(command, *args)
     bench_args = ["#{bench_dir}/bin/bench9000"]
     case command
     when 'debug'
-      vm_args = ['-Djvmci.option.TraceTruffleCompilation=true', '-Djvmci.option.DumpOnError=true']
+      vm_args = ['-G:+TraceTruffleCompilation', '-G:+DumpOnError']
       if args.delete '--ruby-backtrace'
-        vm_args.push '-Djvmci.option.TruffleCompilationExceptionsAreThrown=true'
+        vm_args.push '-G:+TruffleCompilationExceptionsAreThrown'
       else
-        vm_args.push '-Djvmci.option.TruffleCompilationExceptionsAreFatal=true'
+        vm_args.push '-G:+TruffleCompilationExceptionsAreFatal'
       end
       remaining_args = []
       args.each do |arg|