Get the typeId already cached in the AnalysisObject.

Author: cstancu

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

@@ -540,9 +540,9 @@ public TypeState doUnion(PointsToAnalysis bb, MultiTypeState state1, SingleTypeS
             return result;
         } else {
             AnalysisObject[] resultObjects;
-            if (s2.exactType().getId() < s1.firstType().getId()) {
+            if (s2.exactType().getId() < s1.firstTypeId()) {
                 resultObjects = TypeStateUtils.concat(so2, so1);
-            } else if (s2.exactType().getId() > s1.lastType().getId()) {
+            } else if (s2.exactType().getId() > s1.lastTypeId()) {
                 resultObjects = TypeStateUtils.concat(so1, so2);
             } else {
 
@@ -599,7 +599,7 @@ private TypeState doUnion0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s
 
         /* Speculate that s1 and s2 are distinct sets. */
 
-        if (s1.lastType().getId() < s2.firstType().getId()) {
+        if (s1.lastTypeId() < s2.firstTypeId()) {
             /* Speculate that objects in s2 follow after objects in s1. */
 
             /* Concatenate the objects. */
@@ -613,7 +613,7 @@ private TypeState doUnion0(PointsToAnalysis bb, ContextSensitiveMultiTypeState s
             PointsToStats.registerUnionOperation(bb, s1, s2, result);
             return result;
 
-        } else if (s2.lastType().getId() < s1.firstType().getId()) {
+        } else if (s2.lastTypeId() < s1.firstTypeId()) {
             /* Speculate that objects in s1 follow after objects in s2. */
 
             /* Concatenate the objects. */

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

@@ -111,14 +111,18 @@ protected Iterator<AnalysisObject> objectsIterator(BigBang bb) {
         return Arrays.asList(objects).iterator();
     }
 
-    /** Get the type of the first object group. */
-    public AnalysisType firstType() {
-        return objects[0].type();
+    /**
+     * Get the type of the first object group.
+     */
+    public int firstTypeId() {
+        return objects[0].getTypeId();
     }
 
-    /** Get the type of the last object group. */
-    public AnalysisType lastType() {
-        return objects[objects.length - 1].type();
+    /**
+     * Get the type of the last object group.
+     */
+    public int lastTypeId() {
+        return objects[objects.length - 1].getTypeId();
     }
 
     @Override