[Truffle] Replace getInstanceFactory with AllocateObjectNode

jruby · Nov 19, 2015 · 43c8e4b · eregon · Nov 20, 2015 · pitr-ch
1 parent f6553cf
commit 43c8e4b
Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java
@@ -15,6 +15,8 @@
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.objects.AllocateObjectNode;
+import org.jruby.truffle.nodes.objects.AllocateObjectNodeGen;
 import org.jruby.truffle.runtime.NotProvided;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
@@ -29,13 +31,16 @@ public abstract class MutexNodes {
     @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.MUTEX.createMutex(Layouts.CLASS.getInstanceFactory(rubyClass), new ReentrantLock());
+            return allocateNode.allocate(rubyClass, new ReentrantLock());
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/AtomicReferenceNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/AtomicReferenceNodes.java
@@ -15,22 +15,29 @@
 import org.jruby.truffle.nodes.core.CoreClass;
 import org.jruby.truffle.nodes.core.CoreMethod;
 import org.jruby.truffle.nodes.core.CoreMethodArrayArgumentsNode;
+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.layouts.Layouts;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 @CoreClass(name = "Rubinius::AtomicReference")
 public abstract class AtomicReferenceNodes {
 
     @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.ATOMIC_REFERENCE.createAtomicReference(Layouts.CLASS.getInstanceFactory(rubyClass), nil());
+            return allocateNode.allocate(rubyClass, new AtomicReference<Object>(nil()));
         }
 
     }