--- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java	2016-05-12 04:24:22.790334626 +0300
+++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CounterManipulatorFactory.java	2016-05-12 04:24:22.714334626 +0300
@@ -27,10 +27,11 @@
 import jdk.test.lib.jittester.LocalVariable;
 import jdk.test.lib.jittester.OperatorKind;
 import jdk.test.lib.jittester.ProductionFailedException;
+import jdk.test.lib.jittester.Statement;
 import jdk.test.lib.jittester.UnaryOperator;
 import jdk.test.lib.jittester.loops.CounterManipulator;
 
-class CounterManipulatorFactory extends Factory {
+class CounterManipulatorFactory extends Factory<CounterManipulator> {
     private final LocalVariable counter;
 
     CounterManipulatorFactory(LocalVariable counter) {
@@ -38,9 +39,9 @@
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public CounterManipulator produce() throws ProductionFailedException {
         // We'll keep it simple for the time being..
         IRNode manipulator = new UnaryOperator(OperatorKind.POST_DEC, counter);
-        return new CounterManipulator(manipulator);
+        return new CounterManipulator(new Statement(manipulator, false));
     }
 }