Skip to content

[GR-50854] Fix clinit simulation for arraycopy with null values. #8039

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

Merged
merged 1 commit into from
Dec 17, 2023
Merged

[GR-50854] Fix clinit simulation for arraycopy with null values. #8039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions ...d/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerGraphDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,12 @@ protected boolean handleArrayCopy(ImageHeapArray source, int sourcePos, ImageHea
}
if (destComponentType.getJavaKind() == JavaKind.Object && !destComponentType.isJavaLangObject() && !sourceComponentType.equals(destComponentType)) {
for (int i = 0; i < length; i++) {
var elementValueType = ((TypedConstant) source.getElement(sourcePos + i)).getType(metaAccess);
if (!destComponentType.isAssignableFrom(elementValueType)) {
return false;
var elementValue = (JavaConstant) source.getElement(sourcePos + i);
if (elementValue.isNonNull()) {
var elementValueType = ((TypedConstant) elementValue).getType(metaAccess);
if (!destComponentType.isAssignableFrom(elementValueType)) {
return false;
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...atevm/src/com.oracle.svm.test/src/com/oracle/svm/test/clinit/TestClassInitialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ public static Object defaultValue(Class<?> clazz) {
System.arraycopy(shorts, 1, S1, 2, 5);
System.arraycopy(S1, 3, S1, 5, 5);

Object[] objects = {"42", "43", "44", "45", "46", "47", "48"};
Object[] objects = {"42", null, "44", "45", null, "47", "48"};
O1 = Arrays.copyOf(objects, 3);
O2 = Arrays.copyOfRange(objects, 3, 6, String[].class);
}
Expand Down Expand Up @@ -943,8 +943,8 @@ public static void main(String[] args) {
assertSame(Short.class, BoxingMustBeSimulated.defaultValue(short.class).getClass());
assertSame(Float.class, BoxingMustBeSimulated.defaultValue(float.class).getClass());
assertTrue(Arrays.equals((short[]) BoxingMustBeSimulated.S1, new short[]{0, 0, 43, 44, 45, 44, 45, 46, 47, 0, 0, 0}));
assertTrue(Arrays.equals((Object[]) BoxingMustBeSimulated.O1, new Object[]{"42", "43", "44"}));
assertTrue(Arrays.equals((Object[]) BoxingMustBeSimulated.O2, new String[]{"45", "46", "47"}));
assertTrue(Arrays.equals((Object[]) BoxingMustBeSimulated.O1, new Object[]{"42", null, "44"}));
assertTrue(Arrays.equals((Object[]) BoxingMustBeSimulated.O2, new String[]{"45", null, "47"}));

/*
* The unsafe field offset lookup is constant folded at image build time, which also
Expand Down