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

*** 27,52 ****
  import jdk.test.lib.jittester.OperatorKind;
  import jdk.test.lib.jittester.ProductionFailedException;
  import jdk.test.lib.jittester.ProductionLimiter;
  import jdk.test.lib.jittester.ProductionParams;
  import jdk.test.lib.jittester.Rule;
! import jdk.test.lib.jittester.Type;;
  import jdk.test.lib.jittester.types.TypeKlass;
  
! class ExpressionFactory extends SafeFactory {
!     private final Rule rule;
  
      ExpressionFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass, Type resultType,
              boolean exceptionSafe, boolean noconsts) throws ProductionFailedException {
          IRNodeBuilder builder = new IRNodeBuilder()
                  .setComplexityLimit(complexityLimit)
                  .setOperatorLimit(operatorLimit)
                  .setOwnerKlass(ownerClass)
                  .setResultType(resultType)
                  .setExceptionSafe(exceptionSafe)
                  .setNoConsts(noconsts);
!         rule = new Rule("expression");
          if (!noconsts) {
              rule.add("literal", builder.getLiteralFactory());
              rule.add("constant", builder.setIsConstant(true)
                      .setIsInitialized(true)
                      //.setVariableType(resultType)
--- 27,52 ----
  import jdk.test.lib.jittester.OperatorKind;
  import jdk.test.lib.jittester.ProductionFailedException;
  import jdk.test.lib.jittester.ProductionLimiter;
  import jdk.test.lib.jittester.ProductionParams;
  import jdk.test.lib.jittester.Rule;
! import jdk.test.lib.jittester.Type;
  import jdk.test.lib.jittester.types.TypeKlass;
  
! class ExpressionFactory extends SafeFactory<IRNode> {
!     private final Rule<IRNode> rule;
  
      ExpressionFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass, Type resultType,
              boolean exceptionSafe, boolean noconsts) throws ProductionFailedException {
          IRNodeBuilder builder = new IRNodeBuilder()
                  .setComplexityLimit(complexityLimit)
                  .setOperatorLimit(operatorLimit)
                  .setOwnerKlass(ownerClass)
                  .setResultType(resultType)
                  .setExceptionSafe(exceptionSafe)
                  .setNoConsts(noconsts);
!         rule = new Rule<>("expression");
          if (!noconsts) {
              rule.add("literal", builder.getLiteralFactory());
              rule.add("constant", builder.setIsConstant(true)
                      .setIsInitialized(true)
                      //.setVariableType(resultType)