Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Fri Jul 03 09:16:14 2009 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Jul 15 10:25:01 2009 +0100
     1.3 @@ -251,7 +251,8 @@
     1.4              return true;
     1.5          else {
     1.6              Symbol s2 = ((MethodSymbol)sym).implementation(site.tsym, types, true);
     1.7 -            return (s2 == null || s2 == sym);
     1.8 +            return (s2 == null || s2 == sym ||
     1.9 +                    !types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym)));
    1.10          }
    1.11      }
    1.12      //where

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/generics/rawOverride/T6846972.java	Wed Jul 15 10:25:01 2009 +0100
     2.3 @@ -0,0 +1,49 @@
     2.4 +/*
     2.5 + * Copyright 2009 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 6846972
    2.30 + * @summary cannot access member of raw type when erasure change overriding into overloading
    2.31 + * @author mcimadamore
    2.32 + * @compile T6846972.java
    2.33 + */
    2.34 +
    2.35 +import java.util.EnumMap;
    2.36 +
    2.37 +public class T6846972 {
    2.38 +
    2.39 +    enum Suit {
    2.40 +        CLUBS, DIAMONDS;
    2.41 +    }
    2.42 +
    2.43 +    static Object [] array = {
    2.44 +        Suit.CLUBS, "value1",
    2.45 +        Suit.DIAMONDS, "value2"
    2.46 +    };
    2.47 +
    2.48 +    static void test() {
    2.49 +        EnumMap map = new EnumMap(Suit.class);
    2.50 +        map.put(array[0], array[1]);
    2.51 +    }
    2.52 +}