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

-:1476d54fdc61
+:0a9f5cbe37d9
 final Bits uninitsWhenTrue;
 final Bits uninitsWhenFalse;
 /** A mapping from addresses to variable symbols.
 */
-VarSymbol[] vars;
+JCVariableDecl[] vardecls;
 /** The current class being defined.
 */
 JCClassDecl classDef;
 /** Initialize new trackable variable by setting its address field
 *  to the next available sequence number and entering it under that
 *  index into the vars array.
 */
-void newVar(VarSymbol sym) {
+void newVar(JCVariableDecl varDecl) {
-vars = ArrayUtils.ensureCapacity(vars, nextadr);
+VarSymbol sym = varDecl.sym;
+vardecls = ArrayUtils.ensureCapacity(vardecls, nextadr);
 if ((sym.flags() & FINAL) == 0) {
 sym.flags_field |= EFFECTIVELY_FINAL;
 }
 sym.adr = nextadr;
-vars[nextadr] = sym;
+vardecls[nextadr] = varDecl;
 inits.excl(nextadr);
 uninits.incl(nextadr);
 nextadr++;
 }
 }
 /** Check that trackable variable is initialized.
 */
 void checkInit(DiagnosticPosition pos, VarSymbol sym) {
+checkInit(pos, sym, "var.might.not.have.been.initialized");
+}
+void checkInit(DiagnosticPosition pos, VarSymbol sym, String errkey) {
 if ((sym.adr >= firstadr || sym.owner.kind != TYP) &&
 trackable(sym) &&
 !inits.isMember(sym.adr)) {
-log.error(pos, "var.might.not.have.been.initialized",
+log.error(pos, errkey, sym);
-sym);
 inits.incl(sym.adr);
 }
 }
 /** Split (duplicate) inits/uninits into WhenTrue/WhenFalse sets
 if (l.head.hasTag(VARDEF)) {
 JCVariableDecl def = (JCVariableDecl)l.head;
 if ((def.mods.flags & STATIC) != 0) {
 VarSymbol sym = def.sym;
 if (trackable(sym))
-newVar(sym);
+newVar(def);
 }
 }
 }
 // process all the static initializers
 if (l.head.hasTag(VARDEF)) {
 JCVariableDecl def = (JCVariableDecl)l.head;
 if ((def.mods.flags & STATIC) == 0) {
 VarSymbol sym = def.sym;
 if (trackable(sym))
-newVar(sym);
+newVar(def);
 }
 }
 }
 // process all the instance initializers
 // else we are in an instance initializer block;
 // leave caught unchanged.
 scan(tree.body);
 if (isInitialConstructor) {
-for (int i = firstadr; i < nextadr; i++)
+boolean isSynthesized = (tree.sym.flags() &
-if (vars[i].owner == classDef.sym)
+GENERATEDCONSTR) != 0;
-checkInit(TreeInfo.diagEndPos(tree.body), vars[i]);
+for (int i = firstadr; i < nextadr; i++) {
+JCVariableDecl vardecl = vardecls[i];
+VarSymbol var = vardecl.sym;
+if (var.owner == classDef.sym) {
+// choose the diagnostic position based on whether
+// the ctor is default(synthesized) or not
+if (isSynthesized) {
+checkInit(TreeInfo.diagnosticPositionFor(var, vardecl),
+var, "var.not.initialized.in.default.constructor");
+} else {
+checkInit(TreeInfo.diagEndPos(tree.body), var);
+}
+}
+}
 }
 List<AssignPendingExit> exits = pendingExits.toList();
 pendingExits = new ListBuffer<AssignPendingExit>();
 while (exits.nonEmpty()) {
 AssignPendingExit exit = exits.head;
 exits = exits.tail;
 Assert.check(exit.tree.hasTag(RETURN), exit.tree);
 if (isInitialConstructor) {
 inits.assign(exit.exit_inits);
 for (int i = firstadr; i < nextadr; i++)
-checkInit(exit.tree.pos(), vars[i]);
+checkInit(exit.tree.pos(), vardecls[i].sym);
 }
 }
 } finally {
 inits.assign(initsPrev);
 uninits.assign(uninitsPrev);
 }
 }
 public void visitVarDef(JCVariableDecl tree) {
 boolean track = trackable(tree.sym);
-if (track && tree.sym.owner.kind == MTH) newVar(tree.sym);
+if (track && tree.sym.owner.kind == MTH) newVar(tree);
 if (tree.init != null) {
 Lint lintPrev = lint;
 lint = lint.augment(tree.sym);
 try{
 scanExpr(tree.init);
 try {
 attrEnv = env;
 Flow.this.make = make;
 startPos = tree.pos().getStartPosition();
-if (vars == null)
+if (vardecls == null)
-vars = new VarSymbol[32];
+vardecls = new JCVariableDecl[32];
 else
-for (int i=0; i<vars.length; i++)
+for (int i=0; i<vardecls.length; i++)
-vars[i] = null;
+vardecls[i] = null;
 firstadr = 0;
 nextadr = 0;
 pendingExits = new ListBuffer<AssignPendingExit>();
 this.classDef = null;
 unrefdResources = new Scope(env.enclClass.sym);
 } finally {
 // note that recursive invocations of this method fail hard
 startPos = -1;
 resetBits(inits, uninits, uninitsTry, initsWhenTrue,
 initsWhenFalse, uninitsWhenTrue, uninitsWhenFalse);
-if (vars != null) for (int i=0; i<vars.length; i++)
+if (vardecls != null) for (int i=0; i<vardecls.length; i++)
-vars[i] = null;
+vardecls[i] = null;
 firstadr = 0;
 nextadr = 0;
 pendingExits = null;
 Flow.this.make = null;
 this.classDef = null;

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

comparison: src/share/classes/com/sun/tools/javac/comp/Flow.java

src/share/classes/com/sun/tools/javac/comp/Flow.java