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

*** 28,38 ****
  import jdk.test.lib.jittester.LiteralInitializer;
  import jdk.test.lib.jittester.ProductionFailedException;
  import jdk.test.lib.jittester.SymbolTable;
  import jdk.test.lib.jittester.Type;
  import jdk.test.lib.jittester.TypeList;
! import jdk.test.lib.jittester.TypeUtil;
  import jdk.test.lib.jittester.VariableInfo;
  import jdk.test.lib.jittester.loops.CounterInitializer;
  import jdk.test.lib.jittester.types.TypeKlass;
  import jdk.test.lib.jittester.types.TypeInt;
  import jdk.test.lib.jittester.utils.PseudoRandom;
--- 28,38 ----
  import jdk.test.lib.jittester.LiteralInitializer;
  import jdk.test.lib.jittester.ProductionFailedException;
  import jdk.test.lib.jittester.SymbolTable;
  import jdk.test.lib.jittester.Type;
  import jdk.test.lib.jittester.TypeList;
! import jdk.test.lib.jittester.utils.TypeUtil;
  import jdk.test.lib.jittester.VariableInfo;
  import jdk.test.lib.jittester.loops.CounterInitializer;
  import jdk.test.lib.jittester.types.TypeKlass;
  import jdk.test.lib.jittester.types.TypeInt;
  import jdk.test.lib.jittester.utils.PseudoRandom;
*** 46,56 ****
          this.counterValue = counterValue;
      }
  
      @Override
      protected IRNode sproduce() throws ProductionFailedException {
!         List<Type> types = TypeUtil.getMoreCapatiousThan(TypeList.getBuiltIn(), new TypeInt());
          types.add(new TypeInt());
          final Type selectedType = PseudoRandom.randomElement(types);
          IRNode init = new LiteralInitializer(counterValue, selectedType);
          String resultName = "var_" + SymbolTable.getNextVariableNumber();
          VariableInfo varInfo = new VariableInfo(resultName, ownerClass, selectedType,
--- 46,56 ----
          this.counterValue = counterValue;
      }
  
      @Override
      protected IRNode sproduce() throws ProductionFailedException {
!         List<Type> types = TypeUtil.getMoreCapaciousThan(TypeList.getBuiltIn(), new TypeInt());
          types.add(new TypeInt());
          final Type selectedType = PseudoRandom.randomElement(types);
          IRNode init = new LiteralInitializer(counterValue, selectedType);
          String resultName = "var_" + SymbolTable.getNextVariableNumber();
          VariableInfo varInfo = new VariableInfo(resultName, ownerClass, selectedType,