[Truffle] AllocateObjectNode for Queue.

jruby · Dec 18, 2015 · 9580e60 · 9580e60
1 parent 803b50d
commit 9580e60
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java
@@ -21,6 +21,8 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.BooleanCastWithDefaultNodeGen;
+import org.jruby.truffle.nodes.objects.AllocateObjectNode;
+import org.jruby.truffle.nodes.objects.AllocateObjectNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.layouts.Layouts;
@@ -40,13 +42,16 @@ public abstract class QueueNodes {
     @CoreMethod(names = "allocate", constructor = true)
     public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {
 
+        @Child private AllocateObjectNode allocateNode;
+
         public AllocateNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
         }
 
         @Specialization
         public DynamicObject allocate(DynamicObject rubyClass) {
-            return Layouts.QUEUE.createQueue(Layouts.CLASS.getInstanceFactory(rubyClass), new LinkedBlockingQueue<Object>());
+            return allocateNode.allocate(rubyClass, new LinkedBlockingQueue<Object>());
         }
 
     }