Skip to content

[GR-62036] Add missing HOSTED_ONLY annotations to CGlobalData. #10659

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
Feb 13, 2025
Merged

[GR-62036] Add missing HOSTED_ONLY annotations to CGlobalData. #10659

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
8 changes: 3 additions & 5 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ public final class CGlobalDataImpl<T extends PointerBase> extends CGlobalData<T>
* The name of the symbol to create for this data (or null to create no symbol), or if the other
* fields are null, the name of the symbol to be referenced by this instance.
*/
@Platforms(Platform.HOSTED_ONLY.class) //
public final String symbolName;

@Platforms(Platform.HOSTED_ONLY.class) //
public final Supplier<byte[]> bytesSupplier;
@Platforms(Platform.HOSTED_ONLY.class) //
public final IntSupplier sizeSupplier;
public final boolean nonConstant;

Expand Down Expand Up @@ -79,9 +82,4 @@ private CGlobalDataImpl(String symbolName, Supplier<byte[]> bytesSupplier, IntSu
this.sizeSupplier = sizeSupplier;
this.nonConstant = nonConstant;
}

@Override
public String toString() {
return "CGlobalData[symbol=" + symbolName + "]";
}
}
2 changes: 2 additions & 0 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/CGlobalDataInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import java.util.function.Supplier;

import org.graalvm.nativeimage.Platform;
import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
import org.graalvm.nativeimage.Platforms;
import org.graalvm.word.Pointer;
Expand Down Expand Up @@ -53,6 +54,7 @@ public final class CGlobalDataInfo {
/** Cache until writing the image in case the {@link Supplier} is costly or has side-effects. */
@Platforms(HOSTED_ONLY.class) private byte[] bytes;

@Platforms(Platform.HOSTED_ONLY.class)
public CGlobalDataInfo(CGlobalDataImpl<?> data) {
assert data != null;
this.data = data;
Expand Down
2 changes: 2 additions & 0 deletions substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ private DynamicHub createHub(AnalysisType type) {
String simpleBinaryName = stringTable.deduplicate(getSimpleBinaryName(javaClass), true);

Class<?> nestHost = javaClass.getNestHost();
VMError.guarantee(platformSupported(nestHost), "The NestHost %s for %s is not available in this platform.", nestHost, javaClass);

boolean isHidden = javaClass.isHidden();
boolean isRecord = javaClass.isRecord();
boolean assertionStatus = RuntimeAssertionsSupport.singleton().desiredAssertionStatus(javaClass);
Expand Down