[patch] Bad merge in foreign+vector branch
Aleksey Shipilev
shade at redhat.com
Mon Nov 5 18:22:19 UTC 2018
Current foreign+vector branch fails to build:
Exception in thread "main" java.lang.Error:
/home/shade/panama-dev/src/java.base/share/classes/module-info.java, line 146, multiple exports
jdk.internal.event "exports jdk.internal.event to"
at build.tools.module.GenModuleInfoSource$Parser.newError(GenModuleInfoSource.java:762)
at build.tools.module.GenModuleInfoSource$ModuleInfo.process(GenModuleInfoSource.java:418)
at build.tools.module.GenModuleInfoSource$ModuleInfo.parse(GenModuleInfoSource.java:371)
at build.tools.module.GenModuleInfoSource$ModuleInfo.access$000(GenModuleInfoSource.java:175)
at build.tools.module.GenModuleInfoSource.<init>(GenModuleInfoSource.java:131)
at build.tools.module.GenModuleInfoSource.main(GenModuleInfoSource.java:112)
This looks like a merge problem caused by:
http://hg.openjdk.java.net/panama/dev/rev/8e80e9eadece
Fixed with:
diff -r bff4a440a43a src/java.base/share/classes/module-info.java
--- a/src/java.base/share/classes/module-info.java Mon Nov 05 18:19:19 2018 +0100
+++ b/src/java.base/share/classes/module-info.java Mon Nov 05 19:16:47 2018 +0100
@@ -143,8 +143,6 @@
jdk.incubator.vector;
exports jdk.internal.event to
jdk.jfr;
- exports jdk.internal.event to
- jdk.jfr;
exports jdk.internal.jimage to
jdk.jlink;
exports jdk.internal.jimage.decompressor to
Thanks,
-Aleksey
More information about the panama-dev
mailing list