96 lines
3.6 KiB
Java
96 lines
3.6 KiB
Java
/*
|
|
* Copyright (c) 2018, 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 8203892
|
|
* @summary Target interface added as marker interface in calls to altMetafactory
|
|
* @library /tools/lib
|
|
* @enablePreview
|
|
* @modules java.base/jdk.internal.classfile.impl
|
|
* jdk.compiler/com.sun.tools.javac.api
|
|
* jdk.compiler/com.sun.tools.javac.main
|
|
* jdk.compiler/com.sun.tools.javac.util
|
|
* jdk.jdeps/com.sun.tools.javap
|
|
* @build toolbox.ToolBox toolbox.JavacTask
|
|
* @run main CheckTargetIsNotAddedAsMarkerInterfaceTest
|
|
*/
|
|
|
|
import java.io.File;
|
|
import java.nio.file.Paths;
|
|
|
|
import java.lang.classfile.*;
|
|
import java.lang.classfile.attribute.*;
|
|
import java.lang.classfile.constantpool.*;
|
|
import com.sun.tools.javac.util.Assert;
|
|
|
|
import toolbox.JavacTask;
|
|
import toolbox.ToolBox;
|
|
|
|
public class CheckTargetIsNotAddedAsMarkerInterfaceTest {
|
|
|
|
static final String testSource =
|
|
"import java.util.*;\n" +
|
|
"import java.util.function.*;\n" +
|
|
"import java.io.*;\n" +
|
|
|
|
"class Test {\n" +
|
|
" public static <T> Comparator<T> comparingInt(ToIntFunction<? super T> keyExtractor) {\n" +
|
|
" Objects.requireNonNull(keyExtractor);\n" +
|
|
" return (Comparator<T> & Serializable)\n" +
|
|
" (c1, c2) -> Integer.compare(keyExtractor.applyAsInt(c1), keyExtractor.applyAsInt(c2));\n" +
|
|
" }\n" +
|
|
"}";
|
|
|
|
public static void main(String[] args) throws Exception {
|
|
new CheckTargetIsNotAddedAsMarkerInterfaceTest().run();
|
|
}
|
|
|
|
ToolBox tb = new ToolBox();
|
|
|
|
void run() throws Exception {
|
|
compileTestClass();
|
|
checkClassFile(new File(Paths.get(System.getProperty("user.dir"), "Test.class").toUri()));
|
|
}
|
|
|
|
void compileTestClass() throws Exception {
|
|
new JavacTask(tb)
|
|
.sources(testSource)
|
|
.run();
|
|
}
|
|
|
|
void checkClassFile(final File cfile) throws Exception {
|
|
ClassModel classFile = ClassFile.of().parse(cfile.toPath());
|
|
for (Attribute<?> attr : classFile.attributes()) {
|
|
if (attr instanceof BootstrapMethodsAttribute bsmAttr) {
|
|
BootstrapMethodEntry bsmSpecifier = bsmAttr.bootstrapMethods().getFirst();
|
|
Assert.check(bsmSpecifier.arguments().get(0) instanceof MethodTypeEntry);
|
|
Assert.check(bsmSpecifier.arguments().get(1) instanceof MethodHandleEntry);
|
|
Assert.check(bsmSpecifier.arguments().get(2) instanceof MethodTypeEntry);
|
|
Assert.check(bsmSpecifier.arguments().get(3) instanceof IntegerEntry);
|
|
Assert.check(bsmSpecifier.arguments().get(4) instanceof IntegerEntry);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|