Skip to content

[GR-59959] Change package name computation for hybrid objects. #10156

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
Nov 26, 2024
Merged

[GR-59959] Change package name computation for hybrid objects. #10156

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
14 changes: 12 additions & 2 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,11 +1528,21 @@ public String getPackageName() {
return companion.getPackageName(this);
}

private boolean isHybrid() {
if (SubstrateUtil.HOSTED) {
return AnnotationAccess.isAnnotationPresent(hostedJavaClass, Hybrid.class);
} else {
return LayoutEncoding.isHybrid(getLayoutEncoding());
}
}

String computePackageName() {
String pn = null;
DynamicHub me = this;
while (me.hubIsArray()) {
me = me.getComponentType();
if (!isHybrid()) {
while (me.hubIsArray()) {
me = me.getComponentType();
}
}
if (me.isPrimitive()) {
pn = "java.lang";
Expand Down
2 changes: 2 additions & 0 deletions ...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import com.oracle.svm.hosted.jdk.HostedClassLoaderPackageManagement;
import com.oracle.svm.util.ReflectionUtil;

import jdk.graal.compiler.debug.Assertions;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ResolvedJavaField;
Expand Down Expand Up @@ -172,6 +173,7 @@ private static void registerPackage(ImageHeapScanner heapScanner, Class<?> javaC
ClassLoader runtimeClassLoader = ClassLoaderFeature.getRuntimeClassLoader(classloader);
VMError.guarantee(runtimeClassLoader != null, "Class loader missing for class %s", hub.getName());
String packageName = hub.getPackageName();
assert packageName.equals(packageValue.getName()) : Assertions.errorMessage("Package name mismatch:", packageName, packageValue.getName());
HostedClassLoaderPackageManagement.singleton().registerPackage(runtimeClassLoader, packageName, packageValue, heapScanner::rescanObject);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...m.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/HostedClassLoaderPackageManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ public void registerPackage(ClassLoader runtimeClassLoader, String packageName,
/* Scan the class loader packages if the new package was missing. */
objectScanner.accept(loaderPackages);
if (inSharedLayer && runtimeClassLoader == appClassLoader) {
VMError.guarantee(packageValue.getName().equals(packageName), "Package name is different from package value's name: %s %s", packageName, packageValue);

/*
* We must register this package so that it can be relinked in subsequent layers.
*/
registry.registerHeapConstant(generateKeyName(packageValue.getName()), packageValue);

VMError.guarantee(packageValue.getName().equals(packageName), "Package name is different from package value's name: %s %s", packageName, packageValue);
}
}
}
Expand Down