Skip to content

Exclude substituted class from build time initialization #2935

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

Closed
wants to merge 1 commit into from
Closed

Exclude substituted class from build time initialization #2935

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
26 changes: 23 additions & 3 deletions ...oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/TypeInitializerGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/
package com.oracle.svm.hosted.classinitialization;

import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -36,10 +37,14 @@
import com.oracle.graal.pointsto.meta.AnalysisMethod;
import com.oracle.graal.pointsto.meta.AnalysisType;
import com.oracle.graal.pointsto.meta.AnalysisUniverse;
import com.oracle.svm.core.annotate.Delete;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
import com.oracle.svm.hosted.SVMHost;
import com.oracle.svm.hosted.phases.SubstrateClassInitializationPlugin;
import com.oracle.svm.hosted.substitute.SubstitutionMethod;
import com.oracle.svm.hosted.substitute.SubstitutionType;
import jdk.vm.ci.meta.ResolvedJavaType;

/**
* Keeps a type-hierarchy dependency graph for {@link AnalysisType}s from {@code universe}. Each
Expand Down Expand Up @@ -106,9 +111,24 @@ void computeInitializerSafety() {
* A type initializer is initially unsafe only if it was marked by the user as such.
*/
private Safety initialTypeInitializerSafety(AnalysisType t) {
return classInitializationSupport.specifiedInitKindFor(t.getJavaClass()) == InitKind.BUILD_TIME || classInitializationSupport.canBeProvenSafe(t.getJavaClass())
? Safety.SAFE
: Safety.UNSAFE;
ResolvedJavaType rt = t.getWrappedWithoutResolve();
boolean isSubstituted = false;
if (rt instanceof SubstitutionType) {
SubstitutionType substitutionType = (SubstitutionType) rt;
for (Annotation annotation : substitutionType.getAnnotations()) {
if (annotation instanceof Substitute || annotation instanceof Delete) {
isSubstituted = true;
break;
}
}
}
if(isSubstituted){
return Safety.UNSAFE;
}else {
return classInitializationSupport.specifiedInitKindFor(t.getJavaClass()) == InitKind.BUILD_TIME || classInitializationSupport.canBeProvenSafe(t.getJavaClass())
? Safety.SAFE
: Safety.UNSAFE;
}
}

boolean isUnsafe(AnalysisType type) {
Expand Down