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

@@ -31,11 +31,11 @@
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-abstract class BinaryOperatorFactory extends OperatorFactory {
+abstract class BinaryOperatorFactory extends OperatorFactory<BinaryOperator> {
     protected final OperatorKind opKind;
     protected final Type resultType;
     protected final Type ownerClass;
 
     protected BinaryOperatorFactory(OperatorKind opKind, long complexityLimit, int operatorLimit,

@@ -46,11 +46,11 @@
         this.ownerClass = ownerClass;
     }
 
     protected abstract boolean isApplicable(Type resultType);
 
-    protected abstract Pair<Type, Type> generateTypes() throws ProductionFailedException;
+    protected abstract Pair<Type, Type> generateTypes();
 
     protected BinaryOperator generateProduction(Type leftType, Type rightType) throws ProductionFailedException {
         int leftOpLimit = (int) (PseudoRandom.random() * (operatorLimit - 1));
         int rightOpLimit = operatorLimit - 1 - leftOpLimit;
         long leftComplLimit = (long) (PseudoRandom.random() * (complexityLimit - 1));

@@ -70,15 +70,15 @@
         IRNode rightExpr = builder.setComplexityLimit(rightComplLimit)
                 .setOperatorLimit(rightOpLimit)
                 .setResultType(rightType)
                 .getExpressionFactory()
                 .produce();
-        return new BinaryOperator(opKind, leftExpr, rightExpr);
+        return new BinaryOperator(opKind, resultType, leftExpr, rightExpr);
     }
 
     @Override
-    public final IRNode produce() throws ProductionFailedException {
+    public final BinaryOperator produce() throws ProductionFailedException {
         if (!isApplicable(resultType)) {
             //avoid implicit use of resultType.toString()
             throw new ProductionFailedException("Type " + resultType.getName() + " is not applicable by " + getClass().getName());
         }
 

@@ -89,11 +89,11 @@
             throw new ProductionFailedException(ex.getMessage());
         }
 
         try {
             SymbolTable.push();
-            IRNode p = generateProduction(types.first, types.second);
+            BinaryOperator p = generateProduction(types.first, types.second);
             SymbolTable.merge();
             return p;
         } catch (ProductionFailedException e) {
             SymbolTable.pop();
             throw e;