Skip to content

[GR-67803] Persist unsafe accessed across layers #11778

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 26, 2025
Merged

[GR-67803] Persist unsafe accessed across layers #11778

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
13 changes: 7 additions & 6 deletions substratevm/src/com.oracle.svm.hosted/resources/SharedLayerSnapshotCapnProtoSchema.capnp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,13 @@ struct PersistedAnalysisField {
isRead @9 :Bool;
isWritten @10 :Bool;
isFolded @11 :Bool;
isStatic @12 :Bool;
isSynthetic @13 :Bool;
annotationList @14 :List(Annotation);
name @15 :Text;
priorInstalledLayerNum @16 :Int32;
assignmentStatus @17 :Int32;
isUnsafeAccessed @12 :Bool;
isStatic @13 :Bool;
isSynthetic @14 :Bool;
annotationList @15 :List(Annotation);
name @16 :Text;
priorInstalledLayerNum @17 :Int32;
assignmentStatus @18 :Int32;
}

struct CEntryPointLiteralReference {
Expand Down
1 change: 1 addition & 0 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 @@ -1290,6 +1290,7 @@ public void initializeBaseLayerField(AnalysisField analysisField) {
analysisField.registerAsWritten(PERSISTED);
});
registerFlag(fieldData.getIsFolded(), debug -> analysisField.registerAsFolded(PERSISTED));
registerFlag(fieldData.getIsUnsafeAccessed(), debug -> analysisField.registerAsUnsafeAccessed(PERSISTED));
}

private PersistedAnalysisField.Reader getFieldData(AnalysisField analysisField) {
Expand Down
1 change: 1 addition & 0 deletions ...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,7 @@ private void persistField(AnalysisField field, Supplier<PersistedAnalysisField.B
builder.setIsRead(field.getReadReason() != null);
builder.setIsWritten(field.getWrittenReason() != null);
builder.setIsFolded(field.getFoldedReason() != null);
builder.setIsUnsafeAccessed(field.isUnsafeAccessed());

Field originalField = OriginalFieldProvider.getJavaField(field);
if (originalField != null && !originalField.getDeclaringClass().equals(field.getDeclaringClass().getJavaClass())) {
Expand Down
23 changes: 17 additions & 6 deletions ...hosted/src/com/oracle/svm/hosted/imagelayer/SharedLayerSnapshotCapnProtoSchemaHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2170,20 +2170,27 @@ public final void setIsFolded(boolean value) {
_setBooleanField(196, value);
}

public final boolean getIsStatic() {
public final boolean getIsUnsafeAccessed() {
return _getBooleanField(197);
}
public final void setIsStatic(boolean value) {
public final void setIsUnsafeAccessed(boolean value) {
_setBooleanField(197, value);
}

public final boolean getIsSynthetic() {
public final boolean getIsStatic() {
return _getBooleanField(198);
}
public final void setIsSynthetic(boolean value) {
public final void setIsStatic(boolean value) {
_setBooleanField(198, value);
}

public final boolean getIsSynthetic() {
return _getBooleanField(199);
}
public final void setIsSynthetic(boolean value) {
_setBooleanField(199, value);
}

public final boolean hasAnnotationList() {
return !_pointerFieldIsNull(1);
}
Expand Down Expand Up @@ -2283,14 +2290,18 @@ public final boolean getIsFolded() {
return _getBooleanField(196);
}

public final boolean getIsStatic() {
public final boolean getIsUnsafeAccessed() {
return _getBooleanField(197);
}

public final boolean getIsSynthetic() {
public final boolean getIsStatic() {
return _getBooleanField(198);
}

public final boolean getIsSynthetic() {
return _getBooleanField(199);
}

public final boolean hasAnnotationList() {
return !_pointerFieldIsNull(1);
}
Expand Down