Skip to content

[GR-60300] Fix -H:+PrintPointsToStatistics option and make it compatible with WP-SCCP #10281

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

[GR-60300] Fix -H:+PrintPointsToStatistics option and make it compatible with WP-SCCP #10281

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 ...m.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public boolean forPrimitiveFieldValue(JavaConstant receiver, AnalysisField field
/* Add the constant value object to the field's type flow. */
FieldTypeFlow fieldTypeFlow = getFieldTypeFlow(field, receiver);
/* Add the new constant to the field's flow state. */
return fieldTypeFlow.addState(analysis, TypeState.forPrimitiveConstant(fieldValue.asLong()));
return fieldTypeFlow.addState(analysis, TypeState.forPrimitiveConstant(analysis, fieldValue.asLong()));
}

/**
Expand Down
10 changes: 5 additions & 5 deletions ...rc/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/BooleanCheckTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ protected BooleanCheckTypeFlow(BooleanCheckTypeFlow original, MethodFlowsGraph m
super(original, methodFlows);
}

protected static TypeState convertToBoolean(boolean canBeTrue, boolean canBeFalse) {
protected static TypeState convertToBoolean(PointsToAnalysis bb, boolean canBeTrue, boolean canBeFalse) {
if (canBeTrue && canBeFalse) {
return TypeState.anyPrimitiveState();
} else if (canBeTrue) {
return TypeState.forBoolean(true);
return TypeState.forBoolean(bb, true);
} else if (canBeFalse) {
return TypeState.forBoolean(false);
return TypeState.forBoolean(bb, false);
}
return TypeState.forEmpty();
}

protected static TypeState convertToBoolean(TypeState trueState, TypeState falseState) {
return convertToBoolean(trueState.isNotEmpty(), falseState.isNotEmpty());
protected static TypeState convertToBoolean(PointsToAnalysis bb, TypeState trueState, TypeState falseState) {
return convertToBoolean(bb, trueState.isNotEmpty(), falseState.isNotEmpty());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...cle.graal.pointsto/src/com/oracle/graal/pointsto/flow/BooleanInstanceOfCheckTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ public TypeState filter(PointsToAnalysis bb, TypeState update) {
canBeTrue = TypeState.forIntersection(bb, update, checkedType.getAssignableTypes(includeNull));
canBeFalse = TypeState.forSubtraction(bb, update, checkedType.getAssignableTypes(includeNull));
}
return convertToBoolean(canBeTrue, canBeFalse);
return convertToBoolean(bb, canBeTrue, canBeFalse);
}
}
2 changes: 1 addition & 1 deletion ...om.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/BooleanNullCheckTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ public TypeFlow<BytecodePosition> copy(PointsToAnalysis bb, MethodFlowsGraph met
public TypeState filter(PointsToAnalysis bb, TypeState newState) {
var hasNull = newState.canBeNull();
var hasTypes = newState.typesCount() > 0;
return convertToBoolean(hasNull, hasTypes);
return convertToBoolean(bb, hasNull, hasTypes);
}
}
2 changes: 1 addition & 1 deletion ...acle.graal.pointsto/src/com/oracle/graal/pointsto/flow/BooleanPrimitiveCheckTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ public TypeState eval(PointsToAnalysis bb) {
}
assert leftState.isPrimitive() : left;
assert rightState.isPrimitive() : right;
return convertToBoolean(TypeState.filter(leftState, comparison, rightState), TypeState.filter(leftState, comparison.negate(), rightState));
return convertToBoolean(bb, TypeState.filter(leftState, comparison, rightState), TypeState.filter(leftState, comparison.negate(), rightState));
}
}
4 changes: 2 additions & 2 deletions ...le.graal.pointsto/src/com/oracle/graal/pointsto/flow/ConstantPrimitiveSourceTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

public class ConstantPrimitiveSourceTypeFlow extends TypeFlow<BytecodePosition> implements PrimitiveFlow {

public ConstantPrimitiveSourceTypeFlow(BytecodePosition source, AnalysisType type, long value) {
super(source, type, TypeState.forPrimitiveConstant(value));
public ConstantPrimitiveSourceTypeFlow(BytecodePosition source, AnalysisType type, TypeState state) {
super(source, type, state);
}

public ConstantPrimitiveSourceTypeFlow(ConstantPrimitiveSourceTypeFlow original, MethodFlowsGraph methodFlows) {
Expand Down
6 changes: 3 additions & 3 deletions ...c/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public static void registerUsedElements(PointsToAnalysis bb, StructuredGraph gra
type.registerAsInstantiated(AbstractAnalysisEngine.sourcePosition(node));
for (var f : type.getInstanceFields(true)) {
var field = (AnalysisField) f;
field.getInitialFlow().addState(bb, TypeState.defaultValueForKind(field.getStorageKind()));
field.getInitialFlow().addState(bb, TypeState.defaultValueForKind(bb, field.getStorageKind()));
}
}

Expand Down Expand Up @@ -829,7 +829,7 @@ protected TypeFlowBuilder<?> handleIntegerStamp(IntegerStamp stamp, ValueNode no
long hi = stamp.upperBound();
if (lo == hi) {
return TypeFlowBuilder.create(bb, method, getPredicate(), node, ConstantPrimitiveSourceTypeFlow.class, () -> {
var flow = new ConstantPrimitiveSourceTypeFlow(AbstractAnalysisEngine.sourcePosition(node), type, lo);
var flow = new ConstantPrimitiveSourceTypeFlow(AbstractAnalysisEngine.sourcePosition(node), type, TypeState.forPrimitiveConstant(bb, lo));
flowsGraph.addMiscEntryFlow(flow);
return flow;
});
Expand Down Expand Up @@ -1947,7 +1947,7 @@ protected void processCommitAllocation(CommitAllocationNode commitAllocationNode
} else {
if (!type.isArray()) {
AnalysisField field = (AnalysisField) ((VirtualInstanceNode) virtualObject).field(i);
field.getInitialFlow().addState(bb, TypeState.defaultValueForKind(field.getStorageKind()));
field.getInitialFlow().addState(bb, TypeState.defaultValueForKind(bb, field.getStorageKind()));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/NewInstanceTypeFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected void onFlowEnabled(PointsToAnalysis bb) {
if (insertDefaultFieldValues) {
for (var f : declaredType.getInstanceFields(true)) {
var field = (AnalysisField) f;
field.getInitialFlow().addState(bb, TypeState.defaultValueForKind(field.getStorageKind()));
field.getInitialFlow().addState(bb, TypeState.defaultValueForKind(bb, field.getStorageKind()));
}
}
}
Expand Down
46 changes: 23 additions & 23 deletions .../src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeSensitiveAnalysisPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,12 +430,12 @@ public TypeState forContextInsensitiveTypeState(PointsToAnalysis bb, TypeState s

@Override
public SingleTypeState singleTypeState(PointsToAnalysis bb, boolean canBeNull, AnalysisType type, AnalysisObject... objects) {
return new ContextSensitiveSingleTypeState(bb, canBeNull, type, objects);
return PointsToStats.registerTypeState(bb, new ContextSensitiveSingleTypeState(canBeNull, type, objects));
}

@Override
public MultiTypeState multiTypeState(PointsToAnalysis bb, boolean canBeNull, BitSet typesBitSet, int typesCount, AnalysisObject... objects) {
return new ContextSensitiveMultiTypeState(bb, canBeNull, typesBitSet, typesCount, objects);
return PointsToStats.registerTypeState(bb, new ContextSensitiveMultiTypeState(canBeNull, typesBitSet, typesCount, objects));
}

@Override
Expand Down Expand Up @@ -466,7 +466,7 @@ public TypeState doUnion(PointsToAnalysis bb, SingleTypeState state1, SingleType
assert !Arrays.equals(resultObjects, s1.objects) && !Arrays.equals(resultObjects, s2.objects) : resultObjects;

/* Create the resulting exact type state. */
SingleTypeState result = new ContextSensitiveSingleTypeState(bb, resultCanBeNull, s1.exactType(), resultObjects);
SingleTypeState result = singleTypeState(bb, resultCanBeNull, s1.exactType(), resultObjects);
assert !s1.equals(result) && !s2.equals(result) : result;
PointsToStats.registerUnionOperation(bb, s1, s2, result);
return result;
Expand All @@ -482,7 +482,7 @@ public TypeState doUnion(PointsToAnalysis bb, SingleTypeState state1, SingleType
/* We know the types, construct the types bit set without walking the objects. */
BitSet typesBitSet = TypeStateUtils.newBitSet(s1.exactType().getId(), s2.exactType().getId());
assert typesBitSet.cardinality() == 2 : typesBitSet;
TypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, typesBitSet, 2, resultObjects);
TypeState result = multiTypeState(bb, resultCanBeNull, typesBitSet, 2, resultObjects);
PointsToStats.registerUnionOperation(bb, s1, s2, result);
return result;
}
Expand Down Expand Up @@ -542,7 +542,7 @@ public TypeState doUnion(PointsToAnalysis bb, MultiTypeState state1, SingleTypeS
System.arraycopy(so1, typeRange.right(), resultObjects, typeRange.left() + unionObjects.length, so1.length - typeRange.right());

/* The types bit set of the result and s1 are the same. */
MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, s1.bitSet(), s1.typesCount(), resultObjects);
MultiTypeState result = multiTypeState(bb, resultCanBeNull, s1.bitSet(), s1.typesCount(), resultObjects);
assert !result.equals(s1) : result;
/*
* No need to check the result size against the all-instantiated since the type count
Expand Down Expand Up @@ -576,7 +576,7 @@ public TypeState doUnion(PointsToAnalysis bb, MultiTypeState state1, SingleTypeS
BitSet typesBitSet = TypeStateUtils.set(s1.bitSet(), s2.exactType().getId());
int typesCount = s1.typesCount() + 1;
assert typesCount == typesBitSet.cardinality() : typesCount;
MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, typesBitSet, typesCount, resultObjects);
MultiTypeState result = multiTypeState(bb, resultCanBeNull, typesBitSet, typesCount, resultObjects);
PointsToStats.registerUnionOperation(bb, s1, s2, result);
return result;
}
Expand Down Expand Up @@ -621,7 +621,7 @@ private TypeState doUnion0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s
BitSet resultTypesBitSet = TypeStateUtils.or(s1.bitSet(), s2.bitSet());
int typesCount = s1.typesCount() + s2.typesCount();
assert typesCount == resultTypesBitSet.cardinality() : typesCount;
MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, resultTypesBitSet, typesCount, resultObjects);
MultiTypeState result = multiTypeState(bb, resultCanBeNull, resultTypesBitSet, typesCount, resultObjects);
PointsToStats.registerUnionOperation(bb, s1, s2, result);
return result;

Expand All @@ -635,7 +635,7 @@ private TypeState doUnion0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s
BitSet resultTypesBitSet = TypeStateUtils.or(s1.bitSet(), s2.bitSet());
int typesCount = s1.typesCount() + s2.typesCount();
assert typesCount == resultTypesBitSet.cardinality() : typesCount;
MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, resultTypesBitSet, typesCount, resultObjects);
MultiTypeState result = multiTypeState(bb, resultCanBeNull, resultTypesBitSet, typesCount, resultObjects);
PointsToStats.registerUnionOperation(bb, s1, s2, result);
return result;
}
Expand Down Expand Up @@ -824,7 +824,7 @@ private TypeState doUnion2(PointsToAnalysis bb, ContextSensitiveMultiTypeState s

/* Logical OR the type bit sets. */
BitSet resultTypesBitSet = TypeStateUtils.or(s1.bitSet(), s2.bitSet());
MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, resultTypesBitSet, resultTypesBitSet.cardinality(),
MultiTypeState result = multiTypeState(bb, resultCanBeNull, resultTypesBitSet, resultTypesBitSet.cardinality(),
resultObjects.copyToArray(new AnalysisObject[resultObjects.size()]));
assert !result.equals(s1) : "speculation code should prevent this case";

Expand Down Expand Up @@ -874,7 +874,7 @@ public TypeState doIntersection(PointsToAnalysis bb, MultiTypeState s1, SingleTy
AnalysisObject[] resultObjects = ((ContextSensitiveMultiTypeState) s1).objectsArray(s2.exactType());
/* All objects must have the same type. */
assert TypeStateUtils.holdsSingleTypeState(resultObjects);
return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, s2.exactType(), resultObjects);
return singleTypeState(bb, resultCanBeNull, s2.exactType(), resultObjects);
} else {
return TypeState.forEmpty().forCanBeNull(bb, resultCanBeNull);
}
Expand All @@ -900,7 +900,7 @@ public TypeState doIntersection(PointsToAnalysis bb, MultiTypeState state1, Mult
return doIntersection0(bb, s1, s2, resultCanBeNull);
}

private static TypeState doIntersection0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
private TypeState doIntersection0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
/* Speculate that s1 and s2 have either the same types, or no types in common. */

if (s1.bitSet().equals(s2.bitSet())) {
Expand All @@ -916,7 +916,7 @@ private static TypeState doIntersection0(PointsToAnalysis bb, ContextSensitiveMu
return doIntersection1(bb, s1, s2, resultCanBeNull);
}

private static TypeState doIntersection1(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
private TypeState doIntersection1(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
/*
* Speculate that s2 contains all types of s1, i.e., the filter is broader than s1, thus the
* result is s1.
Expand Down Expand Up @@ -964,7 +964,7 @@ private static TypeState doIntersection1(PointsToAnalysis bb, ContextSensitiveMu

private static ThreadLocal<ListUtils.UnsafeArrayListClosable<AnalysisObject>> intersectionArrayListTL = new ThreadLocal<>();

private static TypeState doIntersection2(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull, int idx1Param, int idx2Param) {
private TypeState doIntersection2(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull, int idx1Param, int idx2Param) {

try (ListUtils.UnsafeArrayListClosable<AnalysisObject> tlArrayClosable = ListUtils.getTLArrayList(intersectionArrayListTL, 256)) {
ListUtils.UnsafeArrayList<AnalysisObject> resultObjects = tlArrayClosable.list();
Expand Down Expand Up @@ -1007,11 +1007,11 @@ private static TypeState doIntersection2(PointsToAnalysis bb, ContextSensitiveMu

if (TypeStateUtils.holdsSingleTypeState(objects, objects.length)) {
/* Multiple objects of the same type. */
return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, objects[0].type(), objects);
return singleTypeState(bb, resultCanBeNull, objects[0].type(), objects);
} else {
/* Logical AND the type bit sets. */
BitSet resultTypesBitSet = TypeStateUtils.and(s1.bitSet(), s2.bitSet());
MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, resultTypesBitSet, resultTypesBitSet.cardinality(), objects);
MultiTypeState result = multiTypeState(bb, resultCanBeNull, resultTypesBitSet, resultTypesBitSet.cardinality(), objects);

/*
* The result can be equal to s1 if and only if s1 and s2 have the same type
Expand Down Expand Up @@ -1077,15 +1077,15 @@ public TypeState doSubtraction(PointsToAnalysis bb, MultiTypeState state1, Singl
System.arraycopy(s1.objects, typeRange.right(), resultObjects, typeRange.left(), s1.objects.length - typeRange.right());

if (resultObjects.length == 1) {
return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, resultObjects[0].type(), resultObjects[0]);
return singleTypeState(bb, resultCanBeNull, resultObjects[0].type(), resultObjects[0]);
} else if (TypeStateUtils.holdsSingleTypeState(resultObjects)) {
/* Multiple objects of the same type. */
return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, resultObjects[0].type(), resultObjects);
return singleTypeState(bb, resultCanBeNull, resultObjects[0].type(), resultObjects);
} else {
BitSet resultTypesBitSet = TypeStateUtils.clear(s1.bitSet(), s2.exactType().getId());
int typesCount = s1.typesCount() - 1;
assert typesCount == resultTypesBitSet.cardinality() : typesCount;
return new ContextSensitiveMultiTypeState(bb, resultCanBeNull, resultTypesBitSet, typesCount, resultObjects);
return multiTypeState(bb, resultCanBeNull, resultTypesBitSet, typesCount, resultObjects);
}

} else {
Expand All @@ -1110,7 +1110,7 @@ public TypeState doSubtraction(PointsToAnalysis bb, MultiTypeState state1, Multi
return doSubtraction0(bb, s1, s2, resultCanBeNull);
}

private static TypeState doSubtraction0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
private TypeState doSubtraction0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
/* Speculate that s1 and s2 have either the same types, or no types in common. */

if (s1.bitSet().equals(s2.bitSet())) {
Expand All @@ -1126,7 +1126,7 @@ private static TypeState doSubtraction0(PointsToAnalysis bb, ContextSensitiveMul
return doSubtraction1(bb, s1, s2, resultCanBeNull);
}

private static TypeState doSubtraction1(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
private TypeState doSubtraction1(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
/*
* Speculate that s1 and s2 have no overlap, i.e., they don't have any objects in common. In
* that case, the result is just s1.
Expand Down Expand Up @@ -1162,7 +1162,7 @@ private static TypeState doSubtraction1(PointsToAnalysis bb, ContextSensitiveMul
return doSubtraction2(bb, s1, s2, resultCanBeNull, idx1, idx2);
}

private static TypeState doSubtraction2(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull, int idx1Param, int idx2Param) {
private TypeState doSubtraction2(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull, int idx1Param, int idx2Param) {
try (ListUtils.UnsafeArrayListClosable<AnalysisObject> tlArrayClosable = ListUtils.getTLArrayList(intersectionArrayListTL, 256)) {
ListUtils.UnsafeArrayList<AnalysisObject> resultObjects = tlArrayClosable.list();

Expand Down Expand Up @@ -1207,14 +1207,14 @@ private static TypeState doSubtraction2(PointsToAnalysis bb, ContextSensitiveMul

if (TypeStateUtils.holdsSingleTypeState(objects, totalLength)) {
/* Multiple objects of the same type. */
return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, objects[0].type(), objects);
return singleTypeState(bb, resultCanBeNull, objects[0].type(), objects);
} else {
BitSet resultTypesBitSet = TypeStateUtils.andNot(s1.bitSet(), s2.bitSet());
/*
* Don't need to check if the result is close-to-all-instantiated since result
* <= s1.
*/
return new ContextSensitiveMultiTypeState(bb, resultCanBeNull, resultTypesBitSet, resultTypesBitSet.cardinality(), objects);
return multiTypeState(bb, resultCanBeNull, resultTypesBitSet, resultTypesBitSet.cardinality(), objects);
}
}
}
Expand Down
Loading