[GR-18163] Reimplement Data#with to not call Data.new

PullRequest: truffleruby/4555

Author: andrykonchin

CHANGELOG.md

@@ -33,6 +33,7 @@ Compatibility:
 * Implement `rb_error_frozen_object` for the google-protobuf gem (@nirvdrum).
 * Adjust a `FrozenError`'s message and add a receiver when a frozen module or class is modified (e.g. by defining or undefining an instance method or by defining a nested module (@andrykonchin).
 * Fix `Kernel#sprintf` and `%p` format specification to produce `"nil"` for `nil` argument (#3846, @andrykonchin).
+* Reimplement `Data#with` to not call `Data.new` that can be removed or redefined (#3890, @andrykonchin).
 
 Performance:
 

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

@@ -17,5 +17,12 @@ def initialize(amount:, unit:)
     end
 
     Empty = Data.define()
+
+    DataWithOverriddenInitialize = Data.define(:amount, :unit) do
+      def initialize(*rest, **kw)
+        super
+        ScratchPad.record [:initialize, rest, kw]
+      end
+    end
   end
 end

spec/ruby/core/data/initialize_spec.rb

@@ -71,4 +71,44 @@
   it "supports Data with no fields" do
     -> { DataSpecs::Empty.new }.should_not raise_error
   end
+
+  it "can be overridden" do
+    ScratchPad.record []
+
+    measure_class = Data.define(:amount, :unit) do
+      def initialize(*, **)
+        super
+        ScratchPad << :initialize
+      end
+    end
+
+    measure_class.new(42, "m")
+    ScratchPad.recorded.should == [:initialize]
+  end
+
+  context "when it is overridden" do
+    it "is called with keyword arguments when given positional arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize.new(42, "m")
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
+    end
+
+    it "is called with keyword arguments when given keyword arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize.new(amount: 42, unit: "m")
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
+    end
+
+    it "is called with keyword arguments when given alternative positional arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize[42, "m"]
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
+    end
+
+    it "is called with keyword arguments when given alternative keyword arguments" do
+      ScratchPad.clear
+      DataSpecs::DataWithOverriddenInitialize[amount: 42, unit: "m"]
+      ScratchPad.recorded.should == [:initialize, [], {amount: 42, unit: "m"}]
+    end
+  end
 end

spec/ruby/core/data/with_spec.rb

@@ -30,4 +30,28 @@
       data.with(4, "m")
     }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
   end
+
+  it "does not depend on the Data.new method" do
+    subclass = Class.new(DataSpecs::Measure)
+    data = subclass.new(amount: 42, unit: "km")
+
+    def subclass.new(*)
+      raise "Data.new is called"
+    end
+
+    data_copy = data.with(unit: "m")
+    data_copy.amount.should == 42
+    data_copy.unit.should == "m"
+  end
+
+  ruby_version_is "3.3" do
+    it "calls #initialize" do
+      data = DataSpecs::DataWithOverriddenInitialize.new(42, "m")
+      ScratchPad.clear
+
+      data.with(amount: 0)
+
+      ScratchPad.recorded.should == [:initialize, [], {amount: 0, unit: "m"}]
+    end
+  end
 end

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

@@ -95,6 +95,9 @@ def self.new(*args, **kwargs)
     instance_methods_module.module_eval "#{<<~'RUBY'}", __FILE__, __LINE__+1
       # truffleruby_primitives: true
 
+      ORIGINAL_NEW = klass.method(:new)
+      private_constant :ORIGINAL_NEW
+
       def initialize(**kwargs)
         members_hash = Primitive.class(self)::CLASS_MEMBERS_HASH
         kwargs.each do |member, value|
@@ -135,7 +138,7 @@ def to_h(&block)
       def with(**changes)
         return self if changes.empty?
 
-        Primitive.class(self).new(**to_h.merge(changes))
+        ORIGINAL_NEW.call(**to_h.merge(changes))
       end
 
       def inspect