test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java

*** 26,36 ****
  import jdk.test.lib.Pair;
  import jdk.test.lib.jittester.OperatorKind;
  import jdk.test.lib.jittester.ProductionFailedException;
  import jdk.test.lib.jittester.Type;
  import jdk.test.lib.jittester.TypeList;
- import jdk.test.lib.jittester.types.TypeBoolean;
  import jdk.test.lib.jittester.types.TypeKlass;
  import jdk.test.lib.jittester.utils.PseudoRandom;
  
  import java.util.ArrayList;
  import java.util.List;
--- 26,35 ----
*** 41,56 ****
          super(opKind, complexityLimit, operatorLimit, ownerClass, resultType, exceptionSafe, noconsts);
      }
  
      @Override
      protected boolean isApplicable(Type resultType) {
!         return resultType.equals(new TypeBoolean());
      }
  
      @Override
!     protected Pair<Type, Type> generateTypes() throws ProductionFailedException {
          final List<Type> builtInExceptBoolean = new ArrayList<>(TypeList.getBuiltIn());
!         builtInExceptBoolean.remove(new TypeBoolean());
          return new Pair<>(PseudoRandom.randomElement(builtInExceptBoolean),
                  PseudoRandom.randomElement(builtInExceptBoolean));
      }
  }
--- 40,55 ----
          super(opKind, complexityLimit, operatorLimit, ownerClass, resultType, exceptionSafe, noconsts);
      }
  
      @Override
      protected boolean isApplicable(Type resultType) {
!         return resultType.equals(TypeList.BOOLEAN);
      }
  
      @Override
!     protected Pair<Type, Type> generateTypes() {
          final List<Type> builtInExceptBoolean = new ArrayList<>(TypeList.getBuiltIn());
!         builtInExceptBoolean.remove(TypeList.BOOLEAN);
          return new Pair<>(PseudoRandom.randomElement(builtInExceptBoolean),
                  PseudoRandom.randomElement(builtInExceptBoolean));
      }
  }