Share logic for {Method,UnboundMethod}#inspect and avoid duplication when origin == owner

Author: eregon

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

@@ -1131,6 +1131,7 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/class.rb",
             "/core/binding.rb",
             "/core/math.rb",
+            "/core/truffle/method_operations.rb",
             "/core/method.rb",
             "/core/unbound_method.rb",
             "/core/warning.rb",

src/main/java/org/truffleruby/core/method/MethodNodes.java

@@ -320,22 +320,33 @@ protected int getCacheLimit() {
     public abstract static class MethodUnimplementNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
-        protected Object methodUnimplement(RubyMethod rubyMethod) {
-            final InternalMethod method = rubyMethod.method;
-            method.getDeclaringModule().fields.addMethod(
-                    getContext(),
-                    this,
-                    method.unimplemented());
+        protected Object bound(RubyMethod rubyMethod) {
+            unimplement(rubyMethod.method);
+            return nil;
+        }
+
+        @Specialization
+        protected Object unbound(RubyUnboundMethod rubyMethod) {
+            unimplement(rubyMethod.method);
             return nil;
         }
 
+        @TruffleBoundary
+        private void unimplement(InternalMethod method) {
+            method.getDeclaringModule().fields.addMethod(getContext(), this, method.unimplemented());
+        }
     }
 
     @Primitive(name = "method_unimplemented?")
-    public abstract static class MethodUnimplementedQueryNode extends PrimitiveArrayArgumentsNode {
+    public abstract static class MethodIsUnimplementedNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        protected boolean bound(RubyMethod rubyMethod) {
+            return rubyMethod.method.isUnimplemented();
+        }
 
         @Specialization
-        protected boolean isMethodUnimplemented(RubyMethod rubyMethod) {
+        protected boolean unbound(RubyUnboundMethod rubyMethod) {
             return rubyMethod.method.isUnimplemented();
         }
 

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

@@ -9,22 +9,10 @@
 # GNU Lesser General Public License version 2.1.
 
 class Method
-
   def inspect
-    extra = ''
-
-    if Primitive.method_unimplemented? self
-      extra = ' (not-implemented)'
-    else
-      file, line = source_location
-
-      if file && line
-        extra = " #{file}:#{line}"
-      end
-    end
-
-    "#<#{self.class}: #{receiver.class}(#{owner})##{name}#{extra}>"
+    Truffle::MethodOperations.inspect_method(self, receiver.class, owner)
   end
+  alias_method :to_s, :inspect
 
   def curry(curried_arity = nil)
     self.to_proc.curry(curried_arity)
@@ -37,7 +25,4 @@ def >>(other)
   def <<(other)
     self.to_proc << other
   end
-
-  alias_method :to_s, :inspect
-
 end

src/main/ruby/truffleruby/core/truffle/method_operations.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+module Truffle
+  module MethodOperations
+    def self.inspect_method(meth, origin, owner)
+      extra = ''
+      if Primitive.method_unimplemented? meth
+        extra = ' (not-implemented)'
+      else
+        file, line = meth.source_location
+
+        if file && line
+          extra = " #{file}:#{line}"
+        end
+      end
+
+      origin_owner = origin == owner ? origin : "#{origin}(#{owner})"
+      "#<#{meth.class}: #{origin_owner}##{meth.name}#{extra}>"
+    end
+  end
+end

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

@@ -9,11 +9,9 @@
 # GNU Lesser General Public License version 2.1.
 
 class UnboundMethod
-
   def inspect
-    "#<#{self.class}: #{origin}(#{owner})##{name}>"
+    Truffle::MethodOperations.inspect_method(self, origin, owner)
   end
-
   alias_method :to_s, :inspect
 
   def bind_call(recv, *args, &block)