Skip to content

8373620: [lw5] Substitute params with type j.l.r.RuntimeType by j.l.Class in j.l.runtime.ArrayCreation #1796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vicente-romero-oracle wants to merge 3 commits into
base: lw5
Choose a base branch
from
+72 −72
Open

8373620: [lw5] Substitute params with type j.l.r.RuntimeType by j.l.Class in j.l.runtime.ArrayCreation #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f90a99
8373620: [lw5] Change in java.lang.runtime.ArrayCreation API from Run…
vicente-romero-oracle Dec 12, 2025
2b5d253
8373620: [lw5] Substitute params with type j.l.r.RuntimeType by j.l.C…
vicente-romero-oracle Dec 12, 2025
3dd31c2
Merge branch 'JDK-8373620' of https://github.com/vicente-romero-oracl…
vicente-romero-oracle Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions src/java.base/share/classes/java/lang/runtime/ArrayCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ private ArrayCreation() {}

private static final Lookup LOOKUP = lookup();
private static final MethodType MAKE_LARVAL_TYPE =
MethodType.methodType(Object.class, RuntimeType.class, int.class, int.class);
MethodType.methodType(Object.class, Class.class, int.class, int.class);
private static final MethodType MAKE_DEFAULT_TYPE =
MethodType.methodType(Object.class, RuntimeType.class, int.class, int.class);
MethodType.methodType(Object.class, Class.class, int.class, int.class);
private static final MethodType MAKE_FILLED_TYPE =
MethodType.methodType(Object.class, RuntimeType.class, int.class, int.class, Object.class);
MethodType.methodType(Object.class, Class.class, int.class, int.class, Object.class);
private static final MethodType MAKE_COMPUTED_TYPE =
MethodType.methodType(Object.class, RuntimeType.class, int.class, int.class, IntFunction.class);
MethodType.methodType(Object.class, Class.class, int.class, int.class, IntFunction.class);
private static final MethodType MAKE_COPY_TYPE =
MethodType.methodType(Object.class, RuntimeType.class, int.class, int.class, Object.class, int.class);
MethodType.methodType(Object.class, Class.class, int.class, int.class, Object.class, int.class);

private static boolean isDefault(RuntimeType<?> componentType, Object value) {
private static boolean isDefault(Class<?> componentType, Object value) {
Class<?> c = componentType.baseClass();
if (c.isPrimitive()) {
return Wrapper.forPrimitiveType(c).zero().equals(value);
Expand All @@ -66,13 +66,13 @@ private static boolean isDefault(RuntimeType<?> componentType, Object value) {

// makeLarval

private static Object makeLarval(RuntimeType<?> componentType, int flags, int length) {
private static Object makeLarval(Class<?> componentType, int flags, int length) {
return Array.newInstance(componentType.baseClass(), length);
}

// makeDefault

private static Object makeDefault(RuntimeType<?> componentType, int flags, int length) {
private static Object makeDefault(Class<?> componentType, int flags, int length) {
if (!componentType.baseClass().isPrimitive() && !componentType.canCast(null)) {
throw new AssertionError("unsupported component type: " + componentType);
}
Expand All @@ -81,70 +81,70 @@ private static Object makeDefault(RuntimeType<?> componentType, int flags, int l

// makeFilled

private static Object makeFilled(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled(Class<?> componentType, int flags, int length, Object init) {
Object[] result = (Object[]) Array.newInstance(componentType.baseClass(), length);
Arrays.fill(result, init);
return result;
}

private static Object makeFilled_byte(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_byte(Class<?> componentType, int flags, int length, Object init) {
byte[] result = new byte[length];
Arrays.fill(result, (byte) init);
return result;
}

private static Object makeFilled_short(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_short(Class<?> componentType, int flags, int length, Object init) {
short[] result = new short[length];
Arrays.fill(result, (short) init);
return result;
}

private static Object makeFilled_int(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_int(Class<?> componentType, int flags, int length, Object init) {
int[] result = new int[length];
Arrays.fill(result, (int) init);
return result;
}

private static Object makeFilled_long(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_long(Class<?> componentType, int flags, int length, Object init) {
long[] result = new long[length];
Arrays.fill(result, (long) init);
return result;
}

private static Object makeFilled_float(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_float(Class<?> componentType, int flags, int length, Object init) {
float[] result = new float[length];
Arrays.fill(result, (float) init);
return result;
}

private static Object makeFilled_double(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_double(Class<?> componentType, int flags, int length, Object init) {
double[] result = new double[length];
Arrays.fill(result, (double) init);
return result;
}

private static Object makeFilled_boolean(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_boolean(Class<?> componentType, int flags, int length, Object init) {
boolean[] result = new boolean[length];
Arrays.fill(result, (boolean) init);
return result;
}

private static Object makeFilled_char(RuntimeType<?> componentType, int flags, int length, Object init) {
private static Object makeFilled_char(Class<?> componentType, int flags, int length, Object init) {
char[] result = new char[length];
Arrays.fill(result, (char) init);
return result;
}

// makeComputed

private static Object makeComputed(RuntimeType<?> componentType, int flags,
private static Object makeComputed(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
Object[] result = (Object[]) Array.newInstance(componentType.baseClass(), length);
Arrays.setAll(result, func);
return result;
}

private static Object makeComputed_byte(RuntimeType<?> componentType, int flags,
private static Object makeComputed_byte(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
byte[] result = new byte[length];
for (int i = 0; i < length; i++) {
Expand All @@ -153,7 +153,7 @@ private static Object makeComputed_byte(RuntimeType<?> componentType, int flags,
return result;
}

private static Object makeComputed_short(RuntimeType<?> componentType, int flags,
private static Object makeComputed_short(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
short[] result = new short[length];
for (int i = 0; i < length; i++) {
Expand All @@ -162,7 +162,7 @@ private static Object makeComputed_short(RuntimeType<?> componentType, int flags
return result;
}

private static Object makeComputed_int(RuntimeType<?> componentType, int flags,
private static Object makeComputed_int(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
int[] result = new int[length];
for (int i = 0; i < length; i++) {
Expand All @@ -171,7 +171,7 @@ private static Object makeComputed_int(RuntimeType<?> componentType, int flags,
return result;
}

private static Object makeComputed_long(RuntimeType<?> componentType, int flags,
private static Object makeComputed_long(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
long[] result = new long[length];
for (int i = 0; i < length; i++) {
Expand All @@ -180,7 +180,7 @@ private static Object makeComputed_long(RuntimeType<?> componentType, int flags,
return result;
}

private static Object makeComputed_float(RuntimeType<?> componentType, int flags,
private static Object makeComputed_float(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
float[] result = new float[length];
for (int i = 0; i < length; i++) {
Expand All @@ -189,7 +189,7 @@ private static Object makeComputed_float(RuntimeType<?> componentType, int flags
return result;
}

private static Object makeComputed_double(RuntimeType<?> componentType, int flags,
private static Object makeComputed_double(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
double[] result = new double[length];
for (int i = 0; i < length; i++) {
Expand All @@ -198,7 +198,7 @@ private static Object makeComputed_double(RuntimeType<?> componentType, int flag
return result;
}

private static Object makeComputed_boolean(RuntimeType<?> componentType, int flags,
private static Object makeComputed_boolean(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
boolean[] result = new boolean[length];
for (int i = 0; i < length; i++) {
Expand All @@ -207,7 +207,7 @@ private static Object makeComputed_boolean(RuntimeType<?> componentType, int fla
return result;
}

private static Object makeComputed_char(RuntimeType<?> componentType, int flags,
private static Object makeComputed_char(Class<?> componentType, int flags,
int length, IntFunction<?> func) {
char[] result = new char[length];
for (int i = 0; i < length; i++) {
Expand All @@ -218,7 +218,7 @@ private static Object makeComputed_char(RuntimeType<?> componentType, int flags,

// makeCopy

private static Object makeCopy(RuntimeType<?> componentType, int flags,
private static Object makeCopy(Class<?> componentType, int flags,
int length, Object source, int start) {
Object result = Array.newInstance(componentType.baseClass(), length);
System.arraycopy(source, start, result, 0, length);
Expand Down Expand Up @@ -247,7 +247,7 @@ private static Object makeCopy(RuntimeType<?> componentType, int flags,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite constantFilled(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags, int length, Object init) throws Throwable {
flags = flags | Modifier.STRICT;
MethodHandle factory;
Expand Down Expand Up @@ -294,7 +294,7 @@ public static CallSite constantFilled(Lookup lookup, String methodName,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite dynamicFilled(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags, int length) throws Throwable {
flags = flags | Modifier.STRICT;
String mname = "makeFilled";
Expand Down Expand Up @@ -330,7 +330,7 @@ public static CallSite dynamicFilled(Lookup lookup, String methodName,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite computed(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags, int length) throws Throwable {
flags = flags | Modifier.STRICT;
String mname = "makeComputed";
Expand Down Expand Up @@ -366,7 +366,7 @@ public static CallSite computed(Lookup lookup, String methodName,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite copied(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags, int length) throws Throwable {
flags = flags | Modifier.STRICT;
MethodHandle factory = LOOKUP.findStatic(ArrayCreation.class, "makeCopy", MAKE_COPY_TYPE);
Expand Down Expand Up @@ -401,7 +401,7 @@ public static CallSite copied(Lookup lookup, String methodName,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite offsetCopied(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags, int length) throws Throwable {
flags = flags | Modifier.STRICT;
MethodHandle factory = LOOKUP.findStatic(ArrayCreation.class, "makeCopy", MAKE_COPY_TYPE);
Expand Down Expand Up @@ -432,7 +432,7 @@ public static CallSite offsetCopied(Lookup lookup, String methodName,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite constantEnumerated(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags, Object... values) throws Throwable {
flags = flags | Modifier.STRICT;
MethodHandle factory = LOOKUP.findStatic(ArrayCreation.class, "makeCopy", MAKE_COPY_TYPE);
Expand Down Expand Up @@ -467,7 +467,7 @@ public static CallSite constantEnumerated(Lookup lookup, String methodName,
* @throws Throwable if any exception is thrown during call site construction
*/
public static CallSite dynamicEnumerated(Lookup lookup, String methodName,
MethodType type, RuntimeType<?> componentType,
MethodType type, Class<?> componentType,
int flags) throws Throwable {
flags = flags | Modifier.STRICT;
Class<?> ccls = componentType.baseClass();
Expand Down
Loading