1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Jun 04 13:21:41 2013 +0100 1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Jun 04 14:17:50 2013 -0700 1.3 @@ -434,7 +434,7 @@ 1.4 Lint lintPrev = lint; 1.5 1.6 pendingExits = new ListBuffer<PendingExit>(); 1.7 - lint = lint.augment(tree.sym.annotations); 1.8 + lint = lint.augment(tree.sym); 1.9 1.10 try { 1.11 // process all the static initializers 1.12 @@ -470,7 +470,7 @@ 1.13 if (tree.body == null) return; 1.14 Lint lintPrev = lint; 1.15 1.16 - lint = lint.augment(tree.sym.annotations); 1.17 + lint = lint.augment(tree.sym); 1.18 1.19 Assert.check(pendingExits.isEmpty()); 1.20 1.21 @@ -496,7 +496,7 @@ 1.22 public void visitVarDef(JCVariableDecl tree) { 1.23 if (tree.init != null) { 1.24 Lint lintPrev = lint; 1.25 - lint = lint.augment(tree.sym.annotations); 1.26 + lint = lint.augment(tree.sym); 1.27 try{ 1.28 scan(tree.init); 1.29 } finally { 1.30 @@ -836,7 +836,7 @@ 1.31 } 1.32 classDef = tree; 1.33 thrown = List.nil(); 1.34 - lint = lint.augment(tree.sym.annotations); 1.35 + lint = lint.augment(tree.sym); 1.36 1.37 try { 1.38 // process all the static initializers 1.39 @@ -916,7 +916,7 @@ 1.40 List<Type> mthrown = tree.sym.type.getThrownTypes(); 1.41 Lint lintPrev = lint; 1.42 1.43 - lint = lint.augment(tree.sym.annotations); 1.44 + lint = lint.augment(tree.sym); 1.45 1.46 Assert.check(pendingExits.isEmpty()); 1.47 1.48 @@ -955,7 +955,7 @@ 1.49 public void visitVarDef(JCVariableDecl tree) { 1.50 if (tree.init != null) { 1.51 Lint lintPrev = lint; 1.52 - lint = lint.augment(tree.sym.annotations); 1.53 + lint = lint.augment(tree.sym); 1.54 try{ 1.55 scan(tree.init); 1.56 } finally { 1.57 @@ -1580,7 +1580,7 @@ 1.58 firstadr = nextadr; 1.59 } 1.60 classDef = tree; 1.61 - lint = lint.augment(tree.sym.annotations); 1.62 + lint = lint.augment(tree.sym); 1.63 1.64 try { 1.65 // define all the static fields 1.66 @@ -1648,7 +1648,7 @@ 1.67 int returnadrPrev = returnadr; 1.68 Lint lintPrev = lint; 1.69 1.70 - lint = lint.augment(tree.sym.annotations); 1.71 + lint = lint.augment(tree.sym); 1.72 1.73 Assert.check(pendingExits.isEmpty()); 1.74 1.75 @@ -1700,7 +1700,7 @@ 1.76 if (track && tree.sym.owner.kind == MTH) newVar(tree.sym); 1.77 if (tree.init != null) { 1.78 Lint lintPrev = lint; 1.79 - lint = lint.augment(tree.sym.annotations); 1.80 + lint = lint.augment(tree.sym); 1.81 try{ 1.82 scanExpr(tree.init); 1.83 if (track) letInit(tree.pos(), tree.sym);