Replace Truffle::Graal.always_split by Primitive.always_split

Author: eregon

lib/mri/monitor.rb

@@ -214,7 +214,7 @@ def mon_owned?
   def mon_synchronize(&block)
     Primitive.monitor_synchronize(@mon_mutex, block)
   end
-  Truffle::Graal.always_split instance_method(:mon_synchronize)
+  Primitive.always_split self, :mon_synchronize
   alias synchronize mon_synchronize
 
   #

lib/truffle/truffle/cext.rb

@@ -1193,7 +1193,7 @@ def rb_hash_foreach(hash, func, farg)
       end
     end
   end
-  Truffle::Graal.always_split instance_method(:rb_hash_foreach)
+  Primitive.always_split self, :rb_hash_foreach
 
   def rb_path_to_class(path)
     begin
@@ -1264,7 +1264,7 @@ def rb_protect(function, arg, write_status, status)
     Truffle::Interop.execute_without_conversion(write_status, status, pos)
     res
   end
-  Truffle::Graal.always_split instance_method(:rb_protect)
+  Primitive.always_split self, :rb_protect
 
   def rb_jump_tag(pos)
     if pos > 0
@@ -1279,12 +1279,12 @@ def rb_jump_tag(pos)
   def rb_yield(value)
     rb_block_proc.call(value)
   end
-  Truffle::Graal.always_split instance_method(:rb_yield)
+  Primitive.always_split self, :rb_yield
 
   def rb_yield_splat(values)
     rb_block_proc.call(*values)
   end
-  Truffle::Graal.always_split instance_method(:rb_yield_splat)
+  Primitive.always_split self, :rb_yield_splat
 
   def rb_ivar_lookup(object, name, default_value)
     # TODO CS 24-Jul-16 races - needs a new primitive or be defined in Java?
@@ -1649,7 +1649,7 @@ def rb_mutex_synchronize(mutex, func, arg)
       Primitive.interop_execute(POINTER_TO_POINTER_WRAPPER, [func, arg])
     end
   end
-  Truffle::Graal.always_split instance_method(:rb_mutex_synchronize)
+  Primitive.always_split self, :rb_mutex_synchronize
 
   def rb_gc_enable
     GC.enable
@@ -1879,7 +1879,7 @@ def rb_ensure(b_proc, data1, e_proc, data2)
       end
     end
   end
-  Truffle::Graal.always_split instance_method(:rb_ensure)
+  Primitive.always_split self, :rb_ensure
 
   def rb_rescue(b_proc, data1, r_proc, data2)
     begin
@@ -1898,7 +1898,7 @@ def rb_rescue(b_proc, data1, r_proc, data2)
       end
     end
   end
-  Truffle::Graal.always_split instance_method(:rb_rescue)
+  Primitive.always_split self, :rb_rescue
 
   def rb_rescue2(b_proc, data1, r_proc, data2, rescued)
     begin
@@ -1913,7 +1913,7 @@ def rb_rescue2(b_proc, data1, r_proc, data2, rescued)
       end
     end
   end
-  Truffle::Graal.always_split instance_method(:rb_rescue2)
+  Primitive.always_split self, :rb_rescue2
 
   def rb_exec_recursive(func, obj, arg)
     result = nil
@@ -1932,7 +1932,7 @@ def rb_exec_recursive(func, obj, arg)
       result
     end
   end
-  Truffle::Graal.always_split instance_method(:rb_exec_recursive)
+  Primitive.always_split self, :rb_exec_recursive
 
   def rb_catch_obj(tag, func, data)
     use_cext_lock = Primitive.use_cext_lock?

src/main/java/org/truffleruby/extra/TruffleGraalNodes.java

@@ -20,9 +20,12 @@
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.builtins.PrimitiveNode;
 import org.truffleruby.core.cast.ToCallTargetNode;
+import org.truffleruby.core.module.ModuleOperations;
+import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.core.proc.ProcCallTargets;
 import org.truffleruby.core.proc.ProcType;
 import org.truffleruby.core.proc.RubyProc;
+import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.interop.ToJavaStringNode;
 import org.truffleruby.language.RubyLambdaRootNode;
 import org.truffleruby.language.RubyNode;
@@ -51,17 +54,23 @@
 @CoreModule("Truffle::Graal")
 public abstract class TruffleGraalNodes {
 
-    @CoreMethod(names = "always_split", onSingleton = true, required = 1)
-    public abstract static class AlwaysSplitNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "always_split")
+    public abstract static class AlwaysSplitNode extends PrimitiveArrayArgumentsNode {
         @TruffleBoundary
         @Specialization
-        Object alwaysSplit(Object executable,
-                @Cached ToCallTargetNode toCallTargetNode) {
-            final RootCallTarget callTarget = toCallTargetNode.execute(this, executable);
+        Object alwaysSplit(RubyModule module, RubySymbol instanceMethod) {
+            String name = instanceMethod.getString();
+            var method = ModuleOperations.lookupMethodUncached(module, name, null);
+
+            if (method == null || method.isUndefined()) {
+                throw new RaiseException(getContext(), coreExceptions().nameErrorUndefinedMethod(name, module, this));
+            }
+
+            final RootCallTarget callTarget = method.getCallTarget();
             if (getContext().getOptions().ALWAYS_SPLIT_HONOR) {
                 RubyRootNode.of(callTarget).setSplit(Split.ALWAYS);
             }
-            return executable;
+            return nil;
         }
     }
 

src/main/ruby/truffleruby/core/array.rb

@@ -567,7 +567,7 @@ def hash
 
     hash_val
   end
-  Truffle::Graal.always_split instance_method(:hash)
+  Primitive.always_split self, :hash
 
   def find_index(obj = undefined)
     super
@@ -591,7 +591,7 @@ def insert(idx, *items)
     end
     self
   end
-  Truffle::Graal.always_split instance_method(:insert)
+  Primitive.always_split self, :insert
 
   def inspect
     return '[]'.encode(Encoding::US_ASCII) if empty?
@@ -727,7 +727,7 @@ def pack(format, buffer: nil)
       buffer.replace string.force_encoding(buffer.encoding)
     end
   end
-  Truffle::Graal.always_split instance_method(:pack)
+  Primitive.always_split self, :pack
 
   def permutation(num = undefined, &block)
     unless block_given?

src/main/ruby/truffleruby/core/binding.rb

@@ -16,7 +16,7 @@ def eval(code, file = nil, line = nil)
   def local_variables
     Primitive.local_variable_names(self).dup
   end
-  Truffle::Graal.always_split(instance_method(:local_variables))
+  Primitive.always_split self, :local_variables
 
   def irb
     require 'irb'

src/main/ruby/truffleruby/core/configuration.rb

@@ -31,7 +31,7 @@ class Configuration
     def section(section, &block)
       Primitive.vm_get_config_section section, block
     end
-    Truffle::Graal.always_split instance_method(:section)
+    Primitive.always_split self, :section
 
     def lookup(name)
       Primitive.vm_get_config_item name

src/main/ruby/truffleruby/core/enumerable.rb

@@ -111,7 +111,7 @@ def map(&block)
       to_enum(:collect) { enumerator_size }
     end
   end
-  Truffle::Graal.always_split instance_method(:map)
+  Primitive.always_split self, :map
   alias_method :collect, :map
 
   def compact
@@ -385,7 +385,7 @@ def each_with_index(*args, &block)
       self
     end
   end
-  Truffle::Graal.always_split instance_method(:each_with_index)
+  Primitive.always_split self, :each_with_index
 
   def grep(pattern, &block)
     ary = []
@@ -561,7 +561,7 @@ def inject(initial = undefined, sym = undefined, &block)
 
     Primitive.undefined?(initial) ? nil : initial
   end
-  Truffle::Graal.always_split instance_method(:inject)
+  Primitive.always_split self, :inject
   alias_method :reduce, :inject
 
   def all?(pattern = undefined)

src/main/ruby/truffleruby/core/integer.rb

@@ -55,7 +55,7 @@ def **(o)
 
     redo_coerced :**, o
   end
-  Truffle::Graal.always_split instance_method(:**)
+  Primitive.always_split self, :**
 
   def [](index, len = undefined)
     if Primitive.is_a?(index, Range)
@@ -147,7 +147,7 @@ def pow(exponent, modulus = undefined)
       Primitive.mod_pow(self, exponent, modulus)
     end
   end
-  Truffle::Graal.always_split instance_method(:pow)
+  Primitive.always_split self, :pow
 
   def times
     return to_enum(:times) { self } unless block_given?
@@ -159,7 +159,7 @@ def times
     end
     self
   end
-  Truffle::Graal.always_split instance_method(:times)
+  Primitive.always_split self, :times
 
   def truncate(precision = 0)
     if precision >= 0
@@ -363,7 +363,7 @@ def self.sqrt(n)
     end
     self
   end
-  Truffle::Graal.always_split instance_method(:upto_internal)
+  Primitive.always_split self, :upto_internal
 
   private def downto_internal(val)
     return to_enum(:downto, val) { self >= val ? self - val + 1 : 0 } unless block_given?
@@ -375,7 +375,7 @@ def self.sqrt(n)
     end
     self
   end
-  Truffle::Graal.always_split instance_method(:downto_internal)
+  Primitive.always_split self, :downto_internal
 
   class << self
     undef_method :new

src/main/ruby/truffleruby/core/io.rb

@@ -1687,7 +1687,7 @@ def printf(fmt, *args)
     fmt = StringValue(fmt)
     write sprintf(fmt, *args)
   end
-  Truffle::Graal.always_split(instance_method(:printf))
+  Primitive.always_split self, :printf
 
   def pwrite(object, offset)
     string = Truffle::Type.rb_obj_as_string(object)
@@ -2461,7 +2461,7 @@ def print(*args)
   def printf(fmt, *args)
     @write.printf(fmt, *args)
   end
-  Truffle::Graal.always_split(instance_method(:printf))
+  Primitive.always_split self, :printf
 
   def putc(obj)
     @write.putc(obj)

src/main/ruby/truffleruby/core/kernel.rb

@@ -745,8 +745,8 @@ def printf(*args)
     nil
   end
   module_function :printf
-  Truffle::Graal.always_split(instance_method(:printf))
-  Truffle::Graal.always_split(method(:printf))
+  Primitive.always_split self, :printf
+  Primitive.always_split singleton_class, :printf
 
   private def pp(*args)
     require 'pp'
@@ -803,8 +803,8 @@ def clone(freeze: nil)
 
     Primitive.kernel_clone self, freeze
   end
-  Truffle::Graal.always_split instance_method(:clone)
-  Truffle::Graal.always_split method(:clone)
+  Primitive.always_split self, :clone
+  Primitive.always_split singleton_class, :clone
 
   def initialize_clone(from, freeze: nil)
     initialize_copy(from)