Skip to content

[GR-60530] Ensure layered static field state is initialized before queried. #10970

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
Apr 3, 2025
Merged

[GR-60530] Ensure layered static field state is initialized before queried. #10970

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
39 changes: 21 additions & 18 deletions ...com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/LayeredStaticFieldSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public class LayeredStaticFieldSupport extends LayeredClassInitialization implem
final Set<Object> appLayerFields;

final Map<AnalysisField, LayerAssignmentStatus> assignmentStatusMap;
final Map<AnalysisField, Integer> priorInstalledLayerNum;
final Map<AnalysisField, Integer> priorInstalledLocation;
final Map<AnalysisField, Integer> priorInstalledLayerMap;
final Map<AnalysisField, Integer> priorInstalledLocationMap;

public static final String appLayerPrimitiveStaticFieldsBaseName = "APPLAYER_PRIMITIVE_STATICFIELDSBASE";
public static final String appLayerObjectStaticFieldsBaseName = "APPLAYER_OBJECT_STATICFIELDSBASE";
Expand All @@ -107,8 +107,8 @@ private LayeredStaticFieldSupport(Set<Object> appLayerFields, UniverseBuilder.St
this.appLayerFields = appLayerFields;
assignmentStatusMap = new ConcurrentHashMap<>();
inAppLayer = ImageLayerBuildingSupport.buildingApplicationLayer();
priorInstalledLayerNum = inAppLayer ? new ConcurrentHashMap<>() : null;
priorInstalledLocation = inAppLayer ? new ConcurrentHashMap<>() : null;
priorInstalledLayerMap = inAppLayer ? new ConcurrentHashMap<>() : null;
priorInstalledLocationMap = inAppLayer ? new ConcurrentHashMap<>() : null;
this.appLayerStaticFieldOffsets = appLayerStaticFieldOffsets;
}

Expand Down Expand Up @@ -150,13 +150,16 @@ private static AnalysisField getAnalysisField(Object obj) {
}
}

public void initializeFromFieldData(AnalysisField aField, SharedLayerSnapshotCapnProtoSchemaHolder.PersistedAnalysisField.Reader fieldData) {
Object previous = priorInstalledLayerNum.put(aField, fieldData.getPriorInstalledLayerNum());
assert previous == null : previous;
previous = assignmentStatusMap.put(aField, LayerAssignmentStatus.values()[fieldData.getAssignmentStatus()]);
assert previous == null : previous;
previous = priorInstalledLocation.put(aField, fieldData.getLocation());
assert previous == null : previous;
public void ensureInitializedFromFieldData(AnalysisField aField, SharedLayerSnapshotCapnProtoSchemaHolder.PersistedAnalysisField.Reader fieldData) {
Integer priorInstalledLayerNum = fieldData.getPriorInstalledLayerNum();
Object result = priorInstalledLayerMap.computeIfAbsent(aField, f -> priorInstalledLayerNum);
assert priorInstalledLayerNum.equals(result) : result;
LayerAssignmentStatus assignmentStatus = LayerAssignmentStatus.values()[fieldData.getAssignmentStatus()];
result = assignmentStatusMap.computeIfAbsent(aField, f -> assignmentStatus);
assert assignmentStatus.equals(result);
Integer priorInstalledLocation = fieldData.getLocation();
result = priorInstalledLocationMap.computeIfAbsent(aField, f -> priorInstalledLocation);
assert priorInstalledLocation.equals(result);
}

private void installFieldInAppLayer(Field field, MetaAccessProvider meta) {
Expand Down Expand Up @@ -216,7 +219,7 @@ public LayerAssignmentStatus getAssignmentStatus(AnalysisField analysisField) {
if (!(inAppLayer && analysisField.isInBaseLayer())) {
return LayerAssignmentStatus.UNDECIDED;
}
throw VMError.shouldNotReachHere("base layer types should have already been initialized");
throw VMError.shouldNotReachHere(String.format("Base analysis field assignment status queried before it is initialized: %s", analysisField));
});
}

Expand All @@ -225,8 +228,8 @@ public int getPriorInstalledLayerNum(AnalysisField analysisField) {
return MultiLayeredImageSingleton.LAYER_NUM_UNINSTALLED;
}

assert priorInstalledLayerNum.containsKey(analysisField);
return priorInstalledLayerNum.get(analysisField);
assert priorInstalledLayerMap.containsKey(analysisField);
return priorInstalledLayerMap.get(analysisField);
}

public boolean preventConstantFolding(AnalysisField aField) {
Expand Down Expand Up @@ -265,13 +268,13 @@ public void reinitializeKnownFields(List<HostedField> staticFields) {
LayerAssignmentStatus state = getAssignmentStatus(aField);
if (state == LayerAssignmentStatus.PRIOR_LAYER) {
int layerNum = getPriorInstalledLayerNum(aField);
assert priorInstalledLocation.containsKey(aField);
int location = priorInstalledLocation.get(aField);
assert priorInstalledLocationMap.containsKey(aField);
int location = priorInstalledLocationMap.get(aField);
hField.setLocation(location, layerNum);
} else if (state == LayerAssignmentStatus.APP_LAYER_DEFERRED) {
assert inAppLayer;
assert priorInstalledLocation.containsKey(aField);
int location = priorInstalledLocation.get(aField);
assert priorInstalledLocationMap.containsKey(aField);
int location = priorInstalledLocationMap.get(aField);
hField.setLocation(location, currentLayerNum);
}
}
Expand Down
8 changes: 5 additions & 3 deletions ...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,15 +1141,17 @@ private int getBaseLayerFieldId(AnalysisField analysisField) {
@Override
public void addBaseLayerField(AnalysisField analysisField) {
fields.putIfAbsent(analysisField.getId(), analysisField);
if (analysisField.isStatic()) {
PersistedAnalysisField.Reader fieldData = getFieldData(analysisField);
assert fieldData != null : "The field should be in the base layer";
layeredStaticFieldSupport.ensureInitializedFromFieldData(analysisField, fieldData);
}
}

@Override
public void initializeBaseLayerField(AnalysisField analysisField) {
PersistedAnalysisField.Reader fieldData = getFieldData(analysisField);
assert fieldData != null : "The field should be in the base layer";
if (analysisField.isStatic()) {
layeredStaticFieldSupport.initializeFromFieldData(analysisField, fieldData);
}

boolean isAccessed = fieldData.getIsAccessed();
boolean isRead = fieldData.getIsRead();
Expand Down
Loading