Merge remote-tracking branch 'origin/master' into 10.1-dev

Author: headius

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

@@ -0,0 +1,40 @@
+name: JRuby 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:
+
+  rake-test:
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        java-version: ['21', '25']
+      fail-fast: false
+
+    name: windows verification (Java ${{ matrix.java-version }})
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+          cache: 'maven'
+      - name: bootstrap
+        run: mvn -ntp -Pbootstrap clean package
+      - name: bundle install
+        run: bin/jruby --dev -S bundle install
+      - name: jruby rails_runner
+        shell: cmd
+        run: |
+          set PATH=%CD%\bin;%PATH%
+          jruby tool/rails_runner

.gitignore

@@ -29,7 +29,6 @@ failures
 .debug.properties
 .redcar
 /.rbx/
-build
 build.properties
 build_graph.png
 core/src/main/java/org/jruby/runtime/Constants.java

bin/jruby.sh

@@ -671,6 +671,11 @@ for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
     fi
     jruby_jar="$j"
 done
+
+if [ -z "${jruby_jar-}" ]; then
+    echo "JRUBY_HOME at ${JRUBY_HOME} contains no lib/jruby.jar, exiting."
+    exit 1
+fi
 readonly jruby_jar
 
 if $cygwin; then

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

@@ -40,8 +40,10 @@
 import static org.jruby.runtime.Arity.checkArgumentCount;
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.ThreadContext.CALL_KEYWORD;
+import static org.jruby.runtime.ThreadContext.CALL_KEYWORD_EMPTY;
 import static org.jruby.runtime.ThreadContext.clearCallInfo;
 import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
 import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.runtime.invokedynamic.MethodNames.HASH;
 import static org.jruby.util.RubyStringBuilder.str;
@@ -309,7 +311,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             RubyHash init;
             int callInfo = resetCallInfo(context);
-            if (hasKeywords(callInfo)) {
+            if (hasNonemptyKeywords(callInfo)) {
                 if (!(hashOrElt instanceof RubyHash)) {
                     throw argumentError(context, 1, 0, 0);
                 }

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

@@ -329,7 +329,14 @@ private IRubyObject __each__(ThreadContext context, final Block block) {
         if (methodArgsHasKeywords) context.callInfo = CALL_KEYWORD;
         return object.callMethod(context, method, methodArgs,
                 CallBlock.newCallClosure(context, this, Signature.OPTIONAL, (ctx, args, blk) -> {
-                    IRubyObject ret = block.yieldValues(ctx, args);
+                    IRubyObject ret;
+
+                    if (args.length == 1) {
+                        ret = block.yield(ctx, args[0]);
+                    } else {
+                        ret = block.yieldValues(ctx, args);
+                    }
+
                     IRubyObject val = feedValue.use_value(ctx);
                     return val.isNil() ? ret : val;
                 })

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

@@ -271,34 +271,8 @@ public static IRubyObject induced_from(ThreadContext context, IRubyObject recv,
     @JRubyMethod(name = {"to_s", "inspect"})
     @Override
     public IRubyObject to_s(ThreadContext context) {
-        if (Double.isInfinite(value)) {
-            return newSharedString(context, value < 0 ? NEGATIVE_INFINITY_TO_S_BYTELIST : POSITIVE_INFINITY_TO_S_BYTELIST);
-        }
-        if (Double.isNaN(value)) return newSharedString(context, NAN_TO_S_BYTELIST);
-
-        ByteList buf = new ByteList();
-        // Under 1.9, use full-precision float formatting (JRUBY-4846).
-        // Double-precision can represent around 16 decimal digits;
-        // we use 20 to ensure full representation.
-        Sprintf.sprintf(buf, Locale.US, "%#.20g", this);
-        int e = buf.indexOf('e');
-        if (e == -1) e = buf.getRealSize();
-        ASCIIEncoding ascii = ASCIIEncoding.INSTANCE;
-
-        if (!ascii.isDigit(buf.get(e - 1))) {
-            buf.setRealSize(0);
-            Sprintf.sprintf(buf, Locale.US, "%#.14e", this);
-            e = buf.indexOf('e');
-            if (e == -1) e = buf.getRealSize();
-        }
-
-        int p = e;
-        while (buf.get(p - 1) == '0' && ascii.isDigit(buf.get(p - 2))) p--;
-        System.arraycopy(buf.getUnsafeBytes(), e, buf.getUnsafeBytes(), p, buf.getRealSize() - e);
-        buf.setRealSize(p + buf.getRealSize() - e);
-
-        buf.setEncoding(USASCIIEncoding.INSTANCE);
-
+        ByteList buf = new ByteList(24);
+        formatFloat(this, buf);
         return newString(context, buf);
     }
 
@@ -802,7 +776,7 @@ public IRubyObject rationalize(ThreadContext context, IRubyObject[] args) {
 
             RubyInteger two_times_f = (RubyInteger) rf.op_mul(context, 2);
             den = (RubyInteger) one.op_lshift(context, one.op_minus(context, n));
-            
+
             a = RubyRational.newRationalRaw(runtime, two_times_f.op_minus(context, 1), den);
             b = RubyRational.newRationalRaw(runtime, two_times_f.op_plus(context, 1), den);
         }
@@ -1141,6 +1115,47 @@ private ByteList marshalDump(ThreadContext context) {
         return byteList;
     }
 
+    public static ByteList formatFloat(RubyFloat self, ByteList buf) {
+      buf.setRealSize(0);
+
+      double value = self.value;
+
+      if (Double.isInfinite(value)) {
+          buf.append(value < 0
+              ? NEGATIVE_INFINITY_TO_S_BYTELIST
+              : POSITIVE_INFINITY_TO_S_BYTELIST);
+          buf.setEncoding(USASCIIEncoding.INSTANCE);
+          return buf;
+      }
+
+      if (Double.isNaN(value)) {
+          buf.append(NAN_TO_S_BYTELIST);
+          buf.setEncoding(USASCIIEncoding.INSTANCE);
+          return buf;
+      }
+
+      Sprintf.sprintf(buf, Locale.US, "%#.20g", self);
+
+      int e = buf.indexOf('e');
+      if (e == -1) e = buf.getRealSize();
+      ASCIIEncoding ascii = ASCIIEncoding.INSTANCE;
+
+      if (!ascii.isDigit(buf.get(e - 1))) {
+          buf.setRealSize(0);
+          Sprintf.sprintf(buf, Locale.US, "%#.14e", self);
+          e = buf.indexOf('e');
+          if (e == -1) e = buf.getRealSize();
+      }
+
+      int p = e;
+      while (buf.get(p - 1) == '0' && ascii.isDigit(buf.get(p - 2))) p--;
+      System.arraycopy(buf.getUnsafeBytes(), e, buf.getUnsafeBytes(), p, buf.getRealSize() - e);
+      buf.setRealSize(p + buf.getRealSize() - e);
+
+      buf.setEncoding(USASCIIEncoding.INSTANCE);
+      return buf;
+    }
+
     @Deprecated(since = "10.0.0.0", forRemoval = true)
     @SuppressWarnings("removal")
     public static void marshalTo(RubyFloat aFloat, org.jruby.runtime.marshal.MarshalStream output) throws java.io.IOException {

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

@@ -167,7 +167,7 @@ public static RubyHash createGlobalsAndENV(ThreadContext context, GlobalVariable
         Object.defineConstant(context, "RUBY_RELEASE_DATE", release);
         Object.defineConstant(context, "RUBY_PLATFORM", platform);
 
-        IRubyObject description = RubyString.newFString(runtime, OutputStrings.getVersionString());
+        IRubyObject description = RubyString.newFString(runtime, OutputStrings.getVersionString(instanceConfig));
         Object.defineConstant(context, "RUBY_DESCRIPTION", description);
 
         IRubyObject copyright = RubyString.newFString(runtime, OutputStrings.getCopyrightString());

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

@@ -2488,6 +2488,11 @@ public RubyHash dupFast(final ThreadContext context) {
         return dup;
     }
 
+    public RubyHash withRuby2Keywords(boolean ruby2Keywords) {
+        setRuby2KeywordHash(ruby2Keywords);
+        return this;
+    }
+
     public boolean hasDefaultProc() {
         return (hashFlags & PROCDEFAULT_HASH) != 0;
     }

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

@@ -1026,7 +1026,7 @@ String anonymousMetaNameWithIdentifier(ThreadContext context) {
         return metaClass.getRealClass().getName(context) + ":0x" + Integer.toHexString(System.identityHashCode(this));
     }
 
-    @JRubyMethod(name = "refine", reads = SCOPE)
+    @JRubyMethod(name = "refine", visibility = PRIVATE, reads = SCOPE)
     public IRubyObject refine(ThreadContext context, IRubyObject klass, Block block) {
         if (!block.isGiven()) throw argumentError(context, "no block given");
         if (block.isEscaped()) throw argumentError(context, "can't pass a Proc as a block to Module#refine");
@@ -1976,9 +1976,7 @@ public final void addMethodInternal(ThreadContext context, String name, DynamicM
             putMethod(context, name, method);
         }
 
-        synchronized (getRuntime().getHierarchyLock()) {
-            invalidateCacheDescendants(context);
-        }
+        invalidateMethodCache(context);
     }
 
     public void removeMethod(ThreadContext context, String id) {
@@ -2414,6 +2412,17 @@ public void invalidateCacheDescendants(ThreadContext context) {
         methodInvalidator.invalidateAll(invalidators);
     }
 
+    /**
+     * Invalidate the method cache of this class and all descendants under lock.
+     *
+     * @param context
+     */
+    public void invalidateMethodCache(ThreadContext context) {
+        synchronized (getRuntime().getHierarchyLock()) {
+            invalidateCacheDescendants(context);
+        }
+    }
+
     public static class InvalidatorList<T> extends ArrayList<T> implements RubyClass.BiConsumerIgnoresSecond<RubyClass> {
         public InvalidatorList(int size) {
             super(size);
@@ -6879,6 +6888,7 @@ public static IRubyObject import_methods(ThreadContext context, IRubyObject self
 
             for (IRubyObject _module : modules) {
                 RubyModule module = castAsModule(context, _module);
+                if (module.getClass() != RubyModule.class) throw typeError(context, "wrong argument type Class (expected Module)");
 
                 if (module.getSuperClass() != null) {
                     warn(context, module.getName(context) + " has ancestors, but Refinement#import_methods doesn't import their methods");
@@ -6906,6 +6916,7 @@ private static void refinementImportMethodsIter(ThreadContext context, RubyModul
             }
 
             DynamicMethod dup = entry.getValue().dup();
+            dup.setImplementationClass(selfModule);
 
             // maybe insufficient if we have already compiled assuming no refinements
             ((AbstractIRMethod) dup).getIRScope().setIsMaybeUsingRefinements();

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

@@ -71,6 +71,7 @@
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR;
 import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
 import static org.jruby.runtime.Visibility.PRIVATE;
 import static org.jruby.runtime.invokedynamic.MethodNames.HASH;
 import static org.jruby.RubyEnumerator.SizeFn;
@@ -531,7 +532,7 @@ public IRubyObject initialize(ThreadContext context) {
 
     @JRubyMethod(visibility = PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject arg0) {
-        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
+        boolean keywords = hasNonemptyKeywords(ThreadContext.resetCallInfo(context));
 
         if (keywords) {
             return setupStructValuesFromHash(context, (RubyHash) arg0);