[GR-48041] Prepare 23.1

PullRequest: truffleruby/3961

Author: imanemamri

.gitattributes

@@ -1,7 +1,3 @@
-# Merge options
-
-/CHANGELOG.md merge=union
-
 # Rules for GitHub's Linguist language-classification system. We're abusing the
 # 'vendored' attribute to exclude files as a lot of this isn't really vendored,
 # and a whole lot of actually vendored code isn't listed! What we want to do is
@@ -28,7 +24,8 @@
 /src/main/c/truffleposix/Makefile linguist-vendored
 /lib/gems/gems/*/bin/setup linguist-vendored
 /lib/truffle/post_install_hook.sh linguist-vendored
-/src/test/* linguist-vendored
+/src/test-embedding/* linguist-vendored
+/src/test-internal/* linguist-vendored
 /src/processor/* linguist-vendored
 
 # Generated code

.rubocop.yml

@@ -17,7 +17,7 @@ AllCops:
     - 'lib/truffle/socket/mri.rb' # taken from MRI
     - 'lib/truffle/ffi/**/*.rb' # taken from FFI gem
     - 'src/main/ruby/truffleruby/core/truffle/ffi/pointer_extra.rb' # taken from FFI gem
-    - 'src/test/ruby/types.rb' # deliberately strange code for debugging purposes
+    - 'src/test-internal/ruby/types.rb' # deliberately strange code for debugging purposes
     - 'src/tck/ruby/lexical-context.rb' # deliberately strange code for debugging purposes
 
 # Type 'Layout' (166):

CHANGELOG.md

@@ -49,6 +49,7 @@ Performance:
 
 Changes:
 
+* The TruffleRuby `ScriptEngine` implementation is removed in favor of the generic [ScriptEngine](https://github.com/oracle/graal/blob/master/docs/reference-manual/embedding/embed-languages.md#compatibility-with-jsr-223-scriptengine) in GraalVM docs.
 
 Memory Footprint:
 

ci.jsonnet

@@ -211,8 +211,10 @@ local part_definitions = {
       # Same as in mx.truffleruby/native-host-inlining
       mx_options+:: [
         "--extra-image-builder-argument=env.EXTRA_IMAGE_BUILDER_ARGUMENTS",
+        "--extra-image-builder-argument=rubyvm:-H:+UnlockExperimentalVMOptions",
         "--extra-image-builder-argument=rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase",
         "--extra-image-builder-argument=rubyvm:-H:+TruffleHostInliningPrintExplored",
+        "--extra-image-builder-argument=rubyvm:-H:-UnlockExperimentalVMOptions",
         "--extra-image-builder-argument=rubyvm:-Dgraal.LogFile=host-inlining.txt",
       ],
       environment+: {

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.41.0",
+  "mx_version": "6.42.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

doc/contributor/native-image.md

@@ -84,7 +84,7 @@ the Native Image version of TruffleRuby using a tool distributed as part of Graa
 the Java version of TruffleRuby from GraalVM.
 
 ```bash
-native-image -H:Name=native-ruby --language:ruby
+native-image -o native-ruby --language:ruby
 ```
 
 `native-ruby` is the output file name.

doc/contributor/using-eclipse.md

@@ -37,11 +37,7 @@ We can now import the projects:
 * Select this repository as root directory
 * Click `Finish`
 
-There should be now 4 projects in your workspace:
-* `truffleruby`
-* `truffleruby-test`
-* `TRUFFLERUBY-TEST.dist`
-* `TRUFFLERUBY.dist`
+There should be now some projects in your workspace, like `truffleruby` and `TRUFFLERUBY.dist`.
 
 ## Advanced Setup
 

doc/user/jruby-migration.md

@@ -21,10 +21,11 @@ The standalone distribution does not allow for Java interoperability.
 
 JRuby supports many different ways to embed Ruby in Java, including JSR 223 (also know as `javax.script`), the Bean Scripting Framework (BSF), JRuby Embed (also known as Red Bridge), and the JRuby direct embedding API.
 
-Thes best way to embed TruffleRuby is to use the Polyglot API, which is part of GraalVM.
+The best way to embed TruffleRuby is to use the Polyglot API, which is part of GraalVM.
 The API is different because it is designed to support many languages, not just Ruby.
 
 TruffleRuby also supports JSR 223, compatible with JRuby, to make it easier to run legacy JRuby code.
+See [this documentation](https://github.com/oracle/graal/blob/master/docs/reference-manual/embedding/embed-languages.md#compatibility-with-jsr-223-scriptengine) for how to use it.
 
 You will need to use GraalVM to use both of these APIs.
 

lib/cext/ABI_version.txt

@@ -1 +1 @@
-1
+23.1.0

mx.truffleruby/mx_truffleruby.py

@@ -119,7 +119,7 @@ def contents(self, result):
             '--disable-gems',
             '--disable-rubyopt',
         ]
-        command = [jdk.java] + jvm_args + [main_class] + ruby_options + ['"$@"']
+        command = [jdk.java] + jvm_args + ['-m', 'org.graalvm.ruby.launcher/' + main_class] + ruby_options + ['"$@"']
         return "#!/usr/bin/env bash\n" + "exec " + " ".join(command) + "\n"
 
 
@@ -143,14 +143,14 @@ def build_truffleruby(args):
 
 def ruby_check_heap_dump(input_args, out=None):
     print("mx ruby_check_heap_dump " + " ".join(input_args))
-    dists = ['TRUFFLERUBY', 'TRUFFLE_NFI', 'SULONG_NATIVE', 'TRUFFLERUBY-TEST']
+    dists = ['TRUFFLERUBY', 'TRUFFLE_NFI', 'SULONG_NATIVE', 'TRUFFLERUBY-TEST-INTERNAL']
     mx.command_function('build')(['--dependencies', ','.join(dists)])
     args = input_args
     args.insert(0, "--experimental-options")
     vm_args, truffleruby_args = mx.extract_VM_args(args, useDoubleDash=True, defaultAllVMArgs=False)
     vm_args += mx.get_runtime_jvm_args(dists)
     # vm_args.append("-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y")
-    vm_args.append("org.truffleruby.LeakTest")
+    vm_args.append("org.truffleruby.test.internal.LeakTest")
     out = mx.OutputCapture() if out is None else out
     retval = mx.run_java(vm_args + truffleruby_args, jdk=jdk, nonZeroIsFatal=False, out=out)
     if retval == 0:
@@ -273,9 +273,6 @@ def verify_ci(args):
         'truffleruby:JCODINGS',
         'truffleruby:JONI',
     ],
-    boot_jars=[
-        'truffleruby:TRUFFLERUBY-SERVICES'
-    ],
     support_distributions=[
         'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT',
         'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT_NO_NI_RESOURCES',
@@ -301,9 +298,7 @@ def verify_ci(args):
             main_class='org.truffleruby.launcher.RubyLauncher',
             build_args=[
                 '-J-Xmx6g', # Set Xmx to use a reliable amount of memory
-                '-H:+DumpThreadStacksOnSignal',
                 '-H:+DetectUserDirectoriesInImageHeap',
-                '-H:+TruffleCheckBlockListMethods'
             ],
             build_args_enterprise=[
                 '-J-Xmx7g', # Set Xmx to use a reliable amount of memory