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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Fri Aug 08 17:38:20 2008 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Fri Aug 08 17:43:24 2008 +0100
     1.3 @@ -627,8 +627,11 @@
     1.4          tree.sym = v;
     1.5          if (tree.init != null) {
     1.6              v.flags_field |= HASINIT;
     1.7 -            if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS)
     1.8 -                v.setLazyConstValue(initEnv(tree, env), log, attr, tree.init);
     1.9 +            if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
    1.10 +                Env<AttrContext> initEnv = getInitEnv(tree, env);
    1.11 +                initEnv.info.enclVar = v;
    1.12 +                v.setLazyConstValue(initEnv(tree, initEnv), log, attr, tree.init);
    1.13 +            }
    1.14          }
    1.15          if (chk.checkUnique(tree.pos(), v, enclScope)) {
    1.16              chk.checkTransparentVar(tree.pos(), v, enclScope);