[GR-18163] Fixes to pass the ruby2_keywords gem tests.

eregon · eregon · commit 6b960e706884 · 2021-02-10T13:40:20.000Z
PullRequest: truffleruby/2403
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,6 +62,7 @@ Performance:
 Changes:
 
 * Standalone builds of TruffleRuby are now based on JDK11 (they used JDK8 previously). There should be no user-visible changes. Similarly, JDK11 is now used by default in development instead of JDK8.
+* The deprecated `Truffle::System.synchronized` has been removed.
 
 # 21.0.0
 
diff --git a/doc/contributor/third-party-assumptions.md b/doc/contributor/third-party-assumptions.md
@@ -10,8 +10,7 @@ so that we know why non-standard APIs have been added.
 
 * `concurrent-ruby` < 1.1.0 used `Truffle::System.full_memory_barrier`,
   `Truffle::Primitive.logical_processors`,  `Truffle::AtomicReference`, and
-  `Truffle::System.synchronized`. `Truffle::Primitive.logical_processors`, `Truffle::System.full_memory_barrier`, and
-   `Truffle::AtomicReference` have been removed.
+  `Truffle::System.synchronized`. All of these have been removed.
   
 * `concurrent-ruby` >= 1.1.0 uses `TruffleRuby.full_memory_barrier`,
   `TruffleRuby.synchronized`, and `TruffleRuby::AtomicReference`, 
diff --git a/lib/truffle/objspace.rb b/lib/truffle/objspace.rb
@@ -195,7 +195,7 @@ def trace_object_allocations
   module_function :trace_object_allocations
 
   def trace_object_allocations_clear
-    Truffle::System.synchronized(ALLOCATIONS) do
+    TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS.clear
     end
   end
@@ -217,7 +217,7 @@ def trace_object_allocations_stop
   module_function :trace_object_allocations_stop
 
   def allocation_class_path(object)
-    allocation = Truffle::System.synchronized(ALLOCATIONS) do
+    allocation = TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS[object]
     end
     return nil if allocation.nil?
@@ -226,7 +226,7 @@ def allocation_class_path(object)
   module_function :allocation_class_path
 
   def allocation_generation(object)
-    allocation = Truffle::System.synchronized(ALLOCATIONS) do
+    allocation = TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS[object]
     end
     return nil if allocation.nil?
@@ -235,7 +235,7 @@ def allocation_generation(object)
   module_function :allocation_generation
 
   def allocation_method_id(object)
-    allocation = Truffle::System.synchronized(ALLOCATIONS) do
+    allocation = TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS[object]
     end
     return nil if allocation.nil?
@@ -248,7 +248,7 @@ def allocation_method_id(object)
   module_function :allocation_method_id
 
   def allocation_sourcefile(object)
-    allocation = Truffle::System.synchronized(ALLOCATIONS) do
+    allocation = TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS[object]
     end
     return nil if allocation.nil?
@@ -257,7 +257,7 @@ def allocation_sourcefile(object)
   module_function :allocation_sourcefile
 
   def allocation_sourceline(object)
-    allocation = Truffle::System.synchronized(ALLOCATIONS) do
+    allocation = TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS[object]
     end
     return nil if allocation.nil?
@@ -271,7 +271,7 @@ def allocation_sourceline(object)
 
   def trace_allocation(object, class_path, method_id, sourcefile, sourceline, generation)
     allocation = Allocation.new(class_path, method_id, sourcefile, sourceline, generation)
-    Truffle::System.synchronized(ALLOCATIONS) do
+    TruffleRuby.synchronized(ALLOCATIONS) do
       ALLOCATIONS[object] = allocation
     end
   end
diff --git a/lib/truffle/timeout.rb b/lib/truffle/timeout.rb
@@ -123,7 +123,7 @@ def self.watch_channel
   end
 
   def self.ensure_timeout_thread_running
-    Truffle::System.synchronized(self) do
+    TruffleRuby.synchronized(self) do
       @controller ||= Thread.new { watch_channel }
     end
   end
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
@@ -546,8 +546,12 @@
       ScratchPad.recorded.should == []
     end
 
-    it "complex, enumerator, rational and thread are already required" do
-      provided = %w[complex enumerator rational thread]
+    provided = %w[complex enumerator rational thread]
+    ruby_version_is "2.7" do
+      provided << 'ruby2_keywords'
+    end
+
+    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)$/
diff --git a/spec/ruby/core/main/ruby2_keywords_spec.rb b/spec/ruby/core/main/ruby2_keywords_spec.rb
@@ -0,0 +1,11 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+ruby_version_is "2.7" do
+  describe "main.ruby2_keywords" do
+    it "is the same as Object.ruby2_keywords" do
+      main = TOPLEVEL_BINDING.receiver
+      main.should have_private_method(:ruby2_keywords)
+    end
+  end
+end
diff --git a/spec/tags/core/kernel/require_tags.txt b/spec/tags/core/kernel/require_tags.txt
@@ -6,3 +6,5 @@ slow:Kernel#require ($LOADED_FEATURES) unicode_normalize is part of core and not
 slow:Kernel.require ($LOADED_FEATURES) unicode_normalize is part of core and not $LOADED_FEATURES
 fails:Kernel#require (non-extensioned path) loads a .rb extensioned file when a C-extension file exists on an earlier load path
 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
diff --git a/src/main/java/org/truffleruby/core/TruffleSystemNodes.java b/src/main/java/org/truffleruby/core/TruffleSystemNodes.java
@@ -54,15 +54,12 @@
 import org.truffleruby.builtins.CoreModule;
 import org.truffleruby.builtins.Primitive;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
-import org.truffleruby.builtins.YieldingCoreMethodNode;
 import org.truffleruby.core.array.RubyArray;
-import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.rope.CodeRange;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.interop.FromJavaStringNode;
-import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.platform.Platform;
@@ -207,18 +204,6 @@ protected RubyString hostOS() {
 
     }
 
-    @CoreMethod(names = "synchronized", onSingleton = true, required = 1, needsBlock = true)
-    public abstract static class SynchronizedPrimitiveNode extends YieldingCoreMethodNode {
-
-        // We must not allow to synchronize on boxed primitives.
-        @Specialization
-        protected Object synchronize(RubyDynamicObject object, RubyProc block) {
-            synchronized (object) {
-                return yield(block);
-            }
-        }
-    }
-
     @CoreMethod(names = "log", onSingleton = true, required = 2)
     public abstract static class LogNode extends CoreMethodArrayArgumentsNode {
 
diff --git a/src/main/java/org/truffleruby/extra/TruffleRubyNodes.java b/src/main/java/org/truffleruby/extra/TruffleRubyNodes.java
@@ -17,6 +17,8 @@
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
 import org.truffleruby.builtins.CoreModule;
+import org.truffleruby.builtins.YieldingCoreMethodNode;
+import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.rope.CodeRange;
 import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.extra.ffi.Pointer;
@@ -25,6 +27,7 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.dsl.Specialization;
+import org.truffleruby.language.RubyDynamicObject;
 
 @CoreModule("TruffleRuby")
 public abstract class TruffleRubyNodes {
@@ -98,4 +101,17 @@ protected Object fullMemoryBarrier() {
 
     }
 
+    @CoreMethod(names = "synchronized", onSingleton = true, required = 1, needsBlock = true)
+    public abstract static class SynchronizedNode extends YieldingCoreMethodNode {
+
+        // We must not allow to synchronize on boxed primitives.
+        @Specialization
+        protected Object synchronize(RubyDynamicObject object, RubyProc block) {
+            synchronized (object) {
+                return yield(block);
+            }
+        }
+
+    }
+
 }
diff --git a/src/main/ruby/truffleruby/core/io.rb b/src/main/ruby/truffleruby/core/io.rb
@@ -165,7 +165,7 @@ def fill(io, max = DEFAULT_READ_SIZE)
     #
     # Returns the number of bytes in the buffer.
     def fill_from(io, skip = nil, max = DEFAULT_READ_SIZE)
-      Truffle::System.synchronized(self) do
+      TruffleRuby.synchronized(self) do
         discard skip if skip
 
         if empty?
@@ -200,7 +200,7 @@ def find(pattern, discard = nil)
     end
 
     def unseek!(io)
-      Truffle::System.synchronized(self) do
+      TruffleRuby.synchronized(self) do
         unless empty?
           amount = @start - @used
           r = Truffle::POSIX.lseek(io.fileno, amount, IO::SEEK_CUR)
@@ -213,7 +213,7 @@ def unseek!(io)
     # Returns +count+ bytes from the +start+ of the buffer as a new String.
     # If +count+ is +nil+, returns all available bytes in the buffer.
     def shift(count=nil, encoding=Encoding::ASCII_8BIT)
-      Truffle::System.synchronized(self) do
+      TruffleRuby.synchronized(self) do
         total = size
         total = count if count and count < total
 
@@ -250,7 +250,7 @@ def read_to_char_boundary(io, str)
     def getbyte(io)
       return if size == 0 and fill_from(io) == 0
 
-      Truffle::System.synchronized(self) do
+      TruffleRuby.synchronized(self) do
         byte = @storage[@start]
         @start += 1
         byte
@@ -261,7 +261,7 @@ def getbyte(io)
     def getchar(io)
       return if size == 0 and fill_from(io) == 0
 
-      Truffle::System.synchronized(self) do
+      TruffleRuby.synchronized(self) do
         char = +''
         while size > 0
           char.force_encoding Encoding::ASCII_8BIT
diff --git a/src/main/ruby/truffleruby/core/main.rb b/src/main/ruby/truffleruby/core/main.rb
@@ -44,6 +44,10 @@ def define_method(*args, &block)
     Object.define_method(*args, &block)
   end
 
+  private def ruby2_keywords(*methods)
+    Object.__send__(:ruby2_keywords, *methods)
+  end
+
   def to_s
     'main'
   end
diff --git a/src/main/ruby/truffleruby/core/posix.rb b/src/main/ruby/truffleruby/core/posix.rb
@@ -27,7 +27,7 @@ def resolve
         raise 'loading library while pre-initializing' if Truffle::Boot.preinitializing?
         raise SecurityError, 'native access is not allowed' unless NATIVE
 
-        Truffle::System.synchronized(self) do
+        TruffleRuby.synchronized(self) do
           @resolved ||= @block.call
         end
       end
diff --git a/src/main/ruby/truffleruby/core/thread.rb b/src/main/ruby/truffleruby/core/thread.rb
@@ -135,7 +135,7 @@ def initialize(*args, &block)
   end
 
   def freeze
-    Truffle::System.synchronized(self) { Primitive.thread_local_variables(self).freeze }
+    TruffleRuby.synchronized(self) { Primitive.thread_local_variables(self).freeze }
     super
   end
 
@@ -231,7 +231,7 @@ def fetch(name, default = undefined)
     warn 'block supersedes default value argument' if !Primitive.undefined?(default) && block_given?
 
     key = convert_to_local_name(name)
-    Truffle::System.synchronized(self) do
+    TruffleRuby.synchronized(self) do
       locals = Primitive.thread_get_fiber_locals self
       if Primitive.object_ivar_defined? locals, key
         return Primitive.object_ivar_get locals, key
@@ -248,15 +248,15 @@ def fetch(name, default = undefined)
 
   def [](name)
     var = convert_to_local_name(name)
-    Truffle::System.synchronized(self) do
+    TruffleRuby.synchronized(self) do
       locals = Primitive.thread_get_fiber_locals self
       Primitive.object_ivar_get locals, var
     end
   end
 
   def []=(name, value)
     var = convert_to_local_name(name)
-    Truffle::System.synchronized(self) do
+    TruffleRuby.synchronized(self) do
       Primitive.check_frozen self
       locals = Primitive.thread_get_fiber_locals self
       Primitive.object_ivar_set locals, var, value
@@ -265,14 +265,14 @@ def []=(name, value)
 
   def key?(name)
     var = convert_to_local_name(name)
-    Truffle::System.synchronized(self) do
+    TruffleRuby.synchronized(self) do
       locals = Primitive.thread_get_fiber_locals self
       Primitive.object_ivar_defined? locals, var
     end
   end
 
   def keys
-    Truffle::System.synchronized(self) do
+    TruffleRuby.synchronized(self) do
       locals = Primitive.thread_get_fiber_locals self
       locals.instance_variables
     end
@@ -282,21 +282,21 @@ def keys
 
   def thread_variable_get(name)
     var = convert_to_local_name(name)
-    Truffle::System.synchronized(self) { Primitive.thread_local_variables(self)[var] }
+    TruffleRuby.synchronized(self) { Primitive.thread_local_variables(self)[var] }
   end
 
   def thread_variable_set(name, value)
     var = convert_to_local_name(name)
-    Truffle::System.synchronized(self) { Primitive.thread_local_variables(self)[var] = value }
+    TruffleRuby.synchronized(self) { Primitive.thread_local_variables(self)[var] = value }
   end
 
   def thread_variable?(name)
     var = convert_to_local_name(name)
-    Truffle::System.synchronized(self) { Primitive.thread_local_variables(self).key? var }
+    TruffleRuby.synchronized(self) { Primitive.thread_local_variables(self).key? var }
   end
 
   def thread_variables
-    Truffle::System.synchronized(self) { Primitive.thread_local_variables(self).keys }
+    TruffleRuby.synchronized(self) { Primitive.thread_local_variables(self).keys }
   end
 
   def backtrace(omit = 0, length = undefined)
diff --git a/src/main/ruby/truffleruby/core/truffle/backward.rb b/src/main/ruby/truffleruby/core/truffle/backward.rb
@@ -9,7 +9,6 @@
 # GNU Lesser General Public License version 2.1.
 
 module TruffleRuby
-
   def self.sulong?
     warn 'TruffleRuby.sulong? has been replaced by TruffleRuby.cexts? and will be removed at a future release', uplevel: 1
     cexts?
@@ -19,5 +18,4 @@ def self.graal?
     warn 'TruffleRuby.graal? has been replaced by TruffleRuby.jit? and will be removed at a future release', uplevel: 1
     jit?
   end
-
 end
diff --git a/src/main/ruby/truffleruby/core/truffle/kernel_operations.rb b/src/main/ruby/truffleruby/core/truffle/kernel_operations.rb
@@ -34,6 +34,9 @@ def self.define_read_only_global(name, getter)
     LOAD_PATH = Truffle::SynchronizedArray.new
     LOADED_FEATURES = Truffle::SynchronizedArray.new
 
+    # Always provided features: ruby --disable-gems -e 'puts $"'
+    LOADED_FEATURES << 'ruby2_keywords.rb'
+
     define_read_only_global(:$LOAD_PATH, -> { LOAD_PATH })
     define_read_only_global(:$LOADED_FEATURES, -> { LOADED_FEATURES })
 
diff --git a/src/main/ruby/truffleruby/core/truffle/polyglot.rb b/src/main/ruby/truffleruby/core/truffle/polyglot.rb
@@ -59,7 +59,7 @@ def self.import(name)
   end
 
   def self.synchronized(object)
-    Truffle::System.synchronized(object) do
+    TruffleRuby.synchronized(object) do
       yield
     end
   end
diff --git a/src/main/ruby/truffleruby/core/truffle/truffleruby.rb b/src/main/ruby/truffleruby/core/truffle/truffleruby.rb
@@ -14,12 +14,6 @@ def self.revision
     ::RUBY_REVISION
   end
 
-  def self.synchronized(object)
-    Truffle::System.synchronized(object) do
-      yield
-    end
-  end
-
   class AtomicReference
 
     def compare_and_set(expected_value, new_value)
diff --git a/src/main/ruby/truffleruby/post-boot/post-boot.rb b/src/main/ruby/truffleruby/post-boot/post-boot.rb
@@ -46,6 +46,8 @@
         if path.start_with?(old_home)
           path.replace Truffle::Ropes.flatten_rope(path[old_home.size..-1])
           paths_starting_with_home << path
+        elsif !path.include?('/')
+          # relative path for always provided features like 'ruby2_keywords.rb'
         else
           raise "Path #{path.inspect} in $LOAD_PATH or $LOADED_FEATURES was expected to start with #{old_home}"
         end
