Skip to content

[GR-66724] Copy interface class displays from object parent type. #11578

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
Jul 8, 2025
Merged

[GR-66724] Copy interface class displays from object parent type. #11578

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
2 changes: 1 addition & 1 deletion ...ratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ public TypeState getAssignableTypes(boolean includeNull) {
}

public static boolean verifyAssignableTypes(BigBang bb) {
List<AnalysisType> allTypes = bb.getUniverse().getTypes();
List<AnalysisType> allTypes = bb.getUniverse().getTypes().stream().filter(t -> !(t.getWrapped() instanceof BaseLayerType)).toList();

Set<String> mismatchedAssignableResults = ConcurrentHashMap.newKeySet();
allTypes.parallelStream().filter(t -> t.instantiatedTypes != null).forEach(t1 -> {
Expand Down
19 changes: 12 additions & 7 deletions substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/TypeCheckBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiFunction;

import com.oracle.graal.pointsto.meta.BaseLayerType;
import com.oracle.svm.core.SubstrateOptions;
import com.oracle.svm.core.graal.snippets.OpenTypeWorldSnippets;
import com.oracle.svm.core.hub.DynamicHubSupport;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.hosted.OpenTypeWorldFeature;

import jdk.graal.compiler.core.common.calc.UnsignedMath;
import jdk.graal.compiler.debug.Assertions;

/**
* This class assigns each type an id, determines stamp metadata, and generates the information
Expand Down Expand Up @@ -1894,10 +1896,16 @@ private void computeClassDisplay(int typeID) {

private void computeClassDisplay(int[] parent, int typeID) {
assert classDisplay == null;
assert Arrays.stream(parent).noneMatch(id -> id == typeID) : Assertions.errorMessage("Redundant entry in class display", Arrays.toString(parent), typeID);
classDisplay = new int[parent.length + 1];
System.arraycopy(parent, 0, classDisplay, 0, parent.length);
classDisplay[parent.length] = typeID;
}

private void copyClassDisplay(int[] display) {
assert classDisplay == null;
classDisplay = display;
}
}

public void calculateOpenTypeWorldTypeMetadata() {
Expand Down Expand Up @@ -1937,11 +1945,7 @@ public void calculateOpenTypeWorldTypeMetadata() {
dimension--;
displayType = objectType.getArrayClass(dimension);
}
if (displayType.getArrayDimension() == 0) {
info.computeClassDisplay(displayType.getTypeID());
} else {
info.computeClassDisplay(getTypeInfo.apply(displayType, false).classDisplay, displayType.getTypeID());
}
info.copyClassDisplay(getTypeInfo.apply(displayType, false).classDisplay);
}

if (isInterface(type)) {
Expand Down Expand Up @@ -1997,9 +2001,10 @@ static String printTypeInfo(HostedType type) {

static boolean compareTypeIDResults(List<HostedType> types) {
if (!SubstrateOptions.DisableTypeIdResultVerification.getValue()) {
List<HostedType> nonBaseLayerTypes = types.stream().filter(t -> !(t.getWrapped().getWrapped() instanceof BaseLayerType)).toList();
Set<String> mismatchedTypes = ConcurrentHashMap.newKeySet();
types.parallelStream().forEach(superType -> {
for (HostedType checkedType : types) {
nonBaseLayerTypes.parallelStream().forEach(superType -> {
for (HostedType checkedType : nonBaseLayerTypes) {
boolean hostedCheck = superType.isAssignableFrom(checkedType);
boolean runtimeCheck = runtimeIsAssignableFrom(superType, checkedType);
boolean checksMatch = hostedCheck == runtimeCheck;
Expand Down