Account for AbstractAnalysisResultsBuilder.converter being null

Author: olpaw

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/AbstractAnalysisResultsBuilder.java

@@ -27,6 +27,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.api.PointstoOptions;
@@ -38,6 +39,7 @@
 import jdk.vm.ci.meta.JavaMethodProfile;
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.TriState;
 
 public abstract class AbstractAnalysisResultsBuilder {
@@ -126,9 +128,12 @@ private JavaTypeProfile cachedTypeProfile(JavaTypeProfile[] cache, int cacheIdx,
 
     private JavaTypeProfile createTypeProfile(TypeState typeState) {
         double probability = 1d / typeState.typesCount();
-        JavaTypeProfile.ProfiledType[] pitems = typeState.typesStream(bb)
-                        .map(analysisType -> converter == null ? analysisType : converter.lookup(analysisType))
-                        .sorted(converter.hostVM().getTypeComparator())
+
+        Stream<? extends ResolvedJavaType> stream = typeState.typesStream(bb);
+        if (converter != null) {
+            stream = stream.map(converter::lookup).sorted(converter.hostVM().getTypeComparator());
+        }
+        JavaTypeProfile.ProfiledType[] pitems = stream
                         .map(type -> new JavaTypeProfile.ProfiledType(type, probability))
                         .toArray(JavaTypeProfile.ProfiledType[]::new);