Tue, 14 May 2013 11:11:09 -0700
8012556: Implement lambda methods on interfaces as static
8006140: Javac NPE compiling Lambda expression on initialization expression of static field in interface
Summary: Lambdas occurring in static contexts or those not needing instance information should be generated into static methods. This has long been the case for classes. However, as a work-around to the lack of support for statics on interfaces, interface lambda methods have been generated into default methods. For lambdas in interface static contexts (fields and static methods) this causes an NPE in javac because there is no 'this'. MethodHandles now support static methods on interfaces. This changeset allows lambda methods to be generated as static interface methods. An existing bug in Hotspot (8013875) is exposed in a test when the "-esa" flag is used. This test and another test that already exposed this bug have been marked with @ignore.
Reviewed-by: mcimadamore
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | @test |
aoqi@0 | 26 | @bug 8009742 |
aoqi@0 | 27 | @summary Bad method name: Serialized lambda in a constructor or class init |
aoqi@0 | 28 | */ |
aoqi@0 | 29 | |
aoqi@0 | 30 | import java.io.*; |
aoqi@0 | 31 | import java.lang.reflect.Method; |
aoqi@0 | 32 | |
aoqi@0 | 33 | public class SerializedLambdaInInit { |
aoqi@0 | 34 | static int assertionCount = 0; |
aoqi@0 | 35 | |
aoqi@0 | 36 | static void assertTrue(boolean cond) { |
aoqi@0 | 37 | assertionCount++; |
aoqi@0 | 38 | if (!cond) |
aoqi@0 | 39 | throw new AssertionError(); |
aoqi@0 | 40 | } |
aoqi@0 | 41 | |
aoqi@0 | 42 | static LSI cvisi = z -> "[" + z + "]"; |
aoqi@0 | 43 | static LSI cisi; |
aoqi@0 | 44 | |
aoqi@0 | 45 | static { |
aoqi@0 | 46 | cisi = z -> z + z; |
aoqi@0 | 47 | } |
aoqi@0 | 48 | |
aoqi@0 | 49 | LSI ivsi = z -> "blah"; |
aoqi@0 | 50 | LSI iisi; |
aoqi@0 | 51 | |
aoqi@0 | 52 | SerializedLambdaInInit() { |
aoqi@0 | 53 | iisi = z -> "*" + z; |
aoqi@0 | 54 | } |
aoqi@0 | 55 | |
aoqi@0 | 56 | public static void main(String[] args) throws Exception { |
aoqi@0 | 57 | try { |
aoqi@0 | 58 | // Write lambdas out |
aoqi@0 | 59 | ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
aoqi@0 | 60 | ObjectOutput out = new ObjectOutputStream(baos); |
aoqi@0 | 61 | SerializedLambdaInInit slii = new SerializedLambdaInInit(); |
aoqi@0 | 62 | |
aoqi@0 | 63 | write(out, cvisi ); |
aoqi@0 | 64 | write(out, cisi ); |
aoqi@0 | 65 | write(out, slii.ivsi ); |
aoqi@0 | 66 | write(out, slii.iisi ); |
aoqi@0 | 67 | out.flush(); |
aoqi@0 | 68 | out.close(); |
aoqi@0 | 69 | |
aoqi@0 | 70 | // Read them back |
aoqi@0 | 71 | ByteArrayInputStream bais = |
aoqi@0 | 72 | new ByteArrayInputStream(baos.toByteArray()); |
aoqi@0 | 73 | ObjectInputStream in = new ObjectInputStream(bais); |
aoqi@0 | 74 | readAssert(in, "[X]"); |
aoqi@0 | 75 | readAssert(in, "XX"); |
aoqi@0 | 76 | readAssert(in, "blah"); |
aoqi@0 | 77 | readAssert(in, "*X"); |
aoqi@0 | 78 | in.close(); |
aoqi@0 | 79 | |
aoqi@0 | 80 | // Reflectively test for valid method names |
aoqi@0 | 81 | for (Method meth : slii.getClass().getDeclaredMethods()) { |
aoqi@0 | 82 | checkIdentifier(meth.getName()); |
aoqi@0 | 83 | } |
aoqi@0 | 84 | } catch (IOException e) { |
aoqi@0 | 85 | e.printStackTrace(); |
aoqi@0 | 86 | throw e; |
aoqi@0 | 87 | } |
aoqi@0 | 88 | assertTrue(assertionCount == 4); |
aoqi@0 | 89 | } |
aoqi@0 | 90 | |
aoqi@0 | 91 | static void write(ObjectOutput out, LSI lamb) throws IOException { |
aoqi@0 | 92 | out.writeObject(lamb); |
aoqi@0 | 93 | } |
aoqi@0 | 94 | |
aoqi@0 | 95 | static void readAssert(ObjectInputStream in, String expected) throws IOException, ClassNotFoundException { |
aoqi@0 | 96 | LSI ls = (LSI) in.readObject(); |
aoqi@0 | 97 | String result = ls.convert("X"); |
aoqi@0 | 98 | System.out.printf("Result: %s\n", result); |
aoqi@0 | 99 | assertTrue(result.equals(expected)); |
aoqi@0 | 100 | } |
aoqi@0 | 101 | |
aoqi@0 | 102 | public static void checkIdentifier(String str) throws Exception { |
aoqi@0 | 103 | // null and zero length identifers will throw their own exceptions |
aoqi@0 | 104 | char[] chars = str.toCharArray(); |
aoqi@0 | 105 | if (!Character.isJavaIdentifierStart(chars[0])) { |
aoqi@0 | 106 | throw new IllegalArgumentException(str + ": bad identifier start character: '" + chars[0] + "'"); |
aoqi@0 | 107 | } |
aoqi@0 | 108 | for (char ch : chars) { |
aoqi@0 | 109 | if (!Character.isJavaIdentifierPart(ch)) { |
aoqi@0 | 110 | throw new IllegalArgumentException(str + ": bad identifier character: '" + ch + "'"); |
aoqi@0 | 111 | } |
aoqi@0 | 112 | } |
aoqi@0 | 113 | } |
aoqi@0 | 114 | } |
aoqi@0 | 115 | |
aoqi@0 | 116 | interface LSI extends Serializable { |
aoqi@0 | 117 | String convert(String x); |
aoqi@0 | 118 | } |