Skip to content

8235229: Compilation against a modular, multi-release JAR erroneous with --release #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lahodaj wants to merge 1 commit into from
Closed

8235229: Compilation against a modular, multi-release JAR erroneous with --release #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
import com.sun.tools.javac.file.CacheFSInfo;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.StringUtils;
Expand Down Expand Up @@ -246,6 +247,8 @@ public String inferBinaryName(Location location, JavaFileObject file) {

};

fm.handleOption(Option.MULTIRELEASE, sourceVersion);

Path file = findCtSym();
// file == ${jdk.home}/lib/ct.sym
if (Files.exists(file)) {
Expand Down
53 changes: 52 additions & 1 deletion test/langtools/tools/javac/modules/ModuleInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test
* @bug 8158123 8161906 8162713 8202832
* @bug 8158123 8161906 8162713 8202832 8235229
* @summary tests for module declarations
* @library /tools/lib
* @modules
Expand All @@ -38,7 +38,9 @@
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.jar.Attributes;

import toolbox.JarTask;
import toolbox.JavacTask;
import toolbox.Task;

Expand Down Expand Up @@ -798,4 +800,53 @@ public void testJDK8202832(Path base) throws Exception {
if (!expected.equals(log))
throw new Exception("expected output not found");
}

@Test
public void testMultiReleaseJarAndReleaseOption(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src, "package api; public class A { }");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb)
.outdir(classes)
.files(findJavaFiles(src))
.run()
.writeAll();

Path src9 = base.resolve("src9");
tb.writeJavaFiles(src9, "module m { exports api; }");
Path classes9 = classes.resolve("META-INF").resolve("versions").resolve("9");
Files.createDirectories(classes9);
new JavacTask(tb)
.sourcepath(src, src9)
.outdir(classes9)
.files(findJavaFiles(src9))
.run()
.writeAll();
Path jar = base.resolve("lib.jar");
new JarTask(tb, jar)
.baseDir(classes)
.files(Arrays.stream(tb.findFiles("class", classes)).map(f -> classes.relativize(f).toString()).toArray(i -> new String[i]))
.manifest(Attributes.Name.MULTI_RELEASE + ": true\n\n")
.run();
Path testSrc = base.resolve("test-src");
tb.writeJavaFiles(testSrc, "module test { requires transitive m; }", "package impl; public class I { api.A a; }");
Path testClasses = base.resolve("test-classes");
Files.createDirectories(testClasses);
new JavacTask(tb)
.options("-Werror", "--module-path", jar.toString())
.sourcepath(testSrc)
.outdir(testClasses)
.files(findJavaFiles(testSrc))
.run()
.writeAll();
new JavacTask(tb)
.options("-Werror", "--module-path", jar.toString(), "--release", "9", "-doe")
.sourcepath(testSrc)
.outdir(testClasses)
.files(findJavaFiles(testSrc))
.run()
.writeAll();
}

}