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

@@ -25,11 +25,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Symbol;
 import jdk.test.lib.jittester.SymbolTable;
 import jdk.test.lib.jittester.Type;
 import jdk.test.lib.jittester.TypeList;

@@ -37,14 +36,13 @@
 import jdk.test.lib.jittester.functions.ArgumentDeclaration;
 import jdk.test.lib.jittester.functions.FunctionDeclaration;
 import jdk.test.lib.jittester.functions.FunctionDefinition;
 import jdk.test.lib.jittester.functions.FunctionInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
-import jdk.test.lib.jittester.types.TypeVoid;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class FunctionDeclarationFactory extends Factory {
+class FunctionDeclarationFactory extends Factory<FunctionDeclaration> {
     private final Type resultType;
     private final TypeKlass ownerClass;
     private final String name;
     private final int memberFunctionsArgLimit;
     private final int flags;

@@ -57,15 +55,15 @@
         this.memberFunctionsArgLimit = memberFunctionsArgLimit;
         this.flags = flags;
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public FunctionDeclaration produce() throws ProductionFailedException {
         Type resType = resultType;
         if (resType == null) {
             List<Type> types = new ArrayList<>(TypeList.getAll());
-            types.add(new TypeVoid());
+            types.add(TypeList.VOID);
             resType = PseudoRandom.randomElement(types);
         }
         int argNumber = (int) (PseudoRandom.random() * memberFunctionsArgLimit);
         ArrayList<VariableInfo> argumentsInfo = new ArrayList<>(argNumber + 1);
         argumentsInfo.add(new VariableInfo("this", ownerClass, ownerClass,