[Truffle] Array allocation sites weren't really being used.

jruby · May 12, 2015 · 2e8f5e6 · 2e8f5e6
1 parent 43b68cd
commit 2e8f5e6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 77 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayAllocationSite.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayAllocationSite.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayLiteralNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayLiteralNode.java
@@ -131,40 +131,24 @@ private RubyArray makeGeneric(VirtualFrame frame,
 
     public static class IntegerFixnumArrayLiteralNode extends ArrayLiteralNode {
 
-        private final ArrayAllocationSite arrayAllocationSite = new ArrayAllocationSite();
-
         public IntegerFixnumArrayLiteralNode(RubyContext context, SourceSection sourceSection, RubyNode[] values) {
             super(context, sourceSection, values);
         }
 
         @ExplodeLoop
         @Override
         public RubyArray executeRubyArray(VirtualFrame frame) {
-            if (arrayAllocationSite.hasConvertedIntToLong()) {
-                final long[] executedValues = new long[values.length];
-
-                for (int n = 0; n < values.length; n++) {
-                    try {
-                        executedValues[n] = values[n].executeLong(frame);
-                    } catch (UnexpectedResultException e) {
-                        return makeGeneric(frame, executedValues, n);
-                    }
-                }
+            final int[] executedValues = new int[values.length];
 
-                return new RubyArray(getContext().getCoreLibrary().getArrayClass(), arrayAllocationSite, executedValues, values.length);
-            } else {
-                final int[] executedValues = new int[values.length];
-
-                for (int n = 0; n < values.length; n++) {
-                    try {
-                        executedValues[n] = values[n].executeInteger(frame);
-                    } catch (UnexpectedResultException e) {
-                        return makeGeneric(frame, executedValues, n);
-                    }
+            for (int n = 0; n < values.length; n++) {
+                try {
+                    executedValues[n] = values[n].executeInteger(frame);
+                } catch (UnexpectedResultException e) {
+                    return makeGeneric(frame, executedValues, n);
                 }
-
-                return new RubyArray(getContext().getCoreLibrary().getArrayClass(), arrayAllocationSite, executedValues, values.length);
             }
+
+            return new RubyArray(getContext().getCoreLibrary().getArrayClass(), executedValues, values.length);
         }
 
         private RubyArray makeGeneric(VirtualFrame frame,

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
@@ -210,7 +210,7 @@ public RubyArray mulIntegerFixnum(RubyArray array, int count) {
                 System.arraycopy(store, 0, newStore, storeLength * n, storeLength);
             }
 
-            return new RubyArray(array.getLogicalClass(), array.getAllocationSite(), newStore, newStoreLength);
+            return new RubyArray(array.getLogicalClass(), newStore, newStoreLength);
         }
 
         @Specialization(guards = "isLongFixnum(array)")
@@ -228,7 +228,7 @@ public RubyArray mulLongFixnum(RubyArray array, int count) {
                 System.arraycopy(store, 0, newStore, storeLength * n, storeLength);
             }
 
-            return new RubyArray(array.getLogicalClass(), array.getAllocationSite(), newStore, newStoreLength);
+            return new RubyArray(array.getLogicalClass(), newStore, newStoreLength);
         }
 
         @Specialization(guards = "isFloat(array)")
@@ -246,7 +246,7 @@ public RubyArray mulFloat(RubyArray array, int count) {
                 System.arraycopy(store, 0, newStore, storeLength * n, storeLength);
             }
 
-            return new RubyArray(array.getLogicalClass(), array.getAllocationSite(), newStore, newStoreLength);
+            return new RubyArray(array.getLogicalClass(), newStore, newStoreLength);
         }
 
         @Specialization(guards = "isObject(array)")
@@ -264,7 +264,7 @@ public RubyArray mulObject(RubyArray array, int count) {
                 System.arraycopy(store, 0, newStore, storeLength * n, storeLength);
             }
 
-            return new RubyArray(array.getLogicalClass(), array.getAllocationSite(), newStore, newStoreLength);
+            return new RubyArray(array.getLogicalClass(), newStore, newStoreLength);
         }
 
         @Specialization(guards = "isRubyString(string)")

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyArray.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyArray.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.interop.ForeignAccessFactory;
 import com.oracle.truffle.api.nodes.Node;
-import org.jruby.truffle.nodes.core.array.ArrayAllocationSite;
 import org.jruby.truffle.nodes.objects.Allocator;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.subsystems.ObjectSpaceManager;
@@ -33,7 +32,6 @@ public final class RubyArray extends RubyBasicObject {
     private static final boolean RANDOMIZE_STORAGE_ARRAY = Options.TRUFFLE_RANDOMIZE_STORAGE_ARRAY.load();
     private static final Random random = new Random(Options.TRUFFLE_RANDOMIZE_SEED.load());
 
-    private final ArrayAllocationSite allocationSite;
     private Object store;
     private int size;
 
@@ -42,12 +40,7 @@ public RubyArray(RubyClass arrayClass) {
     }
 
     public RubyArray(RubyClass arrayClass, Object store, int size) {
-        this(arrayClass, null, store, size);
-    }
-
-    public RubyArray(RubyClass arrayClass, ArrayAllocationSite allocationSite, Object store, int size) {
         super(arrayClass);
-        this.allocationSite = allocationSite;
         setStore(store, size);
     }
 
@@ -302,10 +295,6 @@ private boolean verifyStore(Object store, int size) {
         return true;
     }
 
-    public ArrayAllocationSite getAllocationSite() {
-        return allocationSite;
-    }
-
     @Override
     public void visitObjectGraphChildren(ObjectSpaceManager.ObjectGraphVisitor visitor) {
         for (Object object : slowToArray()) {