test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/types/TypeKlass.java

rev 53171 : 8158646: [jittester] generated tests may not compile by javac
Reviewed-by: duke

*** 23,32 ****
--- 23,33 ----
  
  package jdk.test.lib.jittester.types;
  
  import java.util.Collection;
  import java.util.HashSet;
+ import java.util.Objects;
  import java.util.TreeSet;
  import jdk.test.lib.jittester.ProductionParams;
  import jdk.test.lib.jittester.Symbol;
  import jdk.test.lib.jittester.SymbolTable;
  import jdk.test.lib.jittester.Type;
*** 122,151 ****
  
      public TreeSet<TypeKlass> getAllParents() {
          TreeSet<TypeKlass> result = new TreeSet<>();
          parentsList.stream()
                  .map(TypeList::find)
!                 .filter(parentKlass -> parentKlass != null)
!                 .map(parentKlass -> (TypeKlass) parentKlass)
!                 .forEach(parentKlass -> {
!                     result.add(parentKlass);
!                     result.addAll(parentKlass.getAllParents());
          });
          return result;
      }
  
      public TreeSet<TypeKlass> getAllChildren() {
!         TreeSet<TypeKlass> r = new TreeSet<>();
          childrenList.stream()
                  .map(TypeList::find)
!                 .filter(childKlass -> childKlass != null)
!                 .map(childKlass -> (TypeKlass) childKlass)
!                 .forEach(childKlass -> {
!                     r.add(childKlass);
!                     r.addAll(childKlass.getAllChildren());
          });
!         return r;
      }
  
      @Override
      public boolean canImplicitlyCastTo(Type t) {
          // We can implicitly cast to anything up the hierarchy and to self
--- 123,154 ----
  
      public TreeSet<TypeKlass> getAllParents() {
          TreeSet<TypeKlass> result = new TreeSet<>();
          parentsList.stream()
                  .map(TypeList::find)
!                 .filter(Objects::nonNull)
!                 .map(k -> (TypeKlass) k)
!                 .forEach(k -> {
!                     if (result.add(k)) {
!                         result.addAll(k.getAllParents());
!                     }
          });
          return result;
      }
  
      public TreeSet<TypeKlass> getAllChildren() {
!         TreeSet<TypeKlass> result = new TreeSet<>();
          childrenList.stream()
                  .map(TypeList::find)
!                 .filter(Objects::nonNull)
!                 .map(k -> (TypeKlass) k)
!                 .forEach(k -> {
!                     if (result.add(k)) {
!                         result.addAll(k.getAllChildren());
!                     }
          });
!         return result;
      }
  
      @Override
      public boolean canImplicitlyCastTo(Type t) {
          // We can implicitly cast to anything up the hierarchy and to self