jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/jvm/Gen.java

-:4ac623ddd8d0
+:58e7e71b302e
 private final Type stringBufferType;
 private final Map<Type,Symbol> stringBufferAppend;
 private Name accessDollar;
 private final Types types;
 private final Lower lower;
+private final Flow flow;
 /** Switch: GJ mode?
 */
 private final boolean allowGenerics;
 ? syms.stringBuilderType
 : syms.stringBufferType;
 stringBufferAppend = new HashMap<Type,Symbol>();
 accessDollar = names.
 fromString("access" + target.syntheticNameChar());
+flow = Flow.instance(context);
 lower = Lower.instance(context);
 Options options = Options.instance(context);
 lineDebugInfo =
 options.isUnset(G_CUSTOM) ||
 /*  We must not analyze synthetic methods
 */
 if (varDebugInfo && (cdef.sym.flags() & SYNTHETIC) == 0) {
 try {
-LVTAssignAnalyzer lvtAssignAnalyzer = LVTAssignAnalyzer.make(
+new LVTAssignAnalyzer().analyzeTree(localEnv);
-lvtRanges, syms, names);
-lvtAssignAnalyzer.analyzeTree(localEnv);
 } catch (Throwable e) {
 throw e;
 }
 }
 void addCont(Chain c) {
 cont = Code.mergeChains(c, cont);
 }
 }
-static class LVTAssignAnalyzer
+class LVTAssignAnalyzer
 extends Flow.AbstractAssignAnalyzer<LVTAssignAnalyzer.LVTAssignPendingExit> {
 final LVTBits lvtInits;
-final LVTRanges lvtRanges;
 /*  This class is anchored to a context dependent tree. The tree can
 *  vary inside the same instruction for example in the switch instruction
 *  the same FlowBits instance can be anchored to the whole tree, or
 *  to a given case. The aim is to always anchor the bits to the tree
 *  capable of closing a DA range.
 */
-static class LVTBits extends Bits {
+class LVTBits extends Bits {
-enum BitsOpKind {
-INIT,
-CLEAR,
-INCL_BIT,
-EXCL_BIT,
-ASSIGN,
-AND_SET,
-OR_SET,
-DIFF_SET,
-XOR_SET,
-INCL_RANGE,
-EXCL_RANGE,
-}
 JCTree currentTree;
-LVTAssignAnalyzer analyzer;
 private int[] oldBits = null;
 BitsState stateBeforeOp;
-LVTBits() {
-super(false);
-}
-LVTBits(int[] bits, BitsState initState) {
-super(bits, initState);
-}
 @Override
 public void clear() {
 generalOp(null, -1, BitsOpKind.CLEAR);
 }
 */
 public void changed() {
 if (currentTree != null &&
 stateBeforeOp != BitsState.UNKNOWN &&
 trackTree(currentTree)) {
-List<VarSymbol> locals =
+List<VarSymbol> locals = lvtRanges
-analyzer.lvtRanges
+.getVars(currentMethod, currentTree);
-.getVars(analyzer.currentMethod, currentTree);
 locals = locals != null ?
 locals : List.<VarSymbol>nil();
-for (JCVariableDecl vardecl : analyzer.vardecls) {
+for (JCVariableDecl vardecl : vardecls) {
 //once the first is null, the rest will be so.
 if (vardecl == null) {
 break;
 }
 if (trackVar(vardecl.sym) && bitChanged(vardecl.sym.adr)) {
 locals = locals.prepend(vardecl.sym);
 }
 }
 if (!locals.isEmpty()) {
-analyzer.lvtRanges.setEntry(analyzer.currentMethod,
+lvtRanges.setEntry(currentMethod,
 currentTree, locals);
 }
 }
 }
 }
 boolean trackVar(VarSymbol var) {
 return (var.owner.kind == MTH &&
 (var.flags() & PARAMETER) == 0 &&
-analyzer.trackable(var));
+trackable(var));
 }
 boolean trackTree(JCTree tree) {
 switch (tree.getTag()) {
 // of course a method closes the alive range of a local variable.
 return true;
 }
 }
-public class LVTAssignPendingExit extends Flow.AssignAnalyzer.AssignPendingExit {
+public class LVTAssignPendingExit extends
+Flow.AbstractAssignAnalyzer<LVTAssignPendingExit>.AbstractAssignPendingExit {
 LVTAssignPendingExit(JCTree tree, final Bits inits, final Bits uninits) {
 super(tree, inits, uninits);
 }
 lvtInits.at(tree);
 super.resolveJump(tree);
 }
 }
-private LVTAssignAnalyzer(LVTRanges lvtRanges, Symtab syms, Names names) {
+private LVTAssignAnalyzer() {
-super(new LVTBits(), syms, names, false);
+flow.super();
-lvtInits = (LVTBits)inits;
+lvtInits = new LVTBits();
-this.lvtRanges = lvtRanges;
+inits = lvtInits;
-}
-public static LVTAssignAnalyzer make(LVTRanges lvtRanges, Symtab syms, Names names) {
-LVTAssignAnalyzer result = new LVTAssignAnalyzer(lvtRanges, syms, names);
-result.lvtInits.analyzer = result;
-return result;
 }
 @Override
 protected void markDead(JCTree tree) {
 lvtInits.at(tree).inclRange(returnadr, nextadr);

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/jvm/Gen.java

src/share/classes/com/sun/tools/javac/jvm/Gen.java