--- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java	2016-05-12 04:24:43.950334456 +0300
+++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/VariableFactory.java	2016-05-12 04:24:43.858334457 +0300
@@ -23,15 +23,15 @@
 
 package jdk.test.lib.jittester.factories;
 
-import jdk.test.lib.jittester.IRNode;
 import jdk.test.lib.jittester.ProductionFailedException;
 import jdk.test.lib.jittester.Rule;
 import jdk.test.lib.jittester.Type;
+import jdk.test.lib.jittester.VariableBase;
 import jdk.test.lib.jittester.VariableInfo;
 import jdk.test.lib.jittester.types.TypeKlass;
 
-class VariableFactory extends Factory {
-    private final Rule rule;
+class VariableFactory extends Factory<VariableBase> {
+    private final Rule<VariableBase> rule;
 
     VariableFactory(long complexityLimit, int operatorLimit, TypeKlass ownerClass, Type resultType,
             boolean constant, boolean initialized, boolean exceptionSafe, boolean noconsts) {
@@ -42,7 +42,7 @@
         if (initialized) {
             flags |= VariableInfo.INITIALIZED;
         }
-        rule = new Rule("variable");
+        rule = new Rule<>("variable");
         IRNodeBuilder b = new IRNodeBuilder().setResultType(resultType)
                 .setFlags(flags)
                 .setComplexityLimit(complexityLimit)
@@ -55,7 +55,7 @@
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public VariableBase produce() throws ProductionFailedException {
         return rule.produce();
     }
 }