diff -r 775a51e3276f -r 8fb68f73d4b1 src/share/classes/com/sun/tools/javac/comp/Flow.java --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Jun 04 13:21:41 2013 +0100 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Jun 04 14:17:50 2013 -0700 @@ -434,7 +434,7 @@ Lint lintPrev = lint; pendingExits = new ListBuffer(); - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); try { // process all the static initializers @@ -470,7 +470,7 @@ if (tree.body == null) return; Lint lintPrev = lint; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); Assert.check(pendingExits.isEmpty()); @@ -496,7 +496,7 @@ public void visitVarDef(JCVariableDecl tree) { if (tree.init != null) { Lint lintPrev = lint; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); try{ scan(tree.init); } finally { @@ -836,7 +836,7 @@ } classDef = tree; thrown = List.nil(); - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); try { // process all the static initializers @@ -916,7 +916,7 @@ List mthrown = tree.sym.type.getThrownTypes(); Lint lintPrev = lint; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); Assert.check(pendingExits.isEmpty()); @@ -955,7 +955,7 @@ public void visitVarDef(JCVariableDecl tree) { if (tree.init != null) { Lint lintPrev = lint; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); try{ scan(tree.init); } finally { @@ -1580,7 +1580,7 @@ firstadr = nextadr; } classDef = tree; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); try { // define all the static fields @@ -1648,7 +1648,7 @@ int returnadrPrev = returnadr; Lint lintPrev = lint; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); Assert.check(pendingExits.isEmpty()); @@ -1700,7 +1700,7 @@ if (track && tree.sym.owner.kind == MTH) newVar(tree.sym); if (tree.init != null) { Lint lintPrev = lint; - lint = lint.augment(tree.sym.annotations); + lint = lint.augment(tree.sym); try{ scanExpr(tree.init); if (track) letInit(tree.pos(), tree.sym);