jruby · Nov 13, 2014 · Nov 13, 2014 · Nov 13, 2014 · Nov 13, 2014
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.api.dsl.*;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import org.jruby.runtime.Visibility;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.runtime.*;
 import org.jruby.truffle.runtime.core.*;
@@ -123,11 +124,45 @@ public InitializeNode(InitializeNode prev) {
         }
 
         @Specialization
-        public RubyNilClass initialize(RubyRegexp regexp, RubyString string) {
+        public RubyRegexp initialize(RubyRegexp regexp, RubyString string) {
             notDesignedForCompilation();
 
             regexp.initialize(this, string.toString());
-            return getContext().getCoreLibrary().getNilObject();
+            return regexp;
+        }
+
+        @Specialization
+        public RubyRegexp initialize(RubyRegexp regexp, RubyRegexp from) {
+            notDesignedForCompilation();
+
+            regexp.initialize(this, from.getSource()); // TODO: is copying needed?
+            return regexp;
+        }
+
+    }
+
+    @CoreMethod(names = "initialize_copy", visibility = Visibility.PRIVATE, required = 1)
+    public abstract static class InitializeCopyNode extends CoreMethodNode {
+
+        public InitializeCopyNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public InitializeCopyNode(InitializeCopyNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public Object initializeCopy(RubyRegexp self, RubyRegexp from) {
+            notDesignedForCompilation();
+
+            if (self == from) {
+                return self;
+            }
+
+            self.initialize(this, from.getSource()); // TODO: is copying needed?
+
+            return self;
         }
 
     }

diff --git a/core/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java b/core/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
@@ -140,10 +140,11 @@ public RubyNode visitRestArgNode(org.jruby.ast.RestArgNode node) {
 
         final RubyNode readNode;
 
+        int from = argsNode.getPreCount() + argsNode.getOptionalArgsCount();
         if (useArray()) {
-            readNode = ArrayGetTailNodeFactory.create(context, sourceSection, argsNode.getPreCount(), loadArray(sourceSection));
+            readNode = ArrayGetTailNodeFactory.create(context, sourceSection, from, loadArray(sourceSection));
         } else {
-            readNode = new ReadRestArgumentNode(context, sourceSection, argsNode.getPreCount());
+            readNode = new ReadRestArgumentNode(context, sourceSection, from);
         }
 
         final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findFrameSlot(node.getName());

diff --git a/spec/truffle/tags/language/def_tags.txt b/spec/truffle/tags/language/def_tags.txt
@@ -1,22 +1,13 @@
-fails:An instance method with a default argument assigns an empty Array to an unused splat argument
 fails:A singleton method definition raises RuntimeError if frozen
 fails:A method defined with extreme default arguments may use an fcall as a default
 fails:A method defined with extreme default arguments may use preceding arguments as defaults
 fails:A singleton method defined with extreme default arguments may use an fcall as a default
 fails:A singleton method defined with extreme default arguments may use preceding arguments as defaults
-fails:A method definition inside a metaclass scope can create a class method
-fails:A method definition inside a metaclass scope can create a singleton method
 fails:A method definition inside a metaclass scope raises RuntimeError if frozen
 fails:A nested method definition creates an instance method when evaluated in an instance method
 fails:A nested method definition creates a class method when evaluated in a class method
-fails:A nested method definition creates a singleton method when evaluated in the metaclass of an instance
-fails:A method definition inside an instance_eval creates a singleton method
-fails:A method definition inside an instance_eval creates a singleton method when evaluated inside a metaclass
 fails:A method definition inside an instance_eval creates a class method when the receiver is a class
 fails:A method definition in an eval creates an instance method
 fails:A method definition in an eval creates a class method
-fails:A method definition in an eval creates a singleton method
 fails(inherited):The def keyword within a closure looks outside the closure for the visibility
-fails:An instance method with a default argument does not evaluate the default when passed a value and a * argument
-fails:An instance method with a default argument prefers to assign to a default argument when there are no required arguments
 fails:Defining a method returns a symbol of the method name
diff --git a/spec/truffle/tags/language/lambda_tags.txt b/spec/truffle/tags/language/lambda_tags.txt
@@ -1,2 +1 @@
-fails:->(){} sets parameters appropriately when a combination of parameter types is given between the parenthesis
 fails:->(){} uses lambda's 'rigid' argument handling
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:->(){} sets parameters appropriately when a combination of parameter types is given between the parenthesis
		fails:->(){} uses lambda's 'rigid' argument handling