[GR-40333] Fiber.current and Fiber#transfer are available without require 'fiber'

PullRequest: truffleruby/3667

Author: eregon

CHANGELOG.md

@@ -80,6 +80,7 @@ Compatibility:
 * Implement `UnboundMethod#original_name` (@paracycle, @nirvdrum).
 * Implement `Thread#native_thread_id` method (#2733, @horakivo).
 * Modify `Struct#{inspect,to_s}` to match MRI when the struct is nested inside of an anonymous class or module (@st0012, @nirvdrum).
+* `Fiber.current` and `Fiber#transfer` are available without `require 'fiber'` like in CRuby 3.1 (#2733, @eregon).
 
 Performance:
 

lib/truffle/fiber.rb

@@ -1,15 +1 @@
-# truffleruby_primitives: true
-
-# Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved. This
-# code is released under a tri EPL/GPL/LGPL license. You can use it,
-# redistribute it and/or modify it under the terms of the:
-#
-# Eclipse Public License version 2.0, or
-# GNU General Public License version 2, or
-# GNU Lesser General Public License version 2.1.
-
-class Fiber
-  def self.current
-    Primitive.fiber_current
-  end
-end
+# Provided by default

spec/ruby/core/kernel/require_spec.rb

@@ -16,6 +16,22 @@
     Kernel.should have_private_instance_method(:require)
   end
 
+  provided = %w[complex enumerator rational thread ruby2_keywords]
+  ruby_version_is "3.1" do
+    provided << "fiber"
+  end
+
+  it "#{provided.join(', ')} are already required" do
+    out = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems --disable-did-you-mean')
+    features = out.lines.map { |line| File.basename(line.chomp, '.*') }
+    features -= %w[encdb transdb] # Ignore CRuby internals
+    features.sort.should == provided.sort
+
+    code = provided.map { |f| "puts require #{f.inspect}\n" }.join
+    required = ruby_exe(code, options: '--disable-gems')
+    required.should == "false\n" * provided.size
+  end
+
   it_behaves_like :kernel_require_basic, :require, CodeLoadingSpecs::Method.new
   it_behaves_like :kernel_require, :require, CodeLoadingSpecs::Method.new
 end

spec/ruby/core/kernel/shared/require.rb

@@ -546,20 +546,6 @@
       ScratchPad.recorded.should == []
     end
 
-    provided = %w[complex enumerator rational thread]
-    provided << 'ruby2_keywords'
-
-    it "#{provided.join(', ')} are already required" do
-      features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
-      provided.each { |feature|
-        features.should =~ /\b#{feature}\.(rb|so|jar)$/
-      }
-
-      code = provided.map { |f| "puts require #{f.inspect}\n" }.join
-      required = ruby_exe(code, options: '--disable-gems')
-      required.should == "false\n" * provided.size
-    end
-
     it "unicode_normalize is part of core and not $LOADED_FEATURES" do
       features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
       features.lines.each { |feature|

spec/ruby/library/fiber/current_spec.rb

@@ -3,6 +3,12 @@
 require 'fiber'
 
 describe "Fiber.current" do
+  ruby_version_is "3.1" do
+    it "is available without an extra require" do
+      ruby_exe("print Fiber.current.class", options: '--disable-gems --disable-did-you-mean').should == "Fiber"
+    end
+  end
+
   it "returns the root Fiber when called outside of a Fiber" do
     root = Fiber.current
     root.should be_an_instance_of(Fiber)

spec/tags/core/kernel/require_tags.txt

@@ -6,3 +6,4 @@ fails:Kernel#require (non-extensioned path) loads a .rb extensioned file when a
 fails:Kernel#require (non-extensioned path) does not load a feature twice when $LOAD_PATH has been modified
 slow:Kernel#require ($LOADED_FEATURES) complex, enumerator, rational, thread, ruby2_keywords are already required
 slow:Kernel.require ($LOADED_FEATURES) complex, enumerator, rational, thread, ruby2_keywords are already required
+slow:Kernel#require complex, enumerator, rational, thread, ruby2_keywords, fiber are already required

spec/tags/library/fiber/current_tags.txt

@@ -0,0 +1 @@
+slow:Fiber.current is available without an extra require

src/main/java/org/truffleruby/core/fiber/FiberNodes.java

@@ -16,7 +16,6 @@
 import org.truffleruby.annotations.Primitive;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
-import org.truffleruby.builtins.PrimitiveNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.SingleValueCastNode;
 import org.truffleruby.core.cast.SingleValueCastNodeGen;
@@ -321,8 +320,8 @@ protected boolean alive(RubyFiber fiber) {
 
     }
 
-    @Primitive(name = "fiber_current")
-    public abstract static class CurrentNode extends PrimitiveNode {
+    @CoreMethod(names = "current", onSingleton = true)
+    public abstract static class CurrentNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected RubyFiber current() {

src/main/ruby/truffleruby/post-boot/post-boot.rb

@@ -14,6 +14,7 @@
   begin
     require 'enumerator'
     require 'thread'
+    require 'fiber'
     require 'rational'
     require 'complex'
   rescue LoadError => e