Remove TrufflePrimitive.privately

Author: pitr-ch

.rubocop.yml

@@ -8,7 +8,6 @@ AllCops:
     - 'lib/truffle/date/delta/parser.rb' # generated code
     - 'lib/truffle/socket/mri.rb' # taken from MRI
     - 'lib/truffle/ffi/**/*.rb' # taken from FFI gem
-    - 'lib/truffle/truffle/stubs.rb' # has embeded Java which confuses Rubocop
     - 'src/test/ruby/types.rb' # deliberately strange code for debugging purposes
     - 'src/tck/ruby/lexical-context.rb' # deliberately strange code for debugging purposes
 

lib/truffle/digest.rb

@@ -83,13 +83,11 @@ def reset
 
     def digest(message = NO_MESSAGE)
       if NO_MESSAGE == message
-        TrufflePrimitive.privately do
-          clone.finish
-        end
+        clone.__send__ :finish
       else
         reset
         update message
-        digested = TrufflePrimitive.privately { finish }
+        digested = finish
         reset
         digested
       end

lib/truffle/truffle/cext.rb

@@ -1257,9 +1257,7 @@ def rb_io_puts(out, args)
   end
 
   def rb_obj_call_init(obj, args)
-    TrufflePrimitive.privately do
-      obj.initialize(*args)
-    end
+    obj.__send__ :initialize, *args
   end
 
   def rb_obj_instance_eval(obj, args, block)
@@ -1363,15 +1361,11 @@ def rb_complex_polar(r, theta)
   end
 
   def rb_complex_set_real(complex, real)
-    TrufflePrimitive.privately do
-      complex.real = real
-    end
+    complex.__send__ :real=, real
   end
 
   def rb_complex_set_imag(complex, imag)
-    TrufflePrimitive.privately do
-      complex.imag = imag
-    end
+    complex.__send__ :imag=, imag
   end
 
   def rb_mutex_new

lib/truffle/truffle/stubs.rb

@@ -274,8 +274,6 @@ public class BodyTranslator extends Translator {
     private boolean translatingWhile = false;
     protected String currentCallMethodName = null;
 
-    private boolean privately = false;
-
     public BodyTranslator(
             Node currentNode,
             RubyContext context,
@@ -535,68 +533,16 @@ private RubyNode translateInvokePrimitive(SourceIndexLength sourceSection, CallP
 
         final String primitiveName = node.getName();
 
-        if ("privately".equals(primitiveName)) {
-            final RubyNode ret = translatePrivately(node);
-            return addNewlineIfNeeded(node, ret);
-        } else {
-            final PrimitiveNodeConstructor primitive = context.getPrimitiveManager().getPrimitive(primitiveName);
-
-            final ArrayParseNode args = (ArrayParseNode) node.getArgsNode();
-            final int size = args != null ? args.size() : 0;
-            final RubyNode[] arguments = new RubyNode[size];
-            for (int n = 0; n < size; n++) {
-                arguments[n] = args.get(n).accept(this);
-            }
-
-            return primitive.createInvokePrimitiveNode(context, source, sourceSection, arguments);
-        }
-    }
-
-    private RubyNode translatePrivately(CallParseNode node) {
-        /*
-         * Translates something that looks like
-         *
-         *   TrufflePrimitive.privately { foo }
-         *
-         * into just
-         *
-         *   foo
-         *
-         * While we translate foo we'll mark all call sites as ignoring visibility.
-         */
-
-        if (!(node.getIterNode() instanceof IterParseNode)) {
-            throw new UnsupportedOperationException("TrufflePrimitive.privately needs a literal block");
-        }
+        final PrimitiveNodeConstructor primitive = context.getPrimitiveManager().getPrimitive(primitiveName);
 
-        final ArrayParseNode argsNode = (ArrayParseNode) node.getArgsNode();
-        if (argsNode != null && argsNode.size() > 0) {
-            throw new UnsupportedOperationException("TrufflePrimitive.privately should not have any arguments");
+        final ArrayParseNode args = (ArrayParseNode) node.getArgsNode();
+        final int size = args != null ? args.size() : 0;
+        final RubyNode[] arguments = new RubyNode[size];
+        for (int n = 0; n < size; n++) {
+            arguments[n] = args.get(n).accept(this);
         }
 
-        /*
-         * Normally when you visit an 'iter' (block) node it will set the method name for you, so that we can name the
-         * block something like 'times-block'. Here we bypass the iter node and translate its child. So we set the
-         * name here.
-         */
-
-        currentCallMethodName = "privately";
-
-        /*
-         * While we translate the body of the iter we want to create all call nodes with the ignore-visibility flag.
-         * This flag is checked in visitCallNode.
-         */
-
-        final boolean previousPrivately = privately;
-        privately = true;
-
-        try {
-            return (((IterParseNode) node.getIterNode()).getBodyNode()).accept(this);
-        } finally {
-            // Restore the previous value of the privately flag - allowing for nesting
-
-            privately = previousPrivately;
-        }
+        return primitive.createInvokePrimitiveNode(context, source, sourceSection, arguments);
     }
 
     private RubyNode translateCallNode(CallParseNode node, boolean ignoreVisibility, boolean isVCall,
@@ -638,7 +584,7 @@ private RubyNode translateCallNode(CallParseNode node, boolean ignoreVisibility,
                 argumentsAndBlock.getBlock(),
                 argumentsAndBlock.getArguments(),
                 argumentsAndBlock.isSplatted(),
-                privately || ignoreVisibility,
+                ignoreVisibility,
                 isVCall,
                 node.isLazy(),
                 isAttrAssign);
@@ -2790,7 +2736,7 @@ public RubyNode visitBigRationalNode(BigRationalParseNode node) {
     }
 
     private RubyNode translateRationalComplex(SourceIndexLength sourceSection, String name, RubyNode a, RubyNode b) {
-        // Translate as TrufflePrimitive.privately { Rational.convert(a, b) }
+        // Translate as Rational.convert(a, b) # ignoring visibility
 
         final RubyNode moduleNode = new ObjectLiteralNode(context.getCoreLibrary().getObjectClass());
         ReadConstantNode receiver = new ReadConstantNode(moduleNode, name);
@@ -2891,9 +2837,7 @@ public RubyNode visitRescueNode(RescueParseNode node) {
         boolean canOmitBacktrace = false;
 
         if (context.getOptions().BACKTRACES_OMIT_UNUSED && rescueBody != null &&
-                rescueBody.getBodyNode() instanceof SideEffectFree
-                // allow `expression rescue $!` pattern
-                &&
+                rescueBody.getBodyNode() instanceof SideEffectFree /* allow `expression rescue $!` pattern */ &&
                 (!(rescueBody.getBodyNode() instanceof GlobalVarParseNode) ||
                         !((GlobalVarParseNode) rescueBody.getBodyNode()).getName().equals("$!")) &&
                 rescueBody.getOptRescueNode() == null) {
@@ -3137,6 +3081,7 @@ public RubyNode visitUntilNode(UntilParseNode node) {
 
     @Override
     public RubyNode visitVCallNode(VCallParseNode node) {
+        // TODO (pitr-ch 02-Dec-2019): replace with a primitive
         if (node.getName().equals("undefined") && inCore()) { // translate undefined
             final RubyNode ret = new ObjectLiteralNode(NotProvided.INSTANCE);
             ret.unsafeSetSourceSection(node.getPosition());

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -725,9 +725,7 @@ def permutation(num=undefined, &block)
       if block
         # offensive (both definitions) copy.
         offensive = dup
-        TrufflePrimitive.privately do
-          offensive.__permute__(num, perm, 0, used, &block)
-        end
+        offensive.__send__ :__permute__, num, perm, 0, used, &block
       else
         __permute__(num, perm, 0, used, &block)
       end
@@ -844,9 +842,7 @@ def repeated_combination(combination_size, &block)
     if combination_size < 0
       # yield nothing
     else
-      TrufflePrimitive.privately do
-        dup.compile_repeated_combinations(combination_size, [], 0, combination_size, &block)
-      end
+      dup.__send__ :compile_repeated_combinations, combination_size, [], 0, combination_size, &block
     end
 
     self
@@ -878,9 +874,7 @@ def repeated_permutation(combination_size, &block)
     elsif combination_size == 0
       yield []
     else
-      TrufflePrimitive.privately do
-        dup.compile_repeated_permutations(combination_size, [], 0, &block)
-      end
+      dup.__send__ :compile_repeated_permutations, combination_size, [], 0, &block
     end
 
     self
@@ -1105,7 +1099,7 @@ def sample_many(count, rng)
     result = Array.new(self)
 
     count.times do |c|
-      Truffle.privately { result.swap c, rng.rand(size) }
+      result.__send__ :swap, c, rng.rand(size)
     end
 
     count == size ? result : result[0, count]
@@ -1345,13 +1339,10 @@ def recursively_flatten(array, out, max_levels = -1)
   private def sort_fallback(&block)
     # Use this instead of #dup as we want an instance of Array
     sorted = Array.new(self)
-
-    TrufflePrimitive.privately do
-      if block
-        sorted.mergesort_block!(block)
-      else
-        sorted.mergesort!
-      end
+    if block
+      sorted.__send__ :mergesort_block!, block
+    else
+      sorted.__send__ :mergesort!
     end
     sorted
   end

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

@@ -50,9 +50,7 @@ def receive
     end
 
     def receive_timeout(duration)
-      TrufflePrimitive.privately do
-        @queue.receive_timeout(duration)
-      end
+      @queue.__send__ :receive_timeout, duration
     end
 
     def try_receive

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

@@ -87,16 +87,10 @@ def each(*args)
       new_args = @args.empty? ? args : (@args + args)
     end
 
-    TrufflePrimitive.privately do
-      enumerator.args = new_args
-    end
+    enumerator.__send__ :args=, new_args
 
     if block_given?
-      TrufflePrimitive.privately do
-        enumerator.each_with_block do |*yield_args|
-          yield(*yield_args)
-        end
-      end
+      enumerator.__send__(:each_with_block) { |*yield_args| yield(*yield_args) }
     else
       enumerator
     end
@@ -160,9 +154,7 @@ def next
     end
 
     exception = StopIteration.new 'iteration reached end'
-    TrufflePrimitive.privately do
-      exception.result = @generator.result
-    end
+    exception.__send__ :result=, @generator.result
 
     raise exception
   end
@@ -282,9 +274,7 @@ def to_enum(method_name=:each, *method_args, &block)
       size = block_given? ? block : nil
       ret = Lazy.allocate
 
-      TrufflePrimitive.privately do
-        ret.initialize_enumerator self, size, method_name, *method_args
-      end
+      ret.__send__ :initialize_enumerator, self, size, method_name, *method_args
 
       ret
     end

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

@@ -137,9 +137,7 @@ def exception(message=nil)
         # Exception#initialize (via __initialize__) is exactly what MRI
         # does.
         e = clone
-        TrufflePrimitive.privately do
-          e.__initialize__(message)
-        end
+        e.__send__ :__initialize__, message
         return e
       end
     end

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

@@ -35,9 +35,7 @@ def klass.__allocate__
       raise TypeError, "allocator undefined for #{self}"
     end
 
-    TrufflePrimitive.privately do
-      klass.singleton_class.undef_method(:new)
-    end
+    klass.singleton_class.__send__ :undef_method, :new
   end
 
   def singleton_methods(all=true)