Merge remote-tracking branch 'origin/jruby-10.0'

Author: headius

.github/workflows/dist-verification-ci.yml

@@ -0,0 +1,83 @@
+name: Dist Verification CI
+
+on: [push, pull_request]
+
+env:
+  JAVA_OPTS: '-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xms60M -Xmx1G -XX:InitialCodeCacheSize=40M -XX:ReservedCodeCacheSize=120M'
+
+permissions:
+  contents: read
+
+jobs:
+  build-dist:
+
+    strategy:
+      matrix:
+        java-version: ['21']
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+
+    name: Build JRuby dist archive
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up java 21
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 21
+          cache: 'maven'
+      - name: build dist archive
+        run: |
+          mvn -ntp clean package -Pdist
+          mv maven/jruby-dist/target/jruby-dist*-bin.tar.gz jruby-dist-bin.tar.gz
+      - name: cache dist
+        uses: actions/upload-artifact@v4
+        with:
+          name: jruby-dist
+          path: jruby-dist-bin.tar.gz
+          retention-days: 1
+
+  rails-verification:
+
+    needs: build-dist
+
+    strategy:
+      matrix:
+        java-version: ['21', '25']
+        runs-on: [windows-latest, macos-latest, ubuntu-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.runs-on }}
+
+    name: dist verification on ${{ matrix.runs-on }} (Java ${{ matrix.java-version }})
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          path: jruby-src
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+      - name: download cached dist
+        uses: actions/download-artifact@v5
+        with:
+          name: jruby-dist
+      - name: unpack dist
+        run: tar xzf jruby-dist-bin.tar.gz --strip-components=1
+      - name: dist verification (Windows)
+        if: matrix.runs-on == 'windows-latest'
+        run: echo "${{ github.workspace }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+      - name: set up dist path (Unix)
+        if: matrix.runs-on != 'windows-latest'
+        run: echo "$(pwd)/bin" >> $GITHUB_PATH
+      - name: rails verification
+        run: jruby jruby-src/tool/rails_runner
+      - name: syslog verification (Unix)
+        if: matrix.runs-on != 'windows-latest'
+        run: jruby -rsyslog -e 1

.github/workflows/windows-verification-ci.yml

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 JRUBY_VERSION=10.1.0.0-SNAPSHOT
+=======
+JRUBY_VERSION=10.1.0.0-SNAPSHOT
+>>>>>>> origin/jruby-10.0
 JRUBY_MAIN=org.jruby.main.Main
 JRUBY_MINIMUM_JAVA_VERSION=21

bin/.jruby.release

@@ -849,7 +849,15 @@ JAVA_OPTS="$JAVA_OPTS ${JAVA_MEM-} ${JAVA_STACK-}"
 
 JFFI_OPTS="-Djffi.boot.library.path=$JRUBY_HOME/lib/jni"
 
-CLASSPATH="${CP-}${CP_DELIMITER}${CLASSPATH-}"
+if [ -n "${CP-}" ]; then
+    if [ -n "${CLASSPATH-}" ]; then
+        CLASSPATH="${CP-}${CP_DELIMITER}${CLASSPATH-}"
+    else
+        CLASSPATH="${CP-}"
+    fi
+else
+    CLASSPATH="${CLASSPATH-}"
+fi
 
 # ----- Module and Class Data Sharing flags for Java 9+ -----------------------
 
@@ -989,17 +997,22 @@ fi
 
 prepend java_args "$JAVACMD"
 
+classpath_value=$CLASSPATH
 if $NO_BOOTCLASSPATH || $VERIFY_JRUBY; then
     if $use_modules; then
         # Use module path instead of classpath for the jruby libs
-        append java_args --module-path "$JRUBY_CP" -classpath "$CLASSPATH"
+        append java_args --module-path "$JRUBY_CP"
     else
-        append java_args -classpath "$JRUBY_CP$CP_DELIMITER$CLASSPATH"
+        classpath_value="$JRUBY_CP$CP_DELIMITER$classpath_value"
+        # Trim extra delimiter we might have appended
+        classpath_value="${classpath_value%"$CP_DELIMITER"}"
     fi
 else
     append java_args -Xbootclasspath/a:"$JRUBY_CP"
-    append java_args -classpath "$CLASSPATH"
-    append java_args -Djruby.home="$JRUBY_HOME"
+fi
+
+if [ -n "$classpath_value" ]; then
+    append java_args -classpath "$classpath_value"
 fi
 
 append java_args -Djruby.home="$JRUBY_HOME" \

bin/jruby.sh

@@ -2265,9 +2265,22 @@ final RubyBoolean respond_to_p(ThreadContext context, IRubyObject methodName, fi
 
         if (getMetaClass().respondsToMethod(name.idString(), !includePrivate, context.getCurrentStaticScope())) return context.tru;
 
-        Ruby runtime = context.runtime;
-        IRubyObject result = sites(context).respond_to_missing.call(context, this, this, name, runtime.newBoolean(includePrivate));
-        return context.runtime.newBoolean(result.isTrue());
+        IRubyObject respondToMissing = basicObjectRespondToMissing(context, getMetaClass(), this, name, includePrivate);
+        if (respondToMissing == UNDEF) return context.fals;
+        return asBoolean(context, respondToMissing.isTrue());
+    }
+
+    // MRI: basic_obj_respond_to_missing, sort of
+    private IRubyObject basicObjectRespondToMissing(ThreadContext context, RubyClass klass, IRubyObject obj,
+                                 IRubyObject mid, boolean includePrivate)
+    {
+        CacheEntry entry = sites(context).respond_to_missing.retrieveCache(this);
+
+        if (!entry.method.isUndefined()) {
+            return entry.method.call(context, this, klass, "respond_to_missing?", mid, asBoolean(context, includePrivate));
+        }
+
+        return UNDEF;
     }
 
     /**

core/src/main/java/org/jruby/RubyBasicObject.java

@@ -234,6 +234,9 @@ private static class GlobOptions {
     private static void globOptions(ThreadContext context, IRubyObject[] args, String[] keys, GlobOptions options) {
         Ruby runtime = context.runtime;
 
+        // just clear callInfo for now; future PR will handle it appropriately
+        ThreadContext.resetCallInfo(context);
+
         if (args.length > 1) {
             IRubyObject tmp = TypeConverter.checkHashType(runtime, args[args.length - 1]);
             boolean processFlags = keys == BASE_FLAGS_KEYWORDS;