Skip to content

[GR-72207] Eagerly initialize CalendarSystem #12785

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
graalvmbot merged 1 commit into from
Jan 8, 2026
Merged

[GR-72207] Eagerly initialize CalendarSystem #12785

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
18 changes: 18 additions & 0 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/CalendarFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,35 @@

import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
import com.oracle.svm.core.feature.InternalFeature;
import com.oracle.svm.util.GraalAccess;
import com.oracle.svm.util.JVMCIReflectionUtil;
import com.oracle.svm.util.OriginalMethodProvider;

import jdk.vm.ci.meta.ResolvedJavaType;
import sun.util.calendar.JulianCalendar;

@AutomaticallyRegisteredFeature
public class CalendarFeature implements InternalFeature {

@Override
public void beforeAnalysis(BeforeAnalysisAccess access) {
initializeCalendarSystem(((InternalFeatureAccess) access));
// GregorianCalendar might use JulianCalendar via reflection
access.registerReachabilityHandler(_ -> {
RuntimeReflection.register(JulianCalendar.class);
RuntimeReflection.registerForReflectiveInstantiation(JulianCalendar.class);
}, GregorianCalendar.class);
}

/**
* Make sure {@code CalendarSystem} is initialized before analysis. Otherwise, the reachability
* of its {@code initName} method is non-deterministic, because there is a race condition
* between heap snapshotting and the first call to the {@code forName} method, which triggers
* the initialization.
*/
private static void initializeCalendarSystem(InternalFeatureAccess access) {
ResolvedJavaType calendarSystem = access.findTypeByName("sun.util.calendar.CalendarSystem");
var forName = JVMCIReflectionUtil.getUniqueDeclaredMethod(access.getMetaAccess(), calendarSystem, "forName", String.class);
GraalAccess.getVMAccess().invoke(OriginalMethodProvider.getOriginalMethod(forName), null, GraalAccess.getOriginalSnippetReflection().forObject("julian"));
}
}