[GR-9829] Fix NameError, NoMethodError, and SystemCallError dup with internal field data.

PullRequest: truffleruby/1201

Author: bjfish

CHANGELOG.md

@@ -41,6 +41,7 @@ Bug fixes:
 * Make `String#concat` work with no or multiple arguments (#1519).
 * Make `Array#concat` work with no or multiple arguments (#1519).
 * Fixed BigDecimal coerce initial argument using `to_str` (#1826).
+* Fixed `NameError`, `NoMethodError`, and `SystemCallError` dup with internal field data.
 * Make `Enumerable#chunk` work without a block (#1518).
 * Fixed issue with `SystemCallError.new` setting a backtrace.
 * Fixed `BigDecimal#to_s` formatting issue (#1711).

spec/ruby/core/exception/name_error_spec.rb

@@ -22,3 +22,15 @@
     end
   end
 end
+
+describe "NameError#dup" do
+  it "copies the name and receiver" do
+    begin
+      foo
+    rescue NameError => ne
+      name_error_dup = ne.dup
+      name_error_dup.name.should == :foo
+      name_error_dup.receiver.should == self
+    end
+  end
+end

spec/ruby/core/exception/no_method_error_spec.rb

@@ -104,3 +104,17 @@ def inspect
     end
   end
 end
+
+describe "NoMethodError#dup" do
+  it "copies the name, arguments and receiver" do
+    begin
+      receiver = Object.new
+      receiver.foo(:one, :two)
+    rescue NoMethodError => nme
+      no_method_error_dup = nme.dup
+      no_method_error_dup.name.should == :foo
+      no_method_error_dup.receiver.should == receiver
+      no_method_error_dup.args.should == [:one, :two]
+    end
+  end
+end

spec/ruby/core/exception/system_call_error_spec.rb

@@ -134,3 +134,10 @@ def initialize
     SystemCallError.new("message", 42).backtrace.should == nil
   end
 end
+
+describe "SystemCallError#dup" do
+  it "copies the errno" do
+    dup_sce = SystemCallError.new("message", 42).dup
+    dup_sce.errno.should == 42
+  end
+end

src/main/java/org/truffleruby/core/exception/ExceptionNodes.java

@@ -74,9 +74,54 @@ protected Object initializeCopySelfIsSameAsFrom(DynamicObject self, DynamicObjec
             return self;
         }
 
-
-        @Specialization(guards = { "self != from", "isRubyException(from)" })
+        @Specialization(
+                guards = { "self != from", "isRubyException(from)", "!isNameError(from)", "!isSystemCallError(from)" })
         protected Object initializeCopy(DynamicObject self, DynamicObject from) {
+            initializeExceptionCopy(self, from);
+            return self;
+        }
+
+        @Specialization(guards = { "self != from", "isSystemCallError(from)" })
+        protected Object initializeSystemCallErrorCopy(DynamicObject self, DynamicObject from) {
+            initializeExceptionCopy(self, from);
+            Layouts.SYSTEM_CALL_ERROR.setErrno(self, Layouts.SYSTEM_CALL_ERROR.getErrno(from));
+            return self;
+        }
+
+        @Specialization(guards = { "self != from", "isNoMethodError(from)" })
+        protected Object initializeCopyNoMethodError(DynamicObject self, DynamicObject from) {
+            initializeExceptionCopy(self, from);
+            initializeNameErrorCopy(self, from);
+            Layouts.NO_METHOD_ERROR.setArgs(self, Layouts.NO_METHOD_ERROR.getArgs(from));
+            return self;
+        }
+
+        @Specialization(
+                guards = { "self != from", "isNameError(from)", "!isNoMethodError(from)" })
+        protected Object initializeCopyNameError(DynamicObject self, DynamicObject from) {
+            initializeExceptionCopy(self, from);
+            initializeNameErrorCopy(self, from);
+            return self;
+        }
+
+        protected boolean isNameError(DynamicObject object) {
+            return Layouts.NAME_ERROR.isNameError(object);
+        }
+
+        protected boolean isNoMethodError(DynamicObject object) {
+            return Layouts.NO_METHOD_ERROR.isNoMethodError(object);
+        }
+
+        protected boolean isSystemCallError(DynamicObject object) {
+            return Layouts.SYSTEM_CALL_ERROR.isSystemCallError(object);
+        }
+
+        private void initializeNameErrorCopy(DynamicObject self, DynamicObject from) {
+            Layouts.NAME_ERROR.setName(self, Layouts.NAME_ERROR.getName(from));
+            Layouts.NAME_ERROR.setReceiver(self, Layouts.NAME_ERROR.getReceiver(from));
+        }
+
+        private void initializeExceptionCopy(DynamicObject self, DynamicObject from) {
             Backtrace backtrace = Layouts.EXCEPTION.getBacktrace(from);
             if (backtrace != null) {
                 Layouts.EXCEPTION.setBacktrace(self, backtrace.copy(getContext(), self));
@@ -86,8 +131,6 @@ protected Object initializeCopy(DynamicObject self, DynamicObject from) {
             Layouts.EXCEPTION.setFormatter(self, Layouts.EXCEPTION.getFormatter(from));
             Layouts.EXCEPTION.setMessage(self, Layouts.EXCEPTION.getMessage(from));
             Layouts.EXCEPTION.setCause(self, Layouts.EXCEPTION.getCause(from));
-
-            return self;
         }
 
     }

src/main/java/org/truffleruby/core/exception/NoMethodErrorLayout.java

@@ -32,6 +32,8 @@ Object[] build(
             Object name,
             Object args);
 
+    boolean isNoMethodError(DynamicObject object);
+
     Object getArgs(DynamicObject object);
 
     void setArgs(DynamicObject object, Object value);

src/main/java/org/truffleruby/core/exception/SystemCallErrorLayout.java

@@ -30,6 +30,8 @@ Object[] build(
             DynamicObject cause,
             Object errno);
 
+    boolean isSystemCallError(DynamicObject object);
+
     Object getErrno(DynamicObject object);
 
     void setErrno(DynamicObject object, Object value);