Refactor points-to packages.

Author: cstancu

substratevm/mx.substratevm/suite.py

@@ -1497,7 +1497,6 @@
                 "com.oracle.graal.pointsto.typestate",
                 "com.oracle.graal.pointsto.infrastructure",
                 "com.oracle.graal.pointsto.flow.context.object",
-                "com.oracle.graal.pointsto.flow.context.free",
                 "com.oracle.graal.pointsto.flow.context.bytecode",
               ],
               "requires": [

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeSensitiveAnalysisPolicy.java

@@ -548,7 +548,7 @@ public TypeState forContextInsensitiveTypeState(PointsToAnalysis bb, TypeState s
                 AnalysisObject analysisObject = type.getContextInsensitiveAnalysisObject();
                 return singleTypeState(bb, state.canBeNull(), makeProperties(bb, analysisObject), analysisObject.type(), analysisObject);
             } else {
-                MultiTypeState multiState = (MultiTypeState) state;
+                ContextSensitiveMultiTypeState multiState = (ContextSensitiveMultiTypeState) state;
                 AnalysisObject[] objectsArray = new AnalysisObject[multiState.typesCount()];
 
                 int i = 0;
@@ -560,7 +560,7 @@ public TypeState forContextInsensitiveTypeState(PointsToAnalysis bb, TypeState s
                  * immutable its types bit set cannot change.
                  */
 
-                BitSet typesBitSet = multiState.typesBitSet();
+                BitSet typesBitSet = multiState.bitSet();
                 int properties = makeProperties(bb, objectsArray);
                 return multiTypeState(bb, multiState.canBeNull(), properties, typesBitSet, objectsArray);
             }
@@ -684,7 +684,7 @@ public TypeState doUnion(PointsToAnalysis bb, MultiTypeState state1, SingleTypeS
 
             int properties = bb.analysisPolicy().makePropertiesForUnion(s1, s2);
 
-            MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, properties, s1.typesBitSet(), resultObjects);
+            MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, properties, s1.bitSet(), resultObjects);
             assert !result.equals(s1);
             /*
              * No need to check the result size against the all-instantiated since the type count
@@ -715,7 +715,7 @@ public TypeState doUnion(PointsToAnalysis bb, MultiTypeState state1, SingleTypeS
             }
 
             /* Create the types bit set by adding the s2 type to avoid walking the objects. */
-            BitSet typesBitSet = TypeStateUtils.set(s1.typesBitSet(), s2.exactType().getId());
+            BitSet typesBitSet = TypeStateUtils.set(s1.bitSet(), s2.exactType().getId());
             int properties = bb.analysisPolicy().makePropertiesForUnion(s1, s2);
 
             MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, properties, typesBitSet, resultObjects);
@@ -760,7 +760,7 @@ private static TypeState doUnion0(PointsToAnalysis bb, ContextSensitiveMultiType
             AnalysisObject[] resultObjects = TypeStateUtils.concat(s1.objects, s2.objects);
 
             /* Logical OR the type bit sets. */
-            BitSet resultTypesBitSet = TypeStateUtils.or(s1.typesBitSet(), s2.typesBitSet());
+            BitSet resultTypesBitSet = TypeStateUtils.or(s1.bitSet(), s2.bitSet());
             int properties = bb.analysisPolicy().makePropertiesForUnion(s1, s2);
 
             MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, properties, resultTypesBitSet, resultObjects);
@@ -774,7 +774,7 @@ private static TypeState doUnion0(PointsToAnalysis bb, ContextSensitiveMultiType
             AnalysisObject[] resultObjects = TypeStateUtils.concat(s2.objects, s1.objects);
 
             /* Logical OR the type bit sets. */
-            BitSet resultTypesBitSet = TypeStateUtils.or(s1.typesBitSet(), s2.typesBitSet());
+            BitSet resultTypesBitSet = TypeStateUtils.or(s1.bitSet(), s2.bitSet());
             int properties = bb.analysisPolicy().makePropertiesForUnion(s1, s2);
 
             MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, properties, resultTypesBitSet, resultObjects);
@@ -797,10 +797,10 @@ private static TypeState doUnion1(PointsToAnalysis bb, ContextSensitiveMultiType
      * Optimization that gives 1.5-3x in performance for the (typeflow) phase.
      */
     private static TypeState allocationInsensitiveSpeculativeUnion1(PointsToAnalysis bb, ContextSensitiveMultiTypeState s1, ContextSensitiveMultiTypeState s2, boolean resultCanBeNull) {
-        if (s1.typesBitSet().length() >= s2.typesBitSet().length()) {
-            long[] bits1 = TypeStateUtils.extractBitSetField(s1.typesBitSet());
-            long[] bits2 = TypeStateUtils.extractBitSetField(s2.typesBitSet());
-            assert s2.typesBitSet().cardinality() == s2.objects.length : "Cardinality and length of objects must match.";
+        if (s1.bitSet().length() >= s2.bitSet().length()) {
+            long[] bits1 = TypeStateUtils.extractBitSetField(s1.bitSet());
+            long[] bits2 = TypeStateUtils.extractBitSetField(s2.bitSet());
+            assert s2.bitSet().cardinality() == s2.objects.length : "Cardinality and length of objects must match.";
 
             boolean speculate = true;
             int numberOfWords = Math.min(bits1.length, bits2.length);
@@ -965,7 +965,7 @@ private static TypeState doUnion2(PointsToAnalysis bb, ContextSensitiveMultiType
             assert resultObjects.size() > 1 : "The result state of a (Multi U Multi) operation must have at least 2 objects";
 
             /* Logical OR the type bit sets. */
-            BitSet resultTypesBitSet = TypeStateUtils.or(s1.typesBitSet(), s2.typesBitSet());
+            BitSet resultTypesBitSet = TypeStateUtils.or(s1.bitSet(), s2.bitSet());
             int properties = bb.analysisPolicy().makePropertiesForUnion(s1, s2);
 
             MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, properties, resultTypesBitSet, resultObjects.copyToArray(new AnalysisObject[resultObjects.size()]));
@@ -1034,12 +1034,12 @@ public TypeState doIntersection(PointsToAnalysis bb, MultiTypeState state1, Mult
     private static 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.typesBitSet().equals(s2.typesBitSet())) {
+        if (s1.bitSet().equals(s2.bitSet())) {
             /* Speculate that s1 and s2 have the same types, i.e., the result is s1. */
             return s1.forCanBeNull(bb, resultCanBeNull);
         }
 
-        if (!s1.typesBitSet().intersects(s2.typesBitSet())) {
+        if (!s1.bitSet().intersects(s2.bitSet())) {
             /* Speculate that s1 and s2 have no types in common, i.e., the result is empty. */
             return TypeState.forEmpty().forCanBeNull(bb, resultCanBeNull);
         }
@@ -1139,7 +1139,7 @@ private static TypeState doIntersection2(PointsToAnalysis bb, ContextSensitiveMu
                     return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, bb.analysisPolicy().makeProperties(bb, objects), objects[0].type(), objects);
                 } else {
                     /* Logical AND the type bit sets. */
-                    BitSet resultTypesBitSet = TypeStateUtils.and(s1.typesBitSet(), s2.typesBitSet());
+                    BitSet resultTypesBitSet = TypeStateUtils.and(s1.bitSet(), s2.bitSet());
                     MultiTypeState result = new ContextSensitiveMultiTypeState(bb, resultCanBeNull, bb.analysisPolicy().makeProperties(bb, objects), resultTypesBitSet, objects);
 
                     /*
@@ -1200,7 +1200,7 @@ public TypeState doSubtraction(PointsToAnalysis bb, MultiTypeState state1, Singl
                 /* Multiple objects of the same type. */
                 return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, bb.analysisPolicy().makeProperties(bb, resultObjects), resultObjects[0].type(), resultObjects);
             } else {
-                BitSet resultTypesBitSet = TypeStateUtils.clear(s1.typesBitSet(), s2.exactType().getId());
+                BitSet resultTypesBitSet = TypeStateUtils.clear(s1.bitSet(), s2.exactType().getId());
                 return new ContextSensitiveMultiTypeState(bb, resultCanBeNull, bb.analysisPolicy().makeProperties(bb, resultObjects), resultTypesBitSet, resultObjects);
             }
 
@@ -1229,12 +1229,12 @@ public TypeState doSubtraction(PointsToAnalysis bb, MultiTypeState state1, Multi
     private static 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.typesBitSet().equals(s2.typesBitSet())) {
+        if (s1.bitSet().equals(s2.bitSet())) {
             /* Speculate that s1 and s2 have the same types, i.e., the result is empty set. */
             return TypeState.forEmpty().forCanBeNull(bb, resultCanBeNull);
         }
 
-        if (!s1.typesBitSet().intersects(s2.typesBitSet())) {
+        if (!s1.bitSet().intersects(s2.bitSet())) {
             /* Speculate that s1 and s2 have no types in common, i.e., the result is s1. */
             return s1.forCanBeNull(bb, resultCanBeNull);
         }
@@ -1323,7 +1323,7 @@ private static TypeState doSubtraction2(PointsToAnalysis bb, ContextSensitiveMul
                     /* Multiple objects of the same type. */
                     return new ContextSensitiveSingleTypeState(bb, resultCanBeNull, bb.analysisPolicy().makeProperties(bb, objects), objects[0].type(), objects);
                 } else {
-                    BitSet resultTypesBitSet = TypeStateUtils.andNot(s1.typesBitSet(), s2.typesBitSet());
+                    BitSet resultTypesBitSet = TypeStateUtils.andNot(s1.bitSet(), s2.bitSet());
                     /*
                      * Don't need to check if the result is close-to-all-instantiated since result
                      * <= s1.

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/ContextSensitiveMultiTypeState.java

@@ -77,6 +77,10 @@ protected ContextSensitiveMultiTypeState(PointsToAnalysis bb, boolean canBeNull,
         PointsToStats.registerTypeState(bb, this);
     }
 
+    protected BitSet bitSet() {
+        return typesBitSet;
+    }
+
     /**
      * Returns an array of all type ids from the {@link #objects} array. This mitigates the CPU
      * cache misses when iterating over all AnalysisObject and dereferencing the type field over and

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/free/DefaultAnalysisContext.java renamed to substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisContext.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.graal.pointsto.flow.context.free;
+package com.oracle.graal.pointsto.typestate;
 
 import com.oracle.graal.pointsto.flow.context.AnalysisContext;
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/free/DefaultAnalysisContextPolicy.java renamed to substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisContextPolicy.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.graal.pointsto.flow.context.free;
+package com.oracle.graal.pointsto.typestate;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.MethodTypeFlow;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/free/DefaultAnalysisPolicy.java renamed to substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisPolicy.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.graal.pointsto.flow.context.free;
+package com.oracle.graal.pointsto.typestate;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -52,11 +52,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
-import com.oracle.graal.pointsto.typestate.MultiTypeState;
-import com.oracle.graal.pointsto.typestate.PointsToStats;
-import com.oracle.graal.pointsto.typestate.SingleTypeState;
-import com.oracle.graal.pointsto.typestate.TypeState;
-import com.oracle.graal.pointsto.typestate.TypeStateUtils;
 import com.oracle.graal.pointsto.typestore.ArrayElementsTypeStore;
 import com.oracle.graal.pointsto.typestore.FieldTypeStore;
 import com.oracle.graal.pointsto.typestore.UnifiedArrayElementsTypeStore;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java

@@ -104,7 +104,7 @@ public int typesCount() {
         return typesCount;
     }
 
-    public BitSet typesBitSet() {
+    protected BitSet typesBitSet() {
         return typesBitSet;
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java

@@ -131,7 +131,7 @@
 import com.oracle.graal.pointsto.AnalysisPolicy;
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.flow.context.bytecode.BytecodeSensitiveAnalysisPolicy;
-import com.oracle.graal.pointsto.flow.context.free.DefaultAnalysisPolicy;
+import com.oracle.graal.pointsto.typestate.DefaultAnalysisPolicy;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;