--- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java 2016-05-12 04:24:01.022334800 +0300 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/If.java 2016-05-12 04:24:00.930334801 +0300 @@ -30,9 +30,10 @@ CONDITION, THEN, ELSE, - }; + } - public If(IRNode condition, IRNode thenBlock, IRNode elseBlock, int level) { + public If(IRNode condition, Block thenBlock, Block elseBlock, int level) { + super(thenBlock.getResultType()); this.level = level; resizeUpChildren(IfPart.values().length); setChild(IfPart.CONDITION.ordinal(), condition); @@ -43,7 +44,7 @@ @Override public long complexity() { IRNode condition = getChild(IfPart.CONDITION.ordinal()); - IRNode thenBlock= getChild(IfPart.THEN.ordinal()); + IRNode thenBlock = getChild(IfPart.THEN.ordinal()); IRNode elseBlock = getChild(IfPart.ELSE.ordinal()); return (condition != null ? condition.complexity() : 0) + Math.max(thenBlock != null ? thenBlock.complexity() : 0,