--- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java 2016-05-12 04:24:17.698334666 +0300 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java 2016-05-12 04:24:17.610334667 +0300 @@ -30,7 +30,7 @@ import jdk.test.lib.jittester.ProductionFailedException; import jdk.test.lib.jittester.SymbolTable; import jdk.test.lib.jittester.Type; -import jdk.test.lib.jittester.types.TypeBoolean; +import jdk.test.lib.jittester.TypeList; import jdk.test.lib.jittester.types.TypeKlass; import jdk.test.lib.jittester.utils.PseudoRandom; @@ -42,11 +42,11 @@ @Override protected boolean isApplicable(Type resultType) { - return resultType.equals(new TypeBoolean()); + return resultType.equals(TypeList.BOOLEAN); } @Override - protected Pair generateTypes() throws ProductionFailedException { + protected Pair generateTypes() { return new Pair<>(resultType, resultType); } @@ -81,6 +81,6 @@ } finally { SymbolTable.pop(); } - return new BinaryOperator(opKind, leftOperand, rightOperand); + return new BinaryOperator(opKind, resultType, leftOperand, rightOperand); } }