Use Primitive.module_anonymous? in Struct#inspect

Author: andrykonchin

spec/ruby/core/struct/fixtures/classes.rb

@@ -13,6 +13,12 @@ def initialize(*args)
     end
   end
 
+  class StructWithOverriddenName < Struct.new(:a)
+    def self.name
+      "A"
+    end
+  end
+
   class SubclassX < Struct
   end
 

spec/ruby/core/struct/shared/inspect.rb

@@ -25,4 +25,16 @@ class Foo < Struct.new(:a); end
 
     m::Foo.new("").send(@method).should == '#<struct a="">'
   end
+
+  it "does not call #name method" do
+    struct = StructClasses::StructWithOverriddenName.new("")
+    struct.send(@method).should == '#<struct StructClasses::StructWithOverriddenName a="">'
+  end
+
+  it "does not call #name method when struct is anonymous" do
+    struct = Struct.new(:a)
+    def struct.name; "A"; end
+
+    struct.new("").send(@method).should == '#<struct a="">'
+  end
 end

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

@@ -145,12 +145,11 @@ def to_s
         values << "#{var}=#{val.inspect}"
       end
 
-      name = self.class.name
-
-      if Primitive.nil?(name) || name.empty? || name[0] == '#'
+      if Primitive.module_anonymous?(self.class)
         return "#<struct #{values.join(', ')}>"
       else
-        return "#<struct #{self.class.name} #{values.join(', ')}>"
+        name = Primitive.module_name self.class
+        return "#<struct #{name} #{values.join(', ')}>"
       end
     end