Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Oct 19 12:41:45 2015 +0200
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Jan 18 10:58:12 2016 +0000
     1.3 @@ -2478,7 +2478,9 @@
     1.4                  return spMethod;
     1.5              }
     1.6          };
     1.7 -        polymorphicSignatureScope.enter(msym);
     1.8 +        if (!mtype.isErroneous()) { // Cache only if kosher.
     1.9 +            polymorphicSignatureScope.enter(msym);
    1.10 +        }
    1.11          return msym;
    1.12      }
    1.13  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/MethodHandleInvokeTest.java	Mon Jan 18 10:58:12 2016 +0000
     2.3 @@ -0,0 +1,49 @@
     2.4 +/*
     2.5 + * Copyright (c) 2015, 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 8130506 8147530
    2.30 + * @summary javac AssertionError when invoking MethodHandle.invoke with lambda parameter
    2.31 + * @run main MethodHandleInvokeTest
    2.32 + */
    2.33 +
    2.34 +import java.lang.invoke.MethodHandle;
    2.35 +
    2.36 +public class MethodHandleInvokeTest {
    2.37 +
    2.38 +    private static interface Obj2Obj {
    2.39 +        Object run(Object obj) throws Throwable;
    2.40 +    }
    2.41 +
    2.42 +    private static void m(Obj2Obj param) {
    2.43 +    }
    2.44 +
    2.45 +    public static void main(String[] args) {
    2.46 +        m((obj) -> {
    2.47 +            MethodHandle mhandle = null;
    2.48 +            mhandle.invoke(obj);
    2.49 +            return null;
    2.50 +        });
    2.51 +    }
    2.52 +}