[GR-20446] Kernel#Pathname returns argument when it is a Pathname

PullRequest: truffleruby/2205

Author: bjfish

lib/truffle/pathname.rb

@@ -1,3 +1,4 @@
+# truffleruby_primitives: true
 #
 # = pathname.rb
 #
@@ -1068,6 +1069,7 @@ module Kernel
   #
   # This method is available since 1.8.5.
   def Pathname(path) # :doc:
+    return path if Primitive.class_of(path) == Pathname
     Pathname.new(path)
   end
   private :Pathname # Truffle: private as in MRI

lib/truffle/truffle/cext.rb

@@ -386,6 +386,10 @@ def rb_obj_classname(object)
     object.class.name
   end
 
+  def rb_class_of(object)
+    Primitive.class_of(object)
+  end
+
   def rb_class_real(ruby_class)
     while ruby_class.singleton_class?
       ruby_class = ruby_class.superclass

lib/truffle/truffle/cext_structs.rb

@@ -224,7 +224,7 @@ def polyglot_read_member(name)
     when 'flags'
       compute_flags
     when 'klass'
-      Primitive.cext_wrap(Truffle::CExt.rb_class_of(@object))
+      Primitive.cext_wrap(Primitive.class_of(@object))
     else
       raise Truffle::Interop::UnknownIdentifierException
     end

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -458,17 +458,6 @@ protected Object dbl2big(double num,
 
     }
 
-    @CoreMethod(names = "rb_class_of", onSingleton = true, required = 1)
-    public abstract static class RBClassOfNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        protected RubyClass rb_class_of(Object object,
-                @Cached MetaClassNode metaClassNode) {
-            return metaClassNode.execute(object);
-        }
-
-    }
-
     @CoreMethod(names = "rb_long2int", onSingleton = true, required = 1)
     public abstract static class Long2Int extends CoreMethodArrayArgumentsNode {
 

src/main/java/org/truffleruby/core/support/TypeNodes.java

@@ -46,6 +46,7 @@
 import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.objects.IsANode;
 import org.truffleruby.language.objects.LogicalClassNode;
+import org.truffleruby.language.objects.MetaClassNode;
 import org.truffleruby.language.objects.WriteObjectFieldNode;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -100,6 +101,17 @@ protected RubyClass objectClass(Object object) {
 
     }
 
+    @Primitive(name = "class_of")
+    public abstract static class ClassOfNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        protected RubyClass classOf(Object object,
+                @Cached MetaClassNode metaClassNode) {
+            return metaClassNode.execute(object);
+        }
+
+    }
+
     @Primitive(name = "object_equal")
     public static abstract class ObjectEqualNode extends PrimitiveArrayArgumentsNode {
 

test/mri/excludes/TestPathname.rb

@@ -41,5 +41,4 @@
 exclude :test_freeze_and_taint, "needs investigation"
 exclude :test_glob, "needs investigation"
 exclude :test_relative_path_from_mock, "needs investigation"
-exclude :test_global_constructor, "needs investigation"
 exclude :test_readlines_opts, "needs investigation"