Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed May 13 12:50:11 2015 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu May 14 20:12:16 2015 -0700
     1.3 @@ -4086,7 +4086,7 @@
     1.4                              s : new MethodSymbol(
     1.5                                  s.flags(),
     1.6                                  s.name,
     1.7 -                                types.createMethodTypeWithThrown(mt, allThrown),
     1.8 +                                types.createMethodTypeWithThrown(s.type, allThrown),
     1.9                                  s.owner);
    1.10                  }
    1.11              }

     2.1 --- a/src/share/classes/com/sun/tools/javac/resources/javac.properties	Wed May 13 12:50:11 2015 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javac/resources/javac.properties	Thu May 14 20:12:16 2015 -0700
     2.3 @@ -232,8 +232,8 @@
     2.4  
     2.5  javac.msg.bug=\
     2.6  An exception has occurred in the compiler ({0}). \
     2.7 -Please file a bug at the Java Developer Connection (http://java.sun.com/webapps/bugreport)  \
     2.8 -after checking the Bug Parade for duplicates. \
     2.9 +Please file a bug at the Java Bug Database (http://bugreport.java.com/bugreport/) \
    2.10 +after checking the database for duplicates. \
    2.11  Include your program and the following diagnostic in your report.  Thank you.
    2.12  
    2.13  javac.msg.io=\

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/tools/javac/generics/8064803/T8064803.java	Thu May 14 20:12:16 2015 -0700
     3.3 @@ -0,0 +1,53 @@
     3.4 +/*
     3.5 + * Copyright (c) 2014, 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.  Oracle designates this
    3.11 + * particular file as subject to the "Classpath" exception as provided
    3.12 + * by Oracle in the LICENSE file that accompanied this code.
    3.13 + *
    3.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.17 + * version 2 for more details (a copy is included in the LICENSE file that
    3.18 + * accompanied this code).
    3.19 + *
    3.20 + * You should have received a copy of the GNU General Public License version
    3.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.23 + *
    3.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.25 + * or visit www.oracle.com if you need additional information or have any
    3.26 + * questions.
    3.27 + */
    3.28 +
    3.29 +/*
    3.30 + * @test
    3.31 + * @bug 8064803
    3.32 + * @summary Javac erroneously uses instantiated signatures when merging abstract most-specific methods
    3.33 + */
    3.34 +public class T8064803 {
    3.35 +    interface ParentA<T> {
    3.36 +        T process() throws Exception;
    3.37 +    }
    3.38 +
    3.39 +    interface ParentB<T> {
    3.40 +        T process() throws Exception;
    3.41 +    }
    3.42 +
    3.43 +    interface Child<T> extends ParentA<T>, ParentB<T> { }
    3.44 +
    3.45 +    static class ChildImpl<T> implements Child<T> {
    3.46 +        @Override
    3.47 +        public T process() {
    3.48 +            return null;
    3.49 +        }
    3.50 +    }
    3.51 +
    3.52 +    public static void main(String[] args) throws Exception {
    3.53 +        Child<String> child = new ChildImpl<String>();
    3.54 +        child.process();
    3.55 +    }
    3.56 +}