Merge branch 'master' into rwstauner/yjit-exit-splat-proc-rest

Author: XrXr

.github/actions/setup/directories/action.yml

@@ -100,7 +100,7 @@ runs:
         path: ${{ inputs.srcdir }}
         fetch-depth: ${{ inputs.fetch-depth }}
 
-    - uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
+    - uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       with:
         path: ${{ inputs.srcdir }}/.downloaded-cache
         key: ${{ runner.os }}-${{ runner.arch }}-downloaded-cache

lib/bundler/cli.rb

@@ -104,7 +104,7 @@ def cli_help
       primary_commands = ["install", "update", "cache", "exec", "config", "help"]
 
       list = self.class.printable_commands(true)
-      by_name = list.group_by {|name, _message| name.match(/^bundle (\w+)/)[1] }
+      by_name = list.group_by {|name, _message| name.match(/^bundler? (\w+)/)[1] }
       utilities = by_name.keys.sort - primary_commands
       primary_commands.map! {|name| (by_name[name] || raise("no primary command #{name}")).first }
       utilities.map! {|name| by_name[name].first }

set.c

@@ -1988,13 +1988,6 @@ rb_set_size(VALUE set)
 /*
  *  Document-class: Set
  *
- * Copyright (c) 2002-2024 Akinori MUSHA <[email protected]>
- *
- * Documentation by Akinori MUSHA and Gavin Sinclair.
- *
- * All rights reserved.  You can redistribute and/or modify it under the same
- * terms as Ruby.
- *
  * The Set class implements a collection of unordered values with no
  * duplicates. It is a hybrid of Array's intuitive inter-operation
  * facilities and Hash's fast lookup.

spec/bundler/bundler/cli_spec.rb

@@ -282,4 +282,15 @@ def out_with_macos_man_workaround
     bundler "--version"
     expect(out).to eq("#{Bundler::VERSION} (simulating Bundler 5)")
   end
+
+  it "shows cli_help when bundler install and no Gemfile is found" do
+    bundler "install", raise_on_error: false
+    expect(err).to include("Could not locate Gemfile")
+
+    expect(out).to include("Bundler version #{Bundler::VERSION}").
+      and include("\n\nBundler commands:\n\n").
+      and include("\n\n  Primary commands:\n").
+      and include("\n\n  Utilities:\n").
+      and include("\n\nOptions:\n")
+  end
 end

zjit/src/hir.rs

@@ -1297,9 +1297,11 @@ impl<'a> std::fmt::Display for InsnPrinter<'a> {
                 Ok(())
             }
             Insn::InvokeBuiltin { bf, args, leaf, .. } => {
+                let bf_name = unsafe { CStr::from_ptr(bf.name) }.to_str().unwrap();
                 write!(f, "InvokeBuiltin{} {}",
                            if *leaf { " leaf" } else { "" },
-                           unsafe { CStr::from_ptr(bf.name) }.to_str().unwrap())?;
+                           // e.g. Code that use `Primitive.cexpr!`. From BUILTIN_INLINE_PREFIX.
+                           if bf_name.starts_with("_bi") { "<inline_expr>" } else { bf_name })?;
                 for arg in args {
                     write!(f, ", {arg}")?;
                 }

zjit/src/hir/opt_tests.rs

@@ -2588,7 +2588,7 @@ mod hir_opt_tests {
           v13:Fixnum[1] = Const Value(1)
           PatchPoint MethodRedefined(Integer@0x1000, zero?@0x1008, cme:0x1010)
           IncrCounter inline_iseq_optimized_send_count
-          v23:BasicObject = InvokeBuiltin leaf _bi285, v13
+          v23:BasicObject = InvokeBuiltin leaf <inline_expr>, v13
           CheckInterrupts
           Return v23
         ");
@@ -2620,7 +2620,7 @@ mod hir_opt_tests {
           PatchPoint MethodRedefined(Array@0x1008, first@0x1010, cme:0x1018)
           PatchPoint NoSingletonClass(Array@0x1008)
           IncrCounter inline_iseq_optimized_send_count
-          v31:BasicObject = InvokeBuiltin leaf _bi132, v17
+          v31:BasicObject = InvokeBuiltin leaf <inline_expr>, v17
           CheckInterrupts
           Return v31
         ");

zjit/src/hir/tests.rs

@@ -3026,7 +3026,7 @@ pub mod hir_build_tests {
           EntryPoint JIT(0)
           Jump bb2(v4)
         bb2(v6:BasicObject):
-          v10:HeapObject = InvokeBuiltin leaf _bi20, v6
+          v10:HeapObject = InvokeBuiltin leaf <inline_expr>, v6
           Jump bb3(v6, v10)
         bb3(v12:BasicObject, v13:HeapObject):
           CheckInterrupts
@@ -3140,7 +3140,7 @@ pub mod hir_build_tests {
           EntryPoint JIT(0)
           Jump bb2(v4)
         bb2(v6:BasicObject):
-          v10:StringExact = InvokeBuiltin leaf _bi28, v6
+          v10:StringExact = InvokeBuiltin leaf <inline_expr>, v6
           Jump bb3(v6, v10)
         bb3(v12:BasicObject, v13:StringExact):
           CheckInterrupts
@@ -3162,7 +3162,7 @@ pub mod hir_build_tests {
           EntryPoint JIT(0)
           Jump bb2(v4)
         bb2(v6:BasicObject):
-          v10:StringExact = InvokeBuiltin leaf _bi12, v6
+          v10:StringExact = InvokeBuiltin leaf <inline_expr>, v6
           Jump bb3(v6, v10)
         bb3(v12:BasicObject, v13:StringExact):
           CheckInterrupts