Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Apr 15 14:12:17 2013 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Apr 15 14:15:07 2013 +0100
     1.3 @@ -2455,20 +2455,24 @@
     1.4                                  argtypes.append(param.vartype.type) :
     1.5                                  argtypes.append(syms.errType);
     1.6                      }
     1.7 -                    return new MethodType(argtypes, Type.recoveryType, List.<Type>nil(), syms.methodClass);
     1.8 +                    return new MethodType(argtypes, Type.recoveryType,
     1.9 +                            List.of(syms.throwableType), syms.methodClass);
    1.10                  case REFERENCE:
    1.11 -                    return new MethodType(List.<Type>nil(), Type.recoveryType, List.<Type>nil(), syms.methodClass);
    1.12 +                    return new MethodType(List.<Type>nil(), Type.recoveryType,
    1.13 +                            List.of(syms.throwableType), syms.methodClass);
    1.14                  default:
    1.15                      Assert.error("Cannot get here!");
    1.16              }
    1.17              return null;
    1.18          }
    1.19  
    1.20 -        private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env, final InferenceContext inferenceContext, final Type... ts) {
    1.21 +        private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env,
    1.22 +                final InferenceContext inferenceContext, final Type... ts) {
    1.23              checkAccessibleTypes(pos, env, inferenceContext, List.from(ts));
    1.24          }
    1.25  
    1.26 -        private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env, final InferenceContext inferenceContext, final List<Type> ts) {
    1.27 +        private void checkAccessibleTypes(final DiagnosticPosition pos, final Env<AttrContext> env,
    1.28 +                final InferenceContext inferenceContext, final List<Type> ts) {
    1.29              if (inferenceContext.free(ts)) {
    1.30                  inferenceContext.addFreeTypeListener(ts, new FreeTypeListener() {
    1.31                      @Override

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/TargetType72.java	Mon Apr 15 14:15:07 2013 +0100
     2.3 @@ -0,0 +1,39 @@
     2.4 +/*
     2.5 + * Copyright (c) 2013, 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 8011376
    2.30 + * @summary Spurious checked exception errors in nested method call
    2.31 + * @compile TargetType72.java
    2.32 + */
    2.33 +import java.io.IOException;
    2.34 +import java.util.concurrent.Callable;
    2.35 +
    2.36 +class TargetType72 {
    2.37 +
    2.38 +    Callable<Number> c = id(id(()->{ if (true) throw new java.io.IOException(); return 0; }));
    2.39 +
    2.40 +    <Z> Z id(Z z) { return null; }
    2.41 +
    2.42 +}