Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Sep 02 17:35:56 2011 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Sep 09 17:19:26 2011 -0700
     1.3 @@ -594,7 +594,15 @@
     1.4              lintEnv = lintEnv.next;
     1.5  
     1.6          // Having found the enclosing lint value, we can initialize the lint value for this class
     1.7 -        env.info.lint = lintEnv.info.lint.augment(env.info.enclVar.attributes_field, env.info.enclVar.flags());
     1.8 +        // ... but ...
     1.9 +        // There's a problem with evaluating annotations in the right order, such that
    1.10 +        // env.info.enclVar.attributes_field might not yet have been evaluated, and so might be
    1.11 +        // null. In that case, calling augment will throw an NPE. To avoid this, for now we
    1.12 +        // revert to the jdk 6 behavior and ignore the (unevaluated) attributes.
    1.13 +        if (env.info.enclVar.attributes_field == null)
    1.14 +            env.info.lint = lintEnv.info.lint;
    1.15 +        else
    1.16 +            env.info.lint = lintEnv.info.lint.augment(env.info.enclVar.attributes_field, env.info.enclVar.flags());
    1.17  
    1.18          Lint prevLint = chk.setLint(env.info.lint);
    1.19          JavaFileObject prevSource = log.useSource(env.toplevel.sourcefile);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/annotations/T7043371.java	Fri Sep 09 17:19:26 2011 -0700
     2.3 @@ -0,0 +1,43 @@
     2.4 +/*
     2.5 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 7043371
    2.30 + * @summary javac7 fails with NPE during compilation
    2.31 + * @compile T7043371.java
    2.32 + */
    2.33 +
    2.34 +@interface Anno {
    2.35 +    String value();
    2.36 +}
    2.37 +
    2.38 +class B {
    2.39 +    @Anno(value=A.a)
    2.40 +    public static final int b = 0;
    2.41 +}
    2.42 +
    2.43 +class A {
    2.44 +    @Deprecated
    2.45 +    public static final String a = "a";
    2.46 +}

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/tools/javac/annotations/T7073477.java	Fri Sep 09 17:19:26 2011 -0700
     3.3 @@ -0,0 +1,39 @@
     3.4 +/*
     3.5 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
     3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 + *
     3.8 + * This code is free software; you can redistribute it and/or modify it
     3.9 + * under the terms of the GNU General Public License version 2 only, as
    3.10 + * published by the Free Software Foundation.
    3.11 + *
    3.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.15 + * version 2 for more details (a copy is included in the LICENSE file that
    3.16 + * accompanied this code).
    3.17 + *
    3.18 + * You should have received a copy of the GNU General Public License version
    3.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.21 + *
    3.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.23 + * or visit www.oracle.com if you need additional information or have any
    3.24 + * questions.
    3.25 + */
    3.26 +
    3.27 +/*
    3.28 + * @test
    3.29 + * @bug 7073477
    3.30 + * @summary NPE in com.sun.tools.javac.code.Symbol$VarSymbol.getConstValue
    3.31 + * @compile T7073477.java
    3.32 + */
    3.33 +
    3.34 +@SuppressWarnings(T7073477A.S)
    3.35 +class T7073477 {
    3.36 +}
    3.37 +
    3.38 +class T7073477A {
    3.39 +  @SuppressWarnings("")
    3.40 +  static final String S = "";
    3.41 +}
    3.42 +