Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Mon Oct 13 20:06:55 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Tue Sep 09 12:16:25 2014 -0400
     1.3 @@ -247,7 +247,7 @@
     1.4                      return !env.info.scope.includes(sym) &&
     1.5                             sym.owner.kind == MTH;
     1.6                  }
     1.7 -            }.analyzeTree(env);
     1.8 +            }.analyzeTree(env, that);
     1.9              LambdaFlowAnalyzer flowAnalyzer = new LambdaFlowAnalyzer();
    1.10              flowAnalyzer.analyzeTree(env, that, make);
    1.11              return flowAnalyzer.inferredThrownTypes;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/flow/T8042741/LambdaArgumentsTest.java	Tue Sep 09 12:16:25 2014 -0400
     2.3 @@ -0,0 +1,44 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, 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 +/* @test
    2.28 + * @bug 8054210
    2.29 + * @summary NullPointerException when compiling specific code
    2.30 + * @compile LambdaArgumentsTest.java
    2.31 + */
    2.32 +
    2.33 +public class LambdaArgumentsTest  {
    2.34 +    interface Thrower<E extends Exception> { void apply() throws E; }
    2.35 +    interface Consumer<E> { void take(E arg); }
    2.36 +
    2.37 +    <E extends Exception>
    2.38 +    void m1(Thrower<E> a1, Consumer<E> a2) {}
    2.39 +
    2.40 +    <E extends Exception>
    2.41 +    void m2(Thrower<E> a1, Consumer<RuntimeException> a2) {}
    2.42 +
    2.43 +    void test() {
    2.44 +        m1(() -> {}, e -> {});
    2.45 +        m2(() -> {}, (RuntimeException e) -> {});
    2.46 +    }
    2.47 +}