refactor uses of ArrayHelpers#createArray than can be fixed using local variables or RubyContext[Source]Node methods

Nicolas Laurent · Nicolas Laurent · commit 0f0b3af08299 · 2020-11-05T14:53:04.000+01:00
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -18,7 +18,6 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
@@ -31,7 +30,6 @@
 import org.truffleruby.core.CoreLibrary;
 import org.truffleruby.core.MarkingService.ExtensionCallStack;
 import org.truffleruby.core.MarkingServiceNodes;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.ArrayToObjectArrayNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.encoding.RubyEncoding;
@@ -358,7 +356,7 @@ private RubyArray bytes(BigInteger bi, int num_words, int word_length, boolean m
                     }
                 }
             }
-            return ArrayHelpers.createArray(getContext(), bytes);
+            return createArray(bytes);
         }
 
 
diff --git a/src/main/java/org/truffleruby/core/array/ArrayConvertNode.java b/src/main/java/org/truffleruby/core/array/ArrayConvertNode.java
@@ -28,7 +28,7 @@ public static ArrayConvertNode create() {
     public RubyArray execute(Object object) {
         Object converted = arrayCast.execute(object);
         if (cantCast.profile(converted == nil)) {
-            return ArrayHelpers.specializedRubyArrayOf(getContext(), arrayBuilder, object);
+            return ArrayHelpers.specializedRubyArrayOf(getContext(), getLanguage(), arrayBuilder, object);
         }
         return (RubyArray) converted;
     }
diff --git a/src/main/java/org/truffleruby/core/array/ArrayDropTailNode.java b/src/main/java/org/truffleruby/core/array/ArrayDropTailNode.java
@@ -37,7 +37,7 @@ protected RubyArray dropTail(RubyArray array,
             @Cached ConditionProfile indexLargerThanSize) {
         final int size = array.size;
         if (indexLargerThanSize.profile(index >= size)) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         } else {
             final int newSize = size - index;
             final Object withoutTail = cowNode.execute(array, 0, newSize);
diff --git a/src/main/java/org/truffleruby/core/array/ArrayDupNode.java b/src/main/java/org/truffleruby/core/array/ArrayDupNode.java
@@ -63,7 +63,7 @@ protected RubyArray dup(RubyArray from,
     }
 
     private RubyArray allocateArray(RubyClass rubyClass, Object store, int size) {
-        RubyArray array = new RubyArray(rubyClass, RubyLanguage.arrayShape, store, size);
+        RubyArray array = new RubyArray(rubyClass, getLanguage().arrayShape, store, size);
         AllocationTracing.trace(array, this);
         return array;
     }
diff --git a/src/main/java/org/truffleruby/core/array/ArrayGetTailNode.java b/src/main/java/org/truffleruby/core/array/ArrayGetTailNode.java
@@ -37,7 +37,7 @@ protected RubyArray getTail(RubyArray array,
             @Cached ConditionProfile indexLargerThanSize) {
         final int size = array.size;
         if (indexLargerThanSize.profile(index >= size)) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         } else {
             final Object newStore = cowNode.execute(array, index, size - index);
             return createArray(newStore, size - index);
diff --git a/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java b/src/main/java/org/truffleruby/core/array/ArrayLiteralNode.java
@@ -54,7 +54,7 @@ protected RubyArray makeGeneric(VirtualFrame frame, Object[] alreadyExecuted) {
     }
 
     protected RubyArray cachedCreateArray(Object store, int size) {
-        final RubyArray array = new RubyArray(coreLibrary().arrayClass, RubyLanguage.arrayShape, store, size);
+        final RubyArray array = createArray(store, size);
         AllocationTracing.trace(array, this);
         return array;
     }
diff --git a/src/main/java/org/truffleruby/core/array/ArrayNodes.java b/src/main/java/org/truffleruby/core/array/ArrayNodes.java
@@ -1621,13 +1621,13 @@ protected Object popNNegative(RubyArray array, int n) {
         @Specialization(guards = { "n >= 0", "isEmptyArray(array)" })
         @ReportPolymorphism.Exclude
         protected RubyArray popEmpty(RubyArray array, int n) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         }
 
         @Specialization(guards = { "n == 0", "!isEmptyArray(array)" })
         @ReportPolymorphism.Exclude
         protected RubyArray popZeroNotEmpty(RubyArray array, int n) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         }
 
         @Specialization(
@@ -2076,12 +2076,12 @@ protected Object shiftNegative(RubyArray array, int n) {
 
         @Specialization(guards = "n == 0")
         protected Object shiftZero(RubyArray array, int n) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         }
 
         @Specialization(guards = { "n > 0", "isEmptyArray(array)" })
         protected Object shiftManyEmpty(RubyArray array, int n) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         }
 
         @Specialization(
@@ -2125,7 +2125,7 @@ public abstract static class SortNode extends ArrayCoreMethodNode {
         @Specialization(guards = "isEmptyArray(array)")
         @ReportPolymorphism.Exclude
         protected RubyArray sortEmpty(RubyArray array, Object unusedBlock) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         }
 
         @ExplodeLoop
diff --git a/src/main/java/org/truffleruby/core/array/ArraySliceNode.java b/src/main/java/org/truffleruby/core/array/ArraySliceNode.java
@@ -39,7 +39,7 @@ protected RubyArray readInBounds(RubyArray array,
         final int length = array.size + to - from;
 
         if (emptyArray.profile(length <= 0)) {
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         } else {
             final Object slice = cowNode.execute(array, from, length);
             return createArray(slice, length);
diff --git a/src/main/java/org/truffleruby/core/cast/ArrayCastNode.java b/src/main/java/org/truffleruby/core/cast/ArrayCastNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.core.cast;
 
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.language.Nil;
@@ -90,7 +89,7 @@ protected RubyArray castArray(RubyArray array) {
     protected Object cast(Nil nil) {
         switch (nilBehavior) {
             case EMPTY_ARRAY:
-                return ArrayHelpers.createEmptyArray(getContext());
+                return createEmptyArray();
 
             case ARRAY_WITH_NIL:
                 return createArray(new Object[]{ nil });
diff --git a/src/main/java/org/truffleruby/core/cast/SplatCastNode.java b/src/main/java/org/truffleruby/core/cast/SplatCastNode.java
@@ -12,7 +12,6 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayDupNode;
 import org.truffleruby.core.array.ArrayDupNodeGen;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.Nil;
@@ -63,7 +62,7 @@ public void doNotCopy() {
     protected Object splatNil(VirtualFrame frame, Nil nil) {
         switch (nilBehavior) {
             case EMPTY_ARRAY:
-                return ArrayHelpers.createEmptyArray(getContext());
+                return createEmptyArray();
 
             case ARRAY_WITH_NIL:
                 return createArray(new Object[]{ nil });
diff --git a/src/main/java/org/truffleruby/core/fiber/FiberManager.java b/src/main/java/org/truffleruby/core/fiber/FiberManager.java
@@ -95,7 +95,7 @@ public RubyFiber createFiber(RubyLanguage language, RubyContext context, RubyThr
         final RubyBasicObject fiberLocals = new RubyBasicObject(
                 context.getCoreLibrary().objectClass,
                 language.basicObjectShape);
-        final RubyArray catchTags = ArrayHelpers.createEmptyArray(context);
+        final RubyArray catchTags = ArrayHelpers.createEmptyArray(context, language);
 
         return new RubyFiber(rubyClass, shape, fiberLocals, catchTags, thread);
     }
diff --git a/src/main/java/org/truffleruby/core/hash/HashNodes.java b/src/main/java/org/truffleruby/core/hash/HashNodes.java
@@ -22,7 +22,6 @@
 import org.truffleruby.collections.BiFunctionNode;
 import org.truffleruby.core.array.ArrayBuilderNode;
 import org.truffleruby.core.array.ArrayBuilderNode.BuilderState;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.hash.HashNodesFactory.EachKeyValueNodeGen;
 import org.truffleruby.core.hash.HashNodesFactory.HashLookupOrExecuteDefaultNodeGen;
@@ -668,7 +667,7 @@ public abstract static class MapNode extends YieldingCoreMethodNode {
         @Specialization(guards = "isNullHash(hash)")
         protected RubyArray mapNull(RubyHash hash, RubyProc block) {
             assert HashOperations.verifyStore(getContext(), hash);
-            return ArrayHelpers.createEmptyArray(getContext());
+            return createEmptyArray();
         }
 
         @ExplodeLoop
diff --git a/src/main/java/org/truffleruby/core/kernel/KernelNodes.java b/src/main/java/org/truffleruby/core/kernel/KernelNodes.java
@@ -22,7 +22,6 @@
 
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.SuppressFBWarnings;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
@@ -32,7 +31,6 @@
 import org.truffleruby.builtins.Primitive;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.builtins.UnaryCoreMethodNode;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.basicobject.BasicObjectNodes.ObjectIDNode;
@@ -1748,7 +1746,7 @@ protected RubyArray singletonMethods(Object self, boolean includeAncestors,
             final RubyClass metaClass = metaClassNode.execute(self);
 
             if (!metaClass.isSingleton) {
-                return ArrayHelpers.createEmptyArray(getContext());
+                return createEmptyArray();
             }
 
             Object[] objects = metaClass.fields
diff --git a/src/main/java/org/truffleruby/core/range/RangeNodes.java b/src/main/java/org/truffleruby/core/range/RangeNodes.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.core.range;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
@@ -21,7 +20,6 @@
 import org.truffleruby.builtins.YieldingCoreMethodNode;
 import org.truffleruby.core.array.ArrayBuilderNode;
 import org.truffleruby.core.array.ArrayBuilderNode.BuilderState;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.BooleanCastWithDefaultNodeGen;
 import org.truffleruby.core.cast.ToIntNode;
@@ -67,7 +65,7 @@ protected RubyArray map(RubyIntRange range, RubyProc block,
             final boolean excludedEnd = range.excludedEnd;
             int exclusiveEnd = excludedEnd ? end : end + 1;
             if (noopProfile.profile(begin >= exclusiveEnd)) {
-                return ArrayHelpers.createEmptyArray(getContext());
+                return createEmptyArray();
             }
 
             final int length = exclusiveEnd - begin;
@@ -344,7 +342,7 @@ protected RubyArray toA(RubyIntRange range) {
             final int length = result - begin;
 
             if (length < 0) {
-                return ArrayHelpers.createEmptyArray(getContext());
+                return createEmptyArray();
             } else {
                 final int[] values = new int[length];
 
@@ -547,7 +545,7 @@ public abstract static class NormalizedStartLengthPrimitiveNode extends Primitiv
 
         @Specialization
         protected RubyArray normalize(RubyRange range, int size) {
-            return ArrayHelpers.createArray(getContext(), startLengthNode.execute(range, size));
+            return createArray(startLengthNode.execute(range, size));
         }
     }
 
diff --git a/src/main/java/org/truffleruby/core/regexp/RegexpNodes.java b/src/main/java/org/truffleruby/core/regexp/RegexpNodes.java
@@ -31,7 +31,6 @@
 import org.truffleruby.builtins.CoreModule;
 import org.truffleruby.builtins.Primitive;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.cast.ToStrNode;
 import org.truffleruby.core.klass.RubyClass;
@@ -196,7 +195,7 @@ public abstract static class RegexpNamesNode extends PrimitiveArrayArgumentsNode
         protected RubyArray regexpNames(RubyRegexp regexp) {
             final int size = regexp.regex.numberOfNames();
             if (size == 0) {
-                return ArrayHelpers.createEmptyArray(getContext());
+                return createEmptyArray();
             }
 
             final Object[] names = new Object[size];
diff --git a/src/main/java/org/truffleruby/core/support/TypeNodes.java b/src/main/java/org/truffleruby/core/support/TypeNodes.java
@@ -21,7 +21,6 @@
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.builtins.PrimitiveNode;
 import org.truffleruby.core.array.ArrayGuards;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
 import org.truffleruby.core.basicobject.BasicObjectNodes.ReferenceEqualNode;
@@ -151,37 +150,37 @@ protected RubyArray instanceVariables(RubyDynamicObject object) {
 
         @Specialization
         protected RubyArray instanceVariables(int object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
         @Specialization
         protected RubyArray instanceVariables(long object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
         @Specialization
         protected RubyArray instanceVariables(double object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
         @Specialization
         protected RubyArray instanceVariables(boolean object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
         @Specialization
         protected RubyArray instanceVariablesNil(Nil object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
         @Specialization
         protected RubyArray instanceVariablesSymbol(RubySymbol object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
         @Specialization(guards = "isForeignObject(object)")
         protected RubyArray instanceVariablesForeign(Object object) {
-            return ArrayHelpers.createEmptyArray(getContext(), getLanguage());
+            return createEmptyArray();
         }
 
     }
diff --git a/src/main/java/org/truffleruby/language/arguments/ArgumentDescriptorUtils.java b/src/main/java/org/truffleruby/language/arguments/ArgumentDescriptorUtils.java
@@ -29,7 +29,7 @@ public static RubyArray argumentDescriptorsToParameters(RubyLanguage language, R
         for (int i = 0; i < argsDesc.length; i++) {
             params[i] = toArray(language, context, argsDesc[i], isLambda);
         }
-        return ArrayHelpers.createArray(context, params);
+        return ArrayHelpers.createArray(context, language, params);
     }
 
     private static RubyArray toArray(RubyLanguage language, RubyContext context, ArgumentDescriptor argDesc,
@@ -50,6 +50,6 @@ private static RubyArray toArray(RubyLanguage language, RubyContext context, Arg
             store = new Object[]{ language.getSymbol(argType.symbolicName), language.getSymbol(name) };
         }
 
-        return ArrayHelpers.createArray(context, store);
+        return ArrayHelpers.createArray(context, language, store);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import org.jcodings.specific.USASCIIEncoding;`
`19`	`19`	`import org.jcodings.specific.UTF8Encoding;`
`20`	`20`	`import org.truffleruby.Layouts;`
`21`		`-import org.truffleruby.RubyLanguage;`
`22`	`21`	`import org.truffleruby.builtins.CoreMethod;`
`23`	`22`	`import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;`
`24`	`23`	`import org.truffleruby.builtins.CoreMethodNode;`
`@@ -31,7 +30,6 @@`
`31`	`30`	`import org.truffleruby.core.CoreLibrary;`
`32`	`31`	`import org.truffleruby.core.MarkingService.ExtensionCallStack;`
`33`	`32`	`import org.truffleruby.core.MarkingServiceNodes;`
`34`		`-import org.truffleruby.core.array.ArrayHelpers;`
`35`	`33`	`import org.truffleruby.core.array.ArrayToObjectArrayNode;`
`36`	`34`	`import org.truffleruby.core.array.RubyArray;`
`37`	`35`	`import org.truffleruby.core.encoding.RubyEncoding;`
`@@ -358,7 +356,7 @@ private RubyArray bytes(BigInteger bi, int num_words, int word_length, boolean m`
`358`	`356`	`}`
`359`	`357`	`}`
`360`	`358`	`}`
`361`		`- return ArrayHelpers.createArray(getContext(), bytes);`
	`359`	`+ return createArray(bytes);`
`362`	`360`	`}`
`363`	`361`
`364`	`362`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static ArrayConvertNode create() {`
`28`	`28`	`public RubyArray execute(Object object) {`
`29`	`29`	`Object converted = arrayCast.execute(object);`
`30`	`30`	`if (cantCast.profile(converted == nil)) {`
`31`		`- return ArrayHelpers.specializedRubyArrayOf(getContext(), arrayBuilder, object);`
	`31`	`+ return ArrayHelpers.specializedRubyArrayOf(getContext(), getLanguage(), arrayBuilder, object);`
`32`	`32`	`}`
`33`	`33`	`return (RubyArray) converted;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected RubyArray dup(RubyArray from,`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`private RubyArray allocateArray(RubyClass rubyClass, Object store, int size) {`
`66`		`- RubyArray array = new RubyArray(rubyClass, RubyLanguage.arrayShape, store, size);`
	`66`	`+ RubyArray array = new RubyArray(rubyClass, getLanguage().arrayShape, store, size);`
`67`	`67`	`AllocationTracing.trace(array, this);`
`68`	`68`	`return array;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected RubyArray makeGeneric(VirtualFrame frame, Object[] alreadyExecuted) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`protected RubyArray cachedCreateArray(Object store, int size) {`
`57`		`- final RubyArray array = new RubyArray(coreLibrary().arrayClass, RubyLanguage.arrayShape, store, size);`
	`57`	`+ final RubyArray array = createArray(store, size);`
`58`	`58`	`AllocationTracing.trace(array, this);`
`59`	`59`	`return array;`
`60`	`60`	`}`