1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Feb 25 11:04:11 2010 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Feb 25 12:26:39 2010 -0800
1.3 @@ -808,8 +808,8 @@
1.4 code.resolve(secondJumps);
1.5 CondItem second = genCond(tree.falsepart, CRT_FLOW_TARGET);
1.6 CondItem result = items.makeCondItem(second.opcode,
1.7 - code.mergeChains(trueJumps, second.trueJumps),
1.8 - code.mergeChains(falseJumps, second.falseJumps));
1.9 + Code.mergeChains(trueJumps, second.trueJumps),
1.10 + Code.mergeChains(falseJumps, second.falseJumps));
1.11 if (markBranches) result.tree = tree.falsepart;
1.12 return result;
1.13 } else {
1.14 @@ -1322,7 +1322,7 @@
1.15 if (useJsrLocally) {
1.16 if (tree.finalizer != null) {
1.17 Code.State jsrState = code.state.dup();
1.18 - jsrState.push(code.jsrReturnValue);
1.19 + jsrState.push(Code.jsrReturnValue);
1.20 tryEnv.info.cont =
1.21 new Chain(code.emitJump(jsr),
1.22 tryEnv.info.cont,
1.23 @@ -1375,7 +1375,7 @@
1.24 genFinalizer(env);
1.25 if (hasFinalizer || l.tail.nonEmpty()) {
1.26 code.statBegin(TreeInfo.endPos(env.tree));
1.27 - exitChain = code.mergeChains(exitChain,
1.28 + exitChain = Code.mergeChains(exitChain,
1.29 code.branch(goto_));
1.30 }
1.31 endFinalizerGap(env);
1.32 @@ -1963,7 +1963,7 @@
1.33 result = items.
1.34 makeCondItem(rcond.opcode,
1.35 rcond.trueJumps,
1.36 - code.mergeChains(falseJumps,
1.37 + Code.mergeChains(falseJumps,
1.38 rcond.falseJumps));
1.39 } else {
1.40 result = lcond;
1.41 @@ -1976,7 +1976,7 @@
1.42 CondItem rcond = genCond(tree.rhs, CRT_FLOW_TARGET);
1.43 result = items.
1.44 makeCondItem(rcond.opcode,
1.45 - code.mergeChains(trueJumps, rcond.trueJumps),
1.46 + Code.mergeChains(trueJumps, rcond.trueJumps),
1.47 rcond.falseJumps);
1.48 } else {
1.49 result = lcond;
