[Truffle] Support multiple arguments in Thread.new

jruby · May 11, 2015 · ef4c54c · ef4c54c
1 parent 39cb466
commit ef4c54c
Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/spec/truffle/tags/core/thread/new_tags.txt b/spec/truffle/tags/core/thread/new_tags.txt
@@ -1,4 +1,3 @@
-fails:Thread.new can pass arguments to the thread block
 fails:Thread.new raises an exception when not given a block
 fails:Thread.new creates a subclass of thread calls super with a block in initialize
 fails:Thread.new calls #initialize and raises an error if super not used

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java
@@ -77,16 +77,16 @@ public void run(RubyThread currentThread, Node currentNode) {
 
     }
 
-    @CoreMethod(names = "initialize", needsBlock = true)
+    @CoreMethod(names = "initialize", argumentsAsArray = true, needsBlock = true)
     public abstract static class InitializeNode extends CoreMethodArrayArgumentsNode {
 
         public InitializeNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
         @Specialization
-        public RubyBasicObject initialize(RubyThread thread, RubyProc block) {
-            thread.initialize(getContext(), this, block);
+        public RubyBasicObject initialize(RubyThread thread, Object[] arguments, RubyProc block) {
+            thread.initialize(getContext(), this, arguments, block);
             return nil();
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java
@@ -60,12 +60,12 @@ public RubyThread(RubyClass rubyClass, ThreadManager manager) {
         fiberManager = new FiberManager(this, manager);
     }
 
-    public void initialize(RubyContext context, Node currentNode, final RubyProc block) {
+    public void initialize(RubyContext context, Node currentNode, final Object[] arguments, final RubyProc block) {
         String info = block.getSharedMethodInfo().getSourceSection().getShortDescription();
         initialize(context, currentNode, info, new Runnable() {
             @Override
             public void run() {
-                value = block.rootCall();
+                value = block.rootCall(arguments);
             }
         });
     }