Mercurial > hg > openjdk > jigsaw > jdk
changeset 7285:06dfdfa8c3e6
8012028: Metafactory-generated lambda classes should be final
8008941: isSynthetic() returns false for lambda instances
Reviewed-by: mduigou
author | rfield |
---|---|
date | Fri, 12 Apr 2013 20:23:13 -0700 |
parents | d8cae0195fe9 |
children | 0111bab8dc35 |
files | src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java test/java/lang/invoke/lambda/LambdaClassFinal.java test/java/lang/invoke/lambda/LambdaClassSynthetic.java |
diffstat | 3 files changed, 117 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Fri Apr 12 12:41:18 2013 -0700 +++ b/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Fri Apr 12 20:23:13 2013 -0700 @@ -184,7 +184,7 @@ for (int i=0; i<markerInterfaces.length; i++) { interfaces[i+1] = markerInterfaces[i].getName().replace('.', '/'); } - cw.visit(CLASSFILE_VERSION, ACC_SUPER + ACC_FINAL, + cw.visit(CLASSFILE_VERSION, ACC_SUPER + ACC_FINAL + ACC_SYNTHETIC, lambdaClassName, null, NAME_MAGIC_ACCESSOR_IMPL, interfaces);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/invoke/lambda/LambdaClassFinal.java Fri Apr 12 20:23:13 2013 -0700 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8012028 + * @summary Generated Lambda implementing class should be final + */ + +import java.lang.reflect.Modifier; +import java.io.Serializable; + +public class LambdaClassFinal { + + interface I { + void m(); + } + + interface Iser extends Serializable { + void m(); + } + + static void assertTrue(boolean cond) { + if (!cond) + throw new AssertionError(); + } + + public static void main(String[] args) throws Exception { + new LambdaClassFinal().test(); + } + + void test() throws Exception { + I lam = () -> { }; + assertTrue((lam.getClass().getModifiers() & Modifier.FINAL) != 0); + Iser slam = () -> { }; + assertTrue((slam.getClass().getModifiers() & Modifier.FINAL) != 0); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/invoke/lambda/LambdaClassSynthetic.java Fri Apr 12 20:23:13 2013 -0700 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8008941 + * @summary Generated Lambda implementing class should be synthetic + */ + +import java.lang.reflect.Modifier; +import java.io.Serializable; + +public class LambdaClassSynthetic { + + interface I { + void m(); + } + + interface Iser extends Serializable { + void m(); + } + + static void assertTrue(boolean cond) { + if (!cond) + throw new AssertionError(); + } + + public static void main(String[] args) throws Exception { + new LambdaClassFinal().test(); + } + + void test() throws Exception { + I lam = () -> { }; + assertTrue(lam.getClass().isSynthetic()); + Iser slam = () -> { }; + assertTrue(slam.getClass().isSynthetic()); + } +}