Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Jul 25 12:05:43 2008 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Jul 25 12:22:09 2008 +0100
     1.3 @@ -2664,7 +2664,7 @@
     1.4                  // Enums may not be extended by source-level classes
     1.5                  if (st.tsym != null &&
     1.6                      ((st.tsym.flags_field & Flags.ENUM) != 0) &&
     1.7 -                    ((c.flags_field & Flags.ENUM) == 0) &&
     1.8 +                    ((c.flags_field & (Flags.ENUM | Flags.COMPOUND)) == 0) &&
     1.9                      !target.compilerBootstrap(c)) {
    1.10                      log.error(env.tree.pos(), "enum.types.not.extensible");
    1.11                  }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/enum/T6675483.java	Fri Jul 25 12:22:09 2008 +0100
     2.3 @@ -0,0 +1,40 @@
     2.4 +/*
     2.5 + * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    2.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
    2.24 + * have any questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 6675483
    2.30 + *
    2.31 + * @summary Javac rejects multiple type-variable bound declarations starting with an enum type
    2.32 + * @author Maurizio Cimadamore
    2.33 + *
    2.34 + * @compile T6675483.java
    2.35 + */
    2.36 +
    2.37 +public class T6675483 {
    2.38 +    enum E implements Comparable<E> {}
    2.39 +
    2.40 +    interface C<T extends E & Comparable<E>> {
    2.41 +        <S extends E & Comparable<E>> void m();
    2.42 +    }
    2.43 +}