Replace undefined.equal?(obj) with TrufflePrimitive.undefined?(obj)

Author: pitr-ch

src/main/java/org/truffleruby/core/IsUndefinedNode.java

@@ -527,8 +527,8 @@ protected DynamicObject allocate(DynamicObject rubyClass) {
 
     }
 
-    @NodeChild(value = "value", type = RubyNode.class)
     @Primitive(name = "check_frozen")
+    @NodeChild(value = "value", type = RubyNode.class)
     public static abstract class CheckFrozenNode extends PrimitiveNode {
 
         public static CheckFrozenNode create() {
@@ -555,4 +555,15 @@ protected Object check(Object value,
         }
     }
 
+    @Primitive(name = "undefined?")
+    @NodeChild(value = "value", type = RubyNode.class)
+    public static abstract class IsUndefinedNode extends PrimitiveNode {
+
+        @Specialization
+        protected boolean isUndefined(Object value) {
+            return value == NotProvided.INSTANCE;
+        }
+    }
+
+
 }

src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java

@@ -27,7 +27,6 @@
 import org.truffleruby.builtins.PrimitiveNodeConstructor;
 import org.truffleruby.core.CoreLibrary;
 import org.truffleruby.core.IsNilNode;
-import org.truffleruby.core.IsUndefinedNode;
 import org.truffleruby.core.array.ArrayAppendOneNodeGen;
 import org.truffleruby.core.array.ArrayConcatNode;
 import org.truffleruby.core.array.ArrayDropTailNode;
@@ -512,16 +511,6 @@ public RubyNode visitCallNode(CallParseNode node) {
             return addNewlineIfNeeded(node, ret);
         }
 
-        if (receiver instanceof VCallParseNode // undefined.equal?(obj)
-                && ((VCallParseNode) receiver).getName().equals("undefined") && inCore() &&
-                methodName.equals("equal?")) {
-            RubyNode argument = translateArgumentsAndBlock(sourceSection, null, node.getArgsNode(), methodName)
-                    .getArguments()[0];
-            final RubyNode ret = new IsUndefinedNode(argument);
-            ret.unsafeSetSourceSection(sourceSection);
-            return addNewlineIfNeeded(node, ret);
-        }
-
         final RubyNode translated = translateCallNode(node, false, false, false);
 
         // TODO CS 23-Apr-19 I've tried to design logic so we never try to assign source sections twice but can't figure it out here

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

@@ -109,7 +109,7 @@ def <=>(other)
 
   def *(count)
     result = TrufflePrimitive.array_mul(self, count)
-    if !undefined.equal?(result)
+    if !TrufflePrimitive.undefined?(result)
       result
     elsif str = Truffle::Type.rb_check_convert_type(count, String, :to_str)
       join(str)
@@ -120,7 +120,7 @@ def *(count)
 
   def ==(other)
     result = TrufflePrimitive.array_equal self, other
-    unless undefined.equal?(result)
+    unless TrufflePrimitive.undefined?(result)
       return result
     end
 
@@ -146,7 +146,7 @@ def ==(other)
   end
 
   private def element_reference_fallback(start, length)
-    if undefined.equal?(length)
+    if TrufflePrimitive.undefined?(length)
       arg = start
       case arg
       when Range
@@ -181,7 +181,7 @@ def ==(other)
   end
 
   private def element_set_fallback(index, length, value)
-    if undefined.equal?(value)
+    if TrufflePrimitive.undefined?(value)
       value = length
       if Range === index
         index = TrufflePrimitive.range_to_int_range(index)
@@ -308,7 +308,7 @@ def combination(num)
 
   def count(item = undefined)
     seq = 0
-    if !undefined.equal?(item)
+    if !TrufflePrimitive.undefined?(item)
       each { |o| seq += 1 if item == o }
     elsif block_given?
       each { |o| seq += 1 if yield(o) }
@@ -378,7 +378,7 @@ def each_index
 
   def eql?(other)
     result = TrufflePrimitive.array_eql self, other
-    unless undefined.equal?(result)
+    unless TrufflePrimitive.undefined?(result)
       return result
     end
 
@@ -409,12 +409,12 @@ def fetch(idx, default=undefined)
 
     if idx < 0 or idx >= size
       if block_given?
-        warn 'block supersedes default value argument', uplevel: 1 unless undefined.equal?(default)
+        warn 'block supersedes default value argument', uplevel: 1 unless TrufflePrimitive.undefined?(default)
 
         return yield(orig)
       end
 
-      return default unless undefined.equal?(default)
+      return default unless TrufflePrimitive.undefined?(default)
 
       raise IndexError, "index #{idx} out of bounds"
     end
@@ -426,25 +426,25 @@ def fetch(idx, default=undefined)
     TrufflePrimitive.check_frozen self
 
     if block_given?
-      unless undefined.equal?(c)
+      unless TrufflePrimitive.undefined?(c)
         raise ArgumentError, 'wrong number of arguments'
       end
       one = a
       two = b
     else
-      if undefined.equal?(a)
+      if TrufflePrimitive.undefined?(a)
         raise ArgumentError, 'wrong number of arguments'
       end
       obj = a
       one = b
       two = c
     end
 
-    if undefined.equal?(one) || !one
+    if TrufflePrimitive.undefined?(one) || !one
       left = 0
       right = size
     elsif one.kind_of? Range
-      raise TypeError, 'length invalid with range' unless undefined.equal?(two)
+      raise TypeError, 'length invalid with range' unless TrufflePrimitive.undefined?(two)
 
       left = Truffle::Type.coerce_to_collection_length one.begin
       left += size if left < 0
@@ -460,7 +460,7 @@ def fetch(idx, default=undefined)
       left += size if left < 0
       left = 0 if left < 0
 
-      if !undefined.equal?(two) and two
+      if !TrufflePrimitive.undefined?(two) and two
         begin
           right = Truffle::Type.coerce_to_collection_length two
         rescue ArgumentError
@@ -497,7 +497,7 @@ def fetch(idx, default=undefined)
   end
 
   def first(n = undefined)
-    return at(0) if undefined.equal?(n)
+    return at(0) if TrufflePrimitive.undefined?(n)
 
     n = Truffle::Type.coerce_to_collection_index(n)
     raise ArgumentError, 'Size must be positive' if n < 0
@@ -681,7 +681,7 @@ def keep_if(&block)
   end
 
   def last(n=undefined)
-    if undefined.equal?(n)
+    if TrufflePrimitive.undefined?(n)
       return at(-1)
     elsif size < 1
       return []
@@ -703,7 +703,7 @@ def permutation(num=undefined, &block)
       end
     end
 
-    if undefined.equal? num
+    if TrufflePrimitive.undefined? num
       num = size
     else
       num = Truffle::Type.coerce_to_collection_index num
@@ -738,7 +738,7 @@ def permutation(num=undefined, &block)
 
   def permutation_size(num)
     n = self.size
-    if undefined.equal? num
+    if TrufflePrimitive.undefined? num
       k = self.size
     else
       k = Truffle::Type.coerce_to_collection_index num
@@ -938,7 +938,7 @@ def reverse_each
   end
 
   def rindex(obj=undefined)
-    if undefined.equal?(obj)
+    if TrufflePrimitive.undefined?(obj)
       return to_enum(:rindex, obj) unless block_given?
 
       i = size - 1
@@ -1000,9 +1000,9 @@ def rand(size)
   end
 
   def sample(count=undefined, options=undefined)
-    return at Kernel.rand(size) if undefined.equal? count
+    return at Kernel.rand(size) if TrufflePrimitive.undefined? count
 
-    if undefined.equal? options
+    if TrufflePrimitive.undefined? options
       if o = Truffle::Type.rb_check_convert_type(count, Hash, :to_hash)
         options = o
         count = nil
@@ -1133,7 +1133,7 @@ def shuffle!(options = undefined)
 
     random_generator = Kernel
 
-    unless undefined.equal? options
+    unless TrufflePrimitive.undefined? options
       options = Truffle::Type.coerce_to options, Hash, :to_hash
       random_generator = options[:random] if options[:random].respond_to?(:rand)
     end
@@ -1565,7 +1565,7 @@ def reverse!
   def slice!(start, length=undefined)
     TrufflePrimitive.check_frozen self
 
-    if undefined.equal? length
+    if TrufflePrimitive.undefined? length
       if start.kind_of? Range
         range = start
         out = self[range]

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

@@ -43,7 +43,7 @@ def self.convert(real, imag = undefined)
     if nil.equal?(real) || nil.equal?(imag)
       raise TypeError, 'cannot convert nil into Complex'
     end
-    imag = nil if undefined.equal?(imag)
+    imag = nil if TrufflePrimitive.undefined?(imag)
 
     if check_real?(real) && check_real?(imag)
       return new(real, imag)

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

@@ -43,7 +43,7 @@ class Dir
   def initialize(path, options=undefined)
     @path = Truffle::Type.coerce_to_path path
 
-    if undefined.equal? options
+    if TrufflePrimitive.undefined? options
       enc = nil
     else
       options = Truffle::Type.coerce_to options, Hash, :to_hash