Skip to content

[GR-69273] Fix error in bad toString reporting. #12091

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
Sep 3, 2025
Merged

[GR-69273] Fix error in bad toString reporting. #12091

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
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ public AnalysisMethod getMethod() {

@Override
public String toString(BigBang bb) {
return "scanning root " + asString(bb, constant) + " embedded in" + System.lineSeparator() + INDENTATION_AFTER_NEWLINE + asStackTraceElement();
return "scanning root constant " + asString(bb, constant) + " embedded in" + System.lineSeparator() + INDENTATION_AFTER_NEWLINE + asStackTraceElement();
}

@Override
Expand Down
55 changes: 25 additions & 30 deletions ...evm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.util.function.BiConsumer;
import java.util.function.Consumer;

import com.oracle.graal.pointsto.util.AtomicUtils;
import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;

import com.oracle.graal.pointsto.BigBang;
Expand All @@ -47,6 +46,7 @@
import com.oracle.graal.pointsto.reports.ReportUtils;
import com.oracle.graal.pointsto.util.AnalysisError;
import com.oracle.graal.pointsto.util.AnalysisFuture;
import com.oracle.graal.pointsto.util.AtomicUtils;
import com.oracle.graal.pointsto.util.ConcurrentLightHashSet;

import jdk.graal.compiler.debug.GraalError;
Expand Down Expand Up @@ -309,8 +309,7 @@ private void build() {
while (!reasonStack.isEmpty()) {
boolean expanded;
Object top = reasonStack.peekLast();
if (top instanceof CompoundReason) {
CompoundReason compoundReason = (CompoundReason) top;
if (top instanceof CompoundReason compoundReason) {
if (compoundReason.isFirst()) {
compoundReason.storeCurrentIndent(indent);
}
Expand Down Expand Up @@ -378,23 +377,20 @@ private boolean processReason(Object current, String prefix) {
if (current instanceof String) {
reasonStr = "str: " + current;

} else if (current instanceof AnalysisMethod) {
AnalysisMethod method = (AnalysisMethod) current;
reasonStr = "at " + method.format("%f method %H.%n(%p)") + ", " + methodReasonStr(method);
expanded = methodReason((AnalysisMethod) current);
} else if (current instanceof AnalysisMethod method) {
reasonStr = "at " + method.format("%f method %H.%n(%p)") + " " + methodReasonStr(method);
expanded = methodReason(method);

} else if (current instanceof AnalysisField) {
AnalysisField field = (AnalysisField) current;
} else if (current instanceof AnalysisField field) {
reasonStr = "field " + field.format("%H.%n") + " " + fieldReasonStr(field);
expanded = fieldReason(field);

} else if (current instanceof AnalysisType) {
AnalysisType type = (AnalysisType) current;
reasonStr = "type " + (type).toJavaName() + " " + typeReasonStr(type);
} else if (current instanceof AnalysisType type) {
reasonStr = "type " + type.toJavaName() + " " + typeReasonStr(type);
expanded = typeReason(type);

} else if (current instanceof ResolvedJavaMethod) {
reasonStr = ((ResolvedJavaMethod) current).format("%f method %H.%n");
} else if (current instanceof ResolvedJavaMethod method) {
reasonStr = method.format("%f method %H.%n");

} else if (current instanceof ResolvedJavaField field) {
/*
Expand All @@ -408,26 +404,23 @@ private boolean processReason(Object current, String prefix) {
if (analysisField != null) {
return processReason(analysisField, prefix);
} else {
reasonStr = "field " + ((ResolvedJavaField) current).format("%H.%n");
reasonStr = "field " + field.format("%H.%n");
}

} else if (current instanceof ResolvedJavaType) {
reasonStr = "type " + ((ResolvedJavaType) current).getName();

} else if (current instanceof BytecodePosition) {
BytecodePosition position = (BytecodePosition) current;
} else if (current instanceof BytecodePosition position) {
ResolvedJavaMethod method = position.getMethod();
reasonStr = "at " + method.format("%f") + " method " + method.asStackTraceElement(position.getBCI()) + ", " + methodReasonStr(method);
expanded = methodReason(position.getMethod());

} else if (current instanceof MethodParsing) {
MethodParsing methodParsing = (MethodParsing) current;
} else if (current instanceof MethodParsing methodParsing) {
AnalysisMethod method = methodParsing.getMethod();
reasonStr = "at " + method.format("%f method %H.%n(%p)") + ", " + methodReasonStr(method);
expanded = methodReason(methodParsing.getMethod());

} else if (current instanceof ObjectScanner.ScanReason) {
ObjectScanner.ScanReason scanReason = (ObjectScanner.ScanReason) current;
} else if (current instanceof ObjectScanner.ScanReason scanReason) {
reasonStr = scanReason.toString(bb);
expanded = maybeExpandReasonStack(scanReason.getPrevious());

Expand All @@ -447,6 +440,8 @@ private void print(String prefix, String reasonStr) {
private boolean typeReason(AnalysisType type) {
if (type.isInstantiated()) {
return maybeExpandReasonStack(type.getInstantiatedReason());
} else if (type.isAnySubtypeInstantiated()) {
return maybeExpandReasonStack(type.getAnyInstantiatedSubtype());
} else {
return maybeExpandReasonStack(type.getReachableReason());
}
Expand All @@ -455,6 +450,8 @@ private boolean typeReason(AnalysisType type) {
private static String typeReasonStr(AnalysisType type) {
if (type.isInstantiated()) {
return "is marked as instantiated";
} else if (type.isAnySubtypeInstantiated()) {
return "has a subtype marked as instantiated";
}
return "is reachable";
}
Expand Down Expand Up @@ -489,8 +486,7 @@ private static String fieldReasonStr(AnalysisField field) {
}

private boolean methodReason(ResolvedJavaMethod method) {
if (method instanceof AnalysisMethod) {
AnalysisMethod aMethod = (AnalysisMethod) method;
if (method instanceof AnalysisMethod aMethod) {
if (aMethod.isSimplyImplementationInvoked()) {
if (aMethod.isStatic()) {
return maybeExpandReasonStack(aMethod.getImplementationInvokedReason());
Expand Down Expand Up @@ -522,29 +518,28 @@ private boolean maybeExpandReasonStack(Object reason) {
}

private static String methodReasonStr(ResolvedJavaMethod method) {
if (method instanceof AnalysisMethod) {
AnalysisMethod aMethod = (AnalysisMethod) method;
if (method instanceof AnalysisMethod aMethod) {
if (aMethod.isSimplyImplementationInvoked()) {
if (aMethod.isStatic()) {
return "implementation invoked";
return "is implementation invoked";
} else {
/* For virtual methods we follow back type reachability. */
AnalysisType declaringClass = aMethod.getDeclaringClass();
assert declaringClass.isInstantiated() || declaringClass.isAbstract() ||
(declaringClass.isInterface() && aMethod.isDefault()) || declaringClass.isReachable() : declaringClass + " is not reachable";
return "implementation invoked";
return "is implementation invoked";
}
} else if (aMethod.isInlined()) {
if (aMethod.isStatic()) {
return "inlined";
return "is inlined";
} else {
AnalysisType declaringClass = aMethod.getDeclaringClass();
assert declaringClass.isInstantiated() || declaringClass.isAbstract() ||
(declaringClass.isInterface() && aMethod.isDefault()) || declaringClass.isReachable() : declaringClass + " is not reachable";
return "inlined";
return "is inlined";
}
} else if (aMethod.isIntrinsicMethod()) {
return "intrinsified";
return "is intrinsified";
}
}
return "<no available reason>";
Expand Down
13 changes: 8 additions & 5 deletions ...ratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.function.Consumer;
import java.util.function.Function;
Expand Down Expand Up @@ -100,8 +99,8 @@ public abstract class AnalysisType extends AnalysisElement implements WrappedJav
private static final AtomicReferenceFieldUpdater<AnalysisType, Object> isReachableUpdater = AtomicReferenceFieldUpdater
.newUpdater(AnalysisType.class, Object.class, "isReachable");

private static final AtomicIntegerFieldUpdater<AnalysisType> isAnySubtypeInstantiatedUpdater = AtomicIntegerFieldUpdater
.newUpdater(AnalysisType.class, "isAnySubtypeInstantiated");
private static final AtomicReferenceFieldUpdater<AnalysisType, Object> isAnySubtypeInstantiatedUpdater = AtomicReferenceFieldUpdater
.newUpdater(AnalysisType.class, Object.class, "isAnySubtypeInstantiated");

static final AtomicReferenceFieldUpdater<AnalysisType, Object> overrideableMethodsUpdater = AtomicReferenceFieldUpdater
.newUpdater(AnalysisType.class, Object.class, "overrideableMethods");
Expand All @@ -121,7 +120,7 @@ public abstract class AnalysisType extends AnalysisElement implements WrappedJav
/** Can be allocated via Unsafe or JNI, i.e., without executing a constructor. */
@SuppressWarnings("unused") private volatile Object isUnsafeAllocated;
@SuppressWarnings("unused") private volatile Object isReachable;
@SuppressWarnings("unused") private volatile int isAnySubtypeInstantiated;
@SuppressWarnings("unused") private volatile Object isAnySubtypeInstantiated;
private boolean reachabilityListenerNotified;
private boolean unsafeFieldsRecomputed;

Expand Down Expand Up @@ -533,7 +532,7 @@ public boolean registerAsInstantiated(Object reason) {

protected void onInstantiated() {
assert !isWordType() : Assertions.errorMessage("Word types cannot be instantiated", this);
forAllSuperTypes(superType -> AtomicUtils.atomicMark(superType, isAnySubtypeInstantiatedUpdater));
forAllSuperTypes(superType -> AtomicUtils.atomicSet(superType, this, isAnySubtypeInstantiatedUpdater));

universe.onTypeInstantiated(this);
notifyInstantiatedCallbacks();
Expand Down Expand Up @@ -836,6 +835,10 @@ public Object getInstantiatedReason() {
return isInstantiated;
}

public Object getAnyInstantiatedSubtype() {
return isAnySubtypeInstantiated;
}

public boolean isUnsafeAllocated() {
return AtomicUtils.isSet(this, isUnsafeAllocatedUpdater);
}
Expand Down
10 changes: 10 additions & 0 deletions ...m/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import org.graalvm.collections.EconomicMap;
import org.graalvm.collections.EconomicSet;
Expand Down Expand Up @@ -373,6 +374,15 @@ static void set(Target_jdk_vm_ci_code_TargetDescription receiver, boolean value)
}
}

@TargetClass(className = "jdk.graal.compiler.graphio.GraphProtocol")
final class Target_jdk_graal_compiler_graphio_GraphProtocol {

/** GraphProtocol.badToString can capture hosted only types such as ImageHeapInstance. */
@Alias//
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
private static Set<Class<?>> badToString;
}

/** Dummy class to have a class with the file's name. Do not remove. */
public final class GraalSubstitutions {
// Dummy
Expand Down