Skip to content

[GR-72036] Fix InterceptJSInvokeTypeFlow encountering primitive flow states #12707

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
graalvmbot wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

[GR-72036] Fix InterceptJSInvokeTypeFlow encountering primitive flow states #12707

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
16 changes: 15 additions & 1 deletion ....webimage/src/com/oracle/svm/hosted/webimage/pointsto/flow/InterceptJSInvokeTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
*/
public class InterceptJSInvokeTypeFlow extends TypeFlow<BytecodePosition> {
private final AnalysisMethod targetMethod;
/// One [TypeFlow] per method argument (including receiver for non-static methods at index 0).
/// Contains `null` for primitive arguments, in which case that entry should be ignored.
private final TypeFlow<?>[] arguments;

public InterceptJSInvokeTypeFlow(BytecodePosition source, AnalysisMethod targetMethod, TypeFlow<?>[] arguments) {
Expand Down Expand Up @@ -99,7 +101,16 @@ public void onObservedSaturated(PointsToAnalysis bb, TypeFlow<?> observed) {
// If the input type is saturated, then it must be replaced with the
// all-instantiated-type-flow of the corresponding type parameter.
for (int i = 0; i < this.arguments.length; i++) {
if (this.arguments[i] == observed) {
TypeFlow<?> argument = this.arguments[i];
if (argument == null) {
// Ignore arguments without typeflows (they're primitive type arguments)
continue;
}

// observed == null is used when this method call is deferred (because this flow wasn't
// enabled yet when the observed flow was saturated). In that case, we need to
// conservatively treat all argument flows as saturated.
if (observed == null || argument == observed) {
TypeFlow<?> paramTypeFlow;
if (targetMethod.isStatic()) {
paramTypeFlow = targetMethod.getSignature().getParameterType(i).getTypeFlow(bb, true);
Expand All @@ -110,6 +121,9 @@ public void onObservedSaturated(PointsToAnalysis bb, TypeFlow<?> observed) {
paramTypeFlow = targetMethod.getSignature().getParameterType(i - 1).getTypeFlow(bb, true);
}
}

assert !paramTypeFlow.getState().isPrimitive() : "Found primitive type state for argument " + i + " in method " + this.targetMethod;

this.arguments[i] = paramTypeFlow;
this.arguments[i].addUse(bb, this);
this.arguments[i].addObserver(bb, this);
Expand Down