# HG changeset patch # User aoqi # Date 1567681139 -28800 # Node ID 3fdfb200c295bc494caeb1d92eb4a03287bbe892 # Parent 4f28bdd6118b90135a8f4ef80161ab80a42142c4# Parent 32df4483e2e387a85688bad69c398dc4c7bc2cfa Merge diff -r 4f28bdd6118b -r 3fdfb200c295 .hgtags --- a/.hgtags Thu Sep 05 18:40:52 2019 +0800 +++ b/.hgtags Thu Sep 05 18:58:59 2019 +0800 @@ -1005,7 +1005,20 @@ c0f526208190beea95ec99b06655603537c761f0 jdk8u202-b26 95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-ga 075120a8b410485605fffd5bef20ab66ed97bef8 jdk8u212-b00 +f301c2612d6092ca64b0ba1807a07cf25941bc3b jdk8u222-b00 f301c2612d6092ca64b0ba1807a07cf25941bc3b jdk8u212-b01 59ab73ca14e84b4970ac1feb1ddb3f3d9a087d81 jdk8u212-b02 +4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-b03 +075e7154cddf75a861c657c6177797fdfbf36d3f jdk8u212-b04 +4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-ga d39b8dd19360fcfdf728da5bbdfb0fe5fa178a3b mips64el-jdk8u212-b04 dc0fe0710e423100d3a3256be011e451f1367951 mips64el-jdk8u212-b05 +1f6b4d9449772ea511e1772c3bdd840e0e550e8c jdk8u222-b01 +d91f70a5eb9d97d2ec52d3d63a512030b151250c jdk8u222-b02 +12045c5cae334679b31386ddb790c3b7394525ea jdk8u222-b03 +a5c129168bd3a65209f0b3e53d13b04a5134f07f jdk8u222-b04 +2ad39b194cc1b7fa1f368b044e86f43a2b6552b1 jdk8u222-b05 +563e06335c252222c825a1fd67425b99581dbac2 jdk8u222-b06 +1b641cb01496dfa3d13b7587e76b22d76bfe51c6 jdk8u222-b07 +e5ee6728508d72b987758116d9b0a23e4f3830c1 jdk8u222-b08 +6aa4f05982eb70dc746f84a152c4e5e0b4a7261e jdk8u222-b09 diff -r 4f28bdd6118b -r 3fdfb200c295 THIRD_PARTY_README --- a/THIRD_PARTY_README Thu Sep 05 18:40:52 2019 +0800 +++ b/THIRD_PARTY_README Thu Sep 05 18:58:59 2019 +0800 @@ -1612,7 +1612,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1682,7 +1682,7 @@ --- begin of LICENSE --- Mesa 3-D graphics library - Version: 4.1 + Version: 5.0 Copyright (C) 1999-2002 Brian Paul All Rights Reserved. @@ -2797,61 +2797,8 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -___________________________ -The files in motif/lib/Xm/util included this copyright:mkdirhier.man, -xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man, -checktree.c, lndir.c, makestrs.c -Copyright (c) 1993, 1994 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not -be used in advertising or otherwise to promote the sale, use or other -dealing in this Software without prior written authorization from the -X Consortium. -_____________________________ -Xmos_r.h: -/* -Copyright (c) 1996 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. -*/ - + +--- end of LICENSE --- _____________________________ Copyright notice for HPkeysym.h: /* @@ -2906,55 +2853,6 @@ performance, or use of this material. */ -_____________________________________ -Copyright notice in keysym2ucs.h: - -Copyright 1987, 1994, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts - -All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -*/ --- end of LICENSE --- @@ -3000,7 +2898,7 @@ Apache Jakarta BCEL 5.1 Apache Jakarta Regexp 1.4 Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 + Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 diff -r 4f28bdd6118b -r 3fdfb200c295 src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java --- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Sep 05 18:40:52 2019 +0800 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Sep 05 18:58:59 2019 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2019, 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 @@ -350,6 +350,7 @@ log.error("proc.bad.config.file", sce.getLocalizedMessage()); throw new Abort(sce); } catch (Throwable t) { + log.error("proc.bad.config.file", t.getLocalizedMessage()); throw new Abort(t); } } @@ -360,7 +361,14 @@ } catch (ServiceConfigurationError sce) { log.error("proc.bad.config.file", sce.getLocalizedMessage()); throw new Abort(sce); + } catch (UnsupportedClassVersionError ucve) { + log.error("proc.cant.load.class", ucve.getLocalizedMessage()); + throw new Abort(ucve); + } catch (ClassFormatError cfe) { + log.error("proc.cant.load.class", cfe.getLocalizedMessage()); + throw new Abort(cfe); } catch (Throwable t) { + log.error("proc.bad.config.file", t.getLocalizedMessage()); throw new Abort(t); } } diff -r 4f28bdd6118b -r 3fdfb200c295 src/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Sep 05 18:40:52 2019 +0800 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Sep 05 18:58:59 2019 +0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2019, 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 @@ -869,6 +869,9 @@ compiler.err.proc.bad.config.file=\ Bad service configuration file, or exception thrown while constructing Processor object: {0} +compiler.err.proc.cant.load.class=\ + Could not load processor class file due to ''{0}''. + compiler.err.proc.cant.create.loader=\ Could not create class loader for annotation processors: {0} diff -r 4f28bdd6118b -r 3fdfb200c295 test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java Thu Sep 05 18:58:59 2019 +0800 @@ -0,0 +1,158 @@ +/* + * Copyright (c) 2019, 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 8218152 + * @summary A bad annotation processor class file should fail with an error + * @author Steven Groeger + * + * @library /tools/javac/lib + * @build ToolBox + * @run main MalformedAnnotationProcessorTests + */ + +import java.io.*; +import java.util.*; +import java.io.RandomAccessFile; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import javax.annotation.processing.Processor; + +public class MalformedAnnotationProcessorTests { + public static void main(String... args) throws Exception { + new MalformedAnnotationProcessorTests().run(); + } + + void run() throws Exception { + testBadAnnotationProcessor(Paths.get(".")); + testMissingAnnotationProcessor(Paths.get(".")); + testWrongClassFileVersion(Paths.get(".")); + } + + public void testBadAnnotationProcessor(Path base) throws Exception { + Path apDir = base.resolve("annoprocessor"); + ToolBox.writeFile(apDir.resolve("META-INF").resolve("services") + .resolve(Processor.class.getCanonicalName()), "BadAnnoProcessor"); + ToolBox.writeFile(apDir.resolve("BadAnnoProcessor.class"), "badannoprocessor"); + + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + List actualErrors = new ArrayList<>(); + ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs(); + args.setSources("package test; public class Test {}") + .appendArgs("-XDrawDiagnostics", + "-d", classes.toString(), + "-classpath", "", + "-processorpath", apDir.toString()) + .set(ToolBox.Expect.FAIL) + .setErrOutput(actualErrors); + ToolBox.javac(args); + + System.out.println(actualErrors.get(0)); + if (!actualErrors.get(0).contains("- compiler.err.proc.cant.load.class: " + + "Incompatible magic value")) { + throw new AssertionError("Unexpected errors reported: " + actualErrors); + } + } + + public void testMissingAnnotationProcessor(Path base) throws Exception { + Path apDir = base.resolve("annoprocessor"); + ToolBox.writeFile(apDir.resolve("META-INF").resolve("services").resolve(Processor.class.getCanonicalName()), + "MissingAnnoProcessor"); + + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + List actualErrors = new ArrayList<>(); + ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs(); + args.setSources("package test; public class Test {}") + .appendArgs("-XDrawDiagnostics", + "-d", classes.toString(), + "-classpath", "", + "-processorpath", apDir.toString()) + .set(ToolBox.Expect.FAIL) + .setErrOutput(actualErrors); + ToolBox.javac(args); + + if (!actualErrors.get(0).contains("- compiler.err.proc.bad.config.file: " + + "javax.annotation.processing.Processor: Provider MissingAnnoProcessor not found")) { + throw new AssertionError("Unexpected errors reported: " + actualErrors); + } + } + + public void testWrongClassFileVersion(Path base) throws Exception { + Path apDir = base.resolve("annoprocessor"); + ToolBox.writeFile(apDir.resolve("META-INF").resolve("services").resolve(Processor.class.getCanonicalName()), + "WrongClassFileVersion"); + + ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs(); + args.setSources("class WrongClassFileVersion {}") + .appendArgs("-d", apDir.toString()) + .set(ToolBox.Expect.SUCCESS); + ToolBox.javac(args); + + increaseMajor(apDir.resolve("WrongClassFileVersion.class"), 1); + + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + List actualErrors = new ArrayList<>(); + args = new ToolBox.JavaToolArgs(); + args.setSources("package test; public class Test {}") + .appendArgs("-XDrawDiagnostics", + "-d", classes.toString(), + "-classpath", "", + "-processorpath", apDir.toString()) + .set(ToolBox.Expect.FAIL) + .setErrOutput(actualErrors); + ToolBox.javac(args); + + if (!actualErrors.get(0).contains("- compiler.err.proc.cant.load.class: " + + "WrongClassFileVersion has been compiled by a more recent version")) { + throw new AssertionError("Unexpected errors reported: " + actualErrors); + } + } + + // Increase class file cfile's major version by delta + // (note: based on test/langtools/tools/javac/6330997/T6330997.java) + static void increaseMajor(Path cfile, int delta) { + try (RandomAccessFile cls = + new RandomAccessFile(cfile.toFile(), "rw"); + FileChannel fc = cls.getChannel()) { + ByteBuffer rbuf = ByteBuffer.allocate(2); + fc.read(rbuf, 6); + ByteBuffer wbuf = ByteBuffer.allocate(2); + wbuf.putShort(0, (short)(rbuf.getShort(0) + delta)); + fc.write(wbuf, 6); + fc.force(false); + } catch (Exception e){ + throw new RuntimeException("Failed: unexpected exception"); + } + } +} diff -r 4f28bdd6118b -r 3fdfb200c295 test/tools/javac/diags/examples.not-yet.txt --- a/test/tools/javac/diags/examples.not-yet.txt Thu Sep 05 18:40:52 2019 +0800 +++ b/test/tools/javac/diags/examples.not-yet.txt Thu Sep 05 18:58:59 2019 +0800 @@ -32,6 +32,7 @@ compiler.err.proc.no.service # JavacProcessingEnvironment: no service loader available compiler.err.proc.processor.bad.option.name # cannot happen? masked by javac.err.invalid.A.key compiler.err.proc.service.problem # JavacProcessingEnvironment: catch Throwable from service loader +compiler.err.proc.cant.load.class # JavacProcessingEnvironment: cant load the class/jar file compiler.err.signature.doesnt.match.intf # UNUSED compiler.err.signature.doesnt.match.supertype # UNUSED compiler.err.source.cant.overwrite.input.file