Skip to content

[GR-64774] EnsureClassInitializedNode.hub should try harder to resolve to a constant #11200

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[GR-64774] EnsureClassInitializedNode.hub should try harder to resolve to a constant #11200

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
6 changes: 4 additions & 2 deletions ...acle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
import jdk.graal.compiler.nodes.spi.Lowerable;
import jdk.graal.compiler.nodes.type.StampTool;
import jdk.graal.compiler.nodes.util.GraphUtil;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.ResolvedJavaType;

Expand Down Expand Up @@ -98,8 +99,9 @@ public boolean hasSideEffect() {
}

public ResolvedJavaType constantTypeOrNull(ConstantReflectionProvider constantReflection) {
if (hub.isConstant()) {
return constantReflection.asJavaType(hub.asConstant());
ValueNode value = GraphUtil.unproxify(hub);
if (value.isConstant()) {
return constantReflection.asJavaType(value.asConstant());
} else {
return null;
}
Expand Down
Loading