Simplify array helpers

PullRequest: truffleruby/524

Author: chrisseaton

src/main/java/org/truffleruby/core/array/ArrayHelpers.java

@@ -13,6 +13,8 @@
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
 
+import java.util.Collection;
+
 public abstract class ArrayHelpers {
 
     public static Object getStore(DynamicObject array) {
@@ -46,4 +48,16 @@ public static DynamicObject createArray(RubyContext context, Object store, int s
         return Layouts.ARRAY.createArray(context.getCoreLibrary().getArrayFactory(), store, size);
     }
 
+    public static DynamicObject createArray(RubyContext context, Object[] store) {
+        return createArray(context, store, store.length);
+    }
+
+    public static DynamicObject createArray(RubyContext context, Collection<Object> store) {
+        return createArray(context, store.toArray());
+    }
+
+    public static DynamicObject createEmptyArray(RubyContext context) {
+        return Layouts.ARRAY.createArray(context.getCoreLibrary().getArrayFactory(), null, 0);
+    }
+
 }

src/main/java/org/truffleruby/core/binding/BindingNodes.java

@@ -383,8 +383,7 @@ public static DynamicObject listLocalVariables(RubyContext context, Materialized
 
                 frame = RubyArguments.getDeclarationFrame(frame);
             }
-            final int size = names.size();
-            return ArrayHelpers.createArray(context, names.toArray(new Object[size]), size);
+            return ArrayHelpers.createArray(context, names);
         }
 
         private static void addNamesFromFrame(RubyContext context, Frame frame, final Set<Object> names) {

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -604,7 +604,7 @@ public DynamicObject nameErrorFromMethodMissing(DynamicObject formatter, Object
     @TruffleBoundary
     public DynamicObject noMethodError(String message, Object receiver, String name, Object[] args, Node currentNode) {
         final DynamicObject messageString = StringOperations.createString(context, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE));
-        final DynamicObject argsArray =  createArray(context, args, args.length);
+        final DynamicObject argsArray =  createArray(context, args);
         final DynamicObject exceptionClass = context.getCoreLibrary().getNoMethodErrorClass();
         final Backtrace backtrace = context.getCallStack().getBacktrace(currentNode);
         showExceptionIfDebug(exceptionClass, messageString, backtrace);
@@ -620,7 +620,7 @@ public DynamicObject noMethodError(String message, Object receiver, String name,
 
     @TruffleBoundary
     public DynamicObject noMethodErrorFromMethodMissing(DynamicObject formatter, Object receiver, String name, Object[] args, Node currentNode) {
-        final DynamicObject argsArray = createArray(context, args, args.length);
+        final DynamicObject argsArray = createArray(context, args);
 
         // omit = 1 to skip over the call to `method_missing'. MRI does not show this is the backtrace.
         final Backtrace backtrace = context.getCallStack().getBacktrace(currentNode, 1);

src/main/java/org/truffleruby/core/fiber/FiberManager.java

@@ -100,7 +100,7 @@ public DynamicObject createFiber(RubyContext context, DynamicObject thread, Dyna
         assert RubyGuards.isRubyThread(thread);
         CompilerAsserts.partialEvaluationConstant(context);
         final DynamicObject fiberLocals = Layouts.BASIC_OBJECT.createBasicObject(context.getCoreLibrary().getObjectFactory());
-        final DynamicObject catchTags = ArrayHelpers.createArray(context, null, 0);
+        final DynamicObject catchTags = ArrayHelpers.createEmptyArray(context);
 
         return Layouts.FIBER.createFiber(
                 factory,

src/main/java/org/truffleruby/language/arguments/ArgumentDescriptorUtils.java

@@ -28,7 +28,7 @@ public static DynamicObject argumentDescriptorsToParameters(RubyContext context,
             params[i] = toArray(context, argsDesc[i], isLambda);
         }
 
-        return ArrayHelpers.createArray(context, params, params.length);
+        return ArrayHelpers.createArray(context, params);
     }
 
     public static DynamicObject toArray(RubyContext context,
@@ -57,6 +57,6 @@ public static DynamicObject toArray(RubyContext context,
             };
         }
 
-        return ArrayHelpers.createArray(context, store, store.length);
+        return ArrayHelpers.createArray(context, store);
     }
 }

src/main/java/org/truffleruby/language/backtrace/BacktraceFormatter.java

@@ -132,7 +132,7 @@ public DynamicObject formatBacktraceAsRubyStringArray(DynamicObject exception, B
                     StringOperations.encodeRope(lines[n], UTF8Encoding.INSTANCE));
         }
 
-        return ArrayHelpers.createArray(context, array, array.length);
+        return ArrayHelpers.createArray(context, array);
     }
 
     @TruffleBoundary