From e2aa724a67ee8e3da6ea67488b5da96c125d15e2 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Thu, 24 Dec 2020 17:32:25 +0000 Subject: [PATCH 1/9] 8258941: Test specify the Classpath exception in the header Reviewed-by: vromero --- .../javac/combo/CompilationTestCase.java | 4 +-- .../javac/lint/JdkInternalAbuseOfVbc.out | 4 +-- test/langtools/tools/javac/lint/SomeVbc.java | 25 +------------------ .../javac/records/RecordCompilationTests.java | 4 +-- .../javac/records/RecordMemberTests.java | 4 +-- .../javac/records/VarargsRecordsTest.java | 4 +-- .../javac/sealed/SealedCompilationTests.java | 4 +-- 7 files changed, 8 insertions(+), 41 deletions(-) diff --git a/test/langtools/lib/combo/tools/javac/combo/CompilationTestCase.java b/test/langtools/lib/combo/tools/javac/combo/CompilationTestCase.java index d3ce5c8cbba..9fd36c78f9b 100644 --- a/test/langtools/lib/combo/tools/javac/combo/CompilationTestCase.java +++ b/test/langtools/lib/combo/tools/javac/combo/CompilationTestCase.java @@ -4,9 +4,7 @@ * * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * 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 diff --git a/test/langtools/tools/javac/lint/JdkInternalAbuseOfVbc.out b/test/langtools/tools/javac/lint/JdkInternalAbuseOfVbc.out index cb66f0bcfa6..474bedc1479 100644 --- a/test/langtools/tools/javac/lint/JdkInternalAbuseOfVbc.out +++ b/test/langtools/tools/javac/lint/JdkInternalAbuseOfVbc.out @@ -1,6 +1,6 @@ -SomeVbc.java:38:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class +SomeVbc.java:15:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class - compiler.err.warnings.and.werror -SomeVbc.java:49:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class +SomeVbc.java:26:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class JdkInternalAbuseOfVbc.java:17:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class 1 error 3 warnings diff --git a/test/langtools/tools/javac/lint/SomeVbc.java b/test/langtools/tools/javac/lint/SomeVbc.java index b68e4599c81..1dd45c113e3 100644 --- a/test/langtools/tools/javac/lint/SomeVbc.java +++ b/test/langtools/tools/javac/lint/SomeVbc.java @@ -1,27 +1,4 @@ -/* - * Copyright (c) 2020, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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. - */ +/* /nodynamiccopyright/ */ package java.lang; diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java index 61e7807f64d..d7bf4f249b7 100644 --- a/test/langtools/tools/javac/records/RecordCompilationTests.java +++ b/test/langtools/tools/javac/records/RecordCompilationTests.java @@ -4,9 +4,7 @@ * * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * 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 diff --git a/test/langtools/tools/javac/records/RecordMemberTests.java b/test/langtools/tools/javac/records/RecordMemberTests.java index a754f294723..7d358c21953 100644 --- a/test/langtools/tools/javac/records/RecordMemberTests.java +++ b/test/langtools/tools/javac/records/RecordMemberTests.java @@ -4,9 +4,7 @@ * * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * 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 diff --git a/test/langtools/tools/javac/records/VarargsRecordsTest.java b/test/langtools/tools/javac/records/VarargsRecordsTest.java index 2e60ec810ea..14b9a9481d2 100644 --- a/test/langtools/tools/javac/records/VarargsRecordsTest.java +++ b/test/langtools/tools/javac/records/VarargsRecordsTest.java @@ -4,9 +4,7 @@ * * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * 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 diff --git a/test/langtools/tools/javac/sealed/SealedCompilationTests.java b/test/langtools/tools/javac/sealed/SealedCompilationTests.java index 5f830d08544..50e64d10b81 100644 --- a/test/langtools/tools/javac/sealed/SealedCompilationTests.java +++ b/test/langtools/tools/javac/sealed/SealedCompilationTests.java @@ -4,9 +4,7 @@ * * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * 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 From 3f67afd3a8c642f33ca58a9881dff4c81f83e821 Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Thu, 24 Dec 2020 18:50:45 +0000 Subject: [PATCH 2/9] 8251377: [macos11] JTabbedPane selected tab text is barely legible Reviewed-by: prr --- src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java | 5 +++++ .../macosx/classes/com/apple/laf/AquaImageFactory.java | 4 ++++ .../macosx/classes/com/apple/laf/AquaLookAndFeel.java | 3 ++- .../macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 4 +++- .../macosx/native/libawt_lwawt/awt/CSystemColors.m | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java index b21093d33be..6953924a6e7 100644 --- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java +++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java @@ -37,6 +37,11 @@ public final class JRSUIUtils { static boolean isLeopard = isMacOSXLeopard(); static boolean isSnowLeopardOrBelow = isMacOSXSnowLeopardOrBelow(); static boolean isCatalinaOrAbove = isMacOSXCatalinaOrAbove(); + static boolean isBigSurOrAbove = isMacOSXBigSurOrAbove(); + + public static boolean isMacOSXBigSurOrAbove() { + return currentMacOSXVersionMatchesGivenVersionRange(16, true, false, true); + } static boolean isMacOSXCatalinaOrAbove() { return currentMacOSXVersionMatchesGivenVersionRange(15, true, false, true); diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java index 1970bc776ae..0f5aea203a0 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java @@ -496,4 +496,8 @@ public static Color getSelectionInactiveBackgroundColorUIResource() { public static Color getSelectionInactiveForegroundColorUIResource() { return new SystemColorProxy(LWCToolkit.getAppleColor(LWCToolkit.INACTIVE_SELECTION_FOREGROUND_COLOR)); } + + public static Color getSelectedControlColorUIResource() { + return new SystemColorProxy(LWCToolkit.getAppleColor(LWCToolkit.SELECTED_CONTROL_TEXT_COLOR)); + } } diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java index 575d0290d40..8a6734abb12 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java @@ -328,6 +328,7 @@ public Object createValue(UIDefaults defaultsTable) { final ColorUIResource selectedTabTitlePressedColor = new ColorUIResource(240, 240, 240); final ColorUIResource selectedTabTitleDisabledColor = new ColorUIResource(new Color(1, 1, 1, 0.55f)); final ColorUIResource selectedTabTitleNormalColor = white; + final Color selectedControlTextColor = AquaImageFactory.getSelectedControlColorUIResource(); final ColorUIResource selectedTabTitleShadowDisabledColor = new ColorUIResource(new Color(0, 0, 0, 0.25f)); final ColorUIResource selectedTabTitleShadowNormalColor = mediumTranslucentBlack; final ColorUIResource nonSelectedTabTitleNormalColor = black; @@ -869,7 +870,7 @@ public Object createValue(UIDefaults defaultsTable) { "TabbedPane.tabsOverlapBorder", Boolean.TRUE, "TabbedPane.selectedTabTitlePressedColor", selectedTabTitlePressedColor, "TabbedPane.selectedTabTitleDisabledColor", selectedTabTitleDisabledColor, - "TabbedPane.selectedTabTitleNormalColor", selectedTabTitleNormalColor, + "TabbedPane.selectedTabTitleNormalColor", JRSUIUtils.isMacOSXBigSurOrAbove() ? selectedControlTextColor : selectedTabTitleNormalColor, "TabbedPane.selectedTabTitleShadowDisabledColor", selectedTabTitleShadowDisabledColor, "TabbedPane.selectedTabTitleShadowNormalColor", selectedTabTitleShadowNormalColor, "TabbedPane.nonSelectedTabTitleNormalColor", nonSelectedTabTitleNormalColor, diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index 14133619445..6a3fb30128b 100644 --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -204,14 +204,16 @@ public LWCToolkit() { /* * System colors with default initial values, overwritten by toolkit if system values differ and are available. */ - private static final int NUM_APPLE_COLORS = 3; + private static final int NUM_APPLE_COLORS = 4; public static final int KEYBOARD_FOCUS_COLOR = 0; public static final int INACTIVE_SELECTION_BACKGROUND_COLOR = 1; public static final int INACTIVE_SELECTION_FOREGROUND_COLOR = 2; + public static final int SELECTED_CONTROL_TEXT_COLOR = 3; private static int[] appleColors = { 0xFF808080, // keyboardFocusColor = Color.gray; 0xFFC0C0C0, // secondarySelectedControlColor 0xFF303030, // controlDarkShadowColor + 0xFFFFFFFF, // controlTextColor }; private native void loadNativeColors(final int[] systemColors, final int[] appleColors); diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m index 5591a56d246..10c533ad8a8 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m @@ -117,6 +117,7 @@ + (void)reloadColors { appleColors[sun_lwawt_macosx_LWCToolkit_KEYBOARD_FOCUS_COLOR] = [NSColor keyboardFocusIndicatorColor]; appleColors[sun_lwawt_macosx_LWCToolkit_INACTIVE_SELECTION_BACKGROUND_COLOR] = [NSColor secondarySelectedControlColor]; appleColors[sun_lwawt_macosx_LWCToolkit_INACTIVE_SELECTION_FOREGROUND_COLOR] = [NSColor controlDarkShadowColor]; + appleColors[sun_lwawt_macosx_LWCToolkit_SELECTED_CONTROL_TEXT_COLOR] = [NSColor controlTextColor]; for (i = 0; i < sun_lwawt_macosx_LWCToolkit_NUM_APPLE_COLORS; i++) { [appleColors[i] retain]; From b575dd80b6e86821fcf3e065e31c6bddb85db6c4 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Fri, 25 Dec 2020 04:25:20 +0000 Subject: [PATCH 3/9] 8258914: javax/net/ssl/DTLS/RespondToRetransmit.java timed out Reviewed-by: wetmore --- test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java b/test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java index ce10f53b07e..d61d4d9623e 100644 --- a/test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java +++ b/test/jdk/javax/net/ssl/DTLS/RespondToRetransmit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -26,7 +26,8 @@ /* * @test - * @bug 8161086 + * @bug 8161086 8258914 + * @key intermittent * @summary DTLS handshaking fails if some messages were lost * @modules java.base/sun.security.util * @library /test/lib From fb607f16513a4f0892594a1e460b263552d408b5 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Sat, 26 Dec 2020 05:52:05 +0000 Subject: [PATCH 4/9] 8245922: [macos] Taskbar.Feature.ICON_BADGE_NUMBER no longer supported on MacOS Reviewed-by: kcr, prr --- .../macosx/classes/apple/laf/JRSUIUtils.java | 13 +------------ .../classes/sun/lwawt/macosx/CTaskbarPeer.java | 7 ++----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java index 6953924a6e7..6feac78949f 100644 --- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java +++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -36,17 +36,12 @@ public final class JRSUIUtils { static boolean isLeopard = isMacOSXLeopard(); static boolean isSnowLeopardOrBelow = isMacOSXSnowLeopardOrBelow(); - static boolean isCatalinaOrAbove = isMacOSXCatalinaOrAbove(); static boolean isBigSurOrAbove = isMacOSXBigSurOrAbove(); public static boolean isMacOSXBigSurOrAbove() { return currentMacOSXVersionMatchesGivenVersionRange(16, true, false, true); } - static boolean isMacOSXCatalinaOrAbove() { - return currentMacOSXVersionMatchesGivenVersionRange(15, true, false, true); - } - static boolean isMacOSXLeopard() { return isCurrentMacOSXVersion(5); } @@ -84,12 +79,6 @@ static boolean currentMacOSXVersionMatchesGivenVersionRange( return false; } - public static class TaskBar { - public static boolean isIconBadgeSupported() { - return !isCatalinaOrAbove; - } - } - public static class TabbedPane { public static boolean useLegacyTabs() { return isLeopard; diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java index e01c664fe55..6b30aaf9f3c 100644 --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -25,14 +25,12 @@ package sun.lwawt.macosx; +import com.apple.eawt.Application; import java.awt.Image; import java.awt.PopupMenu; import java.awt.Taskbar.Feature; import java.awt.peer.TaskbarPeer; -import apple.laf.JRSUIUtils; -import com.apple.eawt.Application; - final public class CTaskbarPeer implements TaskbarPeer { CTaskbarPeer() {} @@ -42,7 +40,6 @@ public boolean isSupported(Feature feature) { switch(feature) { case ICON_BADGE_TEXT: case ICON_BADGE_NUMBER: - return JRSUIUtils.TaskBar.isIconBadgeSupported(); case ICON_IMAGE: case MENU: case PROGRESS_VALUE: From 97c99b5d7d4fc057a7ebc378d1e7dd915eaf0bb3 Mon Sep 17 00:00:00 2001 From: Guoxiong Li Date: Sat, 26 Dec 2020 17:30:39 +0000 Subject: [PATCH 5/9] 8216400: improve handling of IOExceptions in JavaCompiler.close() 8069116: improve fatal error handling in JavaCompiler Reviewed-by: jjg --- .../sun/tools/javac/main/JavaCompiler.java | 16 +- .../ImproveFatalErrorHandling.java | 144 ++++++++++++++++++ 2 files changed, 154 insertions(+), 6 deletions(-) create mode 100644 test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java index bcd29a8c421..efb12d48e08 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java @@ -1816,18 +1816,22 @@ public void close() { names.dispose(); names = null; + FatalError fatalError = null; for (Closeable c: closeables) { try { c.close(); } catch (IOException e) { - // When javac uses JDK 7 as a baseline, this code would be - // better written to set any/all exceptions from all the - // Closeables as suppressed exceptions on the FatalError - // that is thrown. - JCDiagnostic msg = diagFactory.fragment(Fragments.FatalErrCantClose); - throw new FatalError(msg, e); + if (fatalError == null) { + JCDiagnostic msg = diagFactory.fragment(Fragments.FatalErrCantClose); + fatalError = new FatalError(msg, e); + } else { + fatalError.addSuppressed(e); + } } } + if (fatalError != null) { + throw fatalError; + } closeables = List.nil(); } } diff --git a/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java b/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java new file mode 100644 index 00000000000..de55cd8d5f7 --- /dev/null +++ b/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2020, 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 8069116 8216400 + * @summary Improve handling of IOExceptions and FatalError in JavaCompiler.close() + * @library /tools/lib + * @modules jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.util + * @build toolbox.ToolBox + * @run main ImproveFatalErrorHandling + */ + +import java.io.Closeable; +import java.io.IOException; +import java.net.URI; +import java.util.Arrays; +import java.util.List; +import java.util.ArrayList; + +import javax.tools.SimpleJavaFileObject; +import javax.tools.JavaFileObject; +import javax.tools.ToolProvider; +import com.sun.tools.javac.api.JavacTaskImpl; +import com.sun.tools.javac.main.JavaCompiler; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.FatalError; +import static com.sun.tools.javac.main.JavaCompiler.compilerKey; + +import toolbox.TestRunner; +import toolbox.ToolBox; +import toolbox.Task; +import static toolbox.ToolBox.lineSeparator; + +public class ImproveFatalErrorHandling extends TestRunner { + ToolBox tb; + + String testCode = "public class Test { }"; + + public ImproveFatalErrorHandling() { + super(System.err); + tb = new ToolBox(); + } + + public static void main(String[] args) throws Exception { + ImproveFatalErrorHandling handling = new ImproveFatalErrorHandling(); + handling.runTests(); + } + + @Test + public void testIOExceptionInMethodClose() throws Exception { + List files = Arrays.asList(new MemFile("Test.java", testCode)); + JavacTaskImpl task = (JavacTaskImpl) ToolProvider + .getSystemJavaCompiler() + .getTask(null, null, null, null, null, files); + Context context = task.getContext(); + task.call(); + JavaCompiler compiler = context.get(compilerKey); + compiler.closeables = com.sun.tools.javac.util.List.of( + new CloseException1(), new CloseException2(), + new CloseSuccess(), new CloseException3()); + + try { + compiler.close(); + } catch (FatalError fatalError) { + // Do the check. + List expectedMsg = Arrays.asList( + "Fatal Error: Cannot close compiler resources", + "exception 1", + "exception 2", + "exception 3"); + ArrayList actualMsg = new ArrayList(); + actualMsg.add(fatalError.getMessage()); + actualMsg.add(fatalError.getCause().getMessage()); + for (Throwable t : fatalError.getSuppressed()) { + actualMsg.add(t.getMessage()); + } + tb.checkEqual(expectedMsg, actualMsg); + } + } + + class CloseException1 implements Closeable { + public void close() throws IOException { + throw new IOException("exception 1"); + } + } + + class CloseException2 implements Closeable { + public void close() throws IOException { + throw new IOException("exception 2"); + } + } + + class CloseException3 implements Closeable { + public void close() throws IOException { + throw new IOException("exception 3"); + } + } + + class CloseSuccess implements Closeable { + public void close() throws IOException { } + } + + class MemFile extends SimpleJavaFileObject { + public final String text; + + MemFile(String name, String text) { + super(URI.create(name), JavaFileObject.Kind.SOURCE); + this.text = text; + } + + @Override + public String getName() { + return uri.toString(); + } + + @Override + public String getCharContent(boolean ignoreEncodingErrors) { + return text; + } + } +} From 779ee1104ca7f506bd1113004a84745824a507d4 Mon Sep 17 00:00:00 2001 From: Xiaohong Gong Date: Mon, 28 Dec 2020 02:44:03 +0000 Subject: [PATCH 6/9] 8257147: [TESTBUG] Set a larger default loop count for the VectorAPI jtreg tests Reviewed-by: psandoz --- .../jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Byte128VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Byte256VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Byte512VectorTests.java | 2 +- test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Byte64VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java | 2 +- .../jdk/incubator/vector/Double128VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Double128VectorTests.java | 2 +- .../jdk/incubator/vector/Double256VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Double256VectorTests.java | 2 +- .../jdk/incubator/vector/Double512VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Double512VectorTests.java | 2 +- .../jdk/incubator/vector/Double64VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Double64VectorTests.java | 2 +- .../jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java | 2 +- .../jdk/incubator/vector/Float128VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Float128VectorTests.java | 2 +- .../jdk/incubator/vector/Float256VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Float256VectorTests.java | 2 +- .../jdk/incubator/vector/Float512VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Float512VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Float64VectorTests.java | 2 +- .../jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java | 2 +- test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Int128VectorTests.java | 2 +- test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Int256VectorTests.java | 2 +- test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Int512VectorTests.java | 2 +- test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Int64VectorTests.java | 2 +- test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/IntMaxVectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Long128VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Long256VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Long512VectorTests.java | 2 +- test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Long64VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/LongMaxVectorTests.java | 2 +- .../jdk/incubator/vector/Short128VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Short128VectorTests.java | 2 +- .../jdk/incubator/vector/Short256VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Short256VectorTests.java | 2 +- .../jdk/incubator/vector/Short512VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Short512VectorTests.java | 2 +- .../jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/Short64VectorTests.java | 2 +- .../jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java | 2 +- test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java | 2 +- test/jdk/jdk/incubator/vector/VectorReshapeTests.java | 2 +- test/jdk/jdk/incubator/vector/templates/Unit-header.template | 2 +- .../incubator/vector/templates/X-LoadStoreTest.java.template | 4 ++-- 63 files changed, 64 insertions(+), 64 deletions(-) diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java index 5f1c41ffd47..52108fd34cb 100644 --- a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Byte128VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Byte128VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java index 538edbbcce8..e2f25b76e0c 100644 --- a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Byte128VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Byte128VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java index 9eef074186e..84d7dc6f853 100644 --- a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Byte256VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Byte256VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java index a030f773479..0d7dabb6517 100644 --- a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Byte256VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Byte256VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java index 9cc119a8ef3..fc73193c180 100644 --- a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Byte512VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Byte512VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java index 76530a72326..c0177d11644 100644 --- a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Byte512VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Byte512VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java index b19a4d2c6cb..6805cb2ba26 100644 --- a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Byte64VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Byte64VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java index 40f22d33911..aae22e79ae3 100644 --- a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Byte64VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Byte64VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java index 2a16b65d4ee..50cc6e3c08c 100644 --- a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java @@ -25,7 +25,7 @@ * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * ByteMaxVectorLoadStoreTests + * -XX:-TieredCompilation ByteMaxVectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java index 3535be3ca39..c1c216f8db5 100644 --- a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java +++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch ByteMaxVectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation ByteMaxVectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java index 9668b5b4305..f1f09b98ecc 100644 --- a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Double128VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Double128VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/Double128VectorTests.java index 72a64d067c2..1f22bd2fb61 100644 --- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Double128VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Double128VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Double128VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java index 0f70437a4a7..0491aa04da9 100644 --- a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Double256VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Double256VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/Double256VectorTests.java index 17e9a866b9f..8833300666b 100644 --- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Double256VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Double256VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Double256VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java index 885730b8046..50a74c78d2e 100644 --- a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Double512VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Double512VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/Double512VectorTests.java index c35b5d7f2f6..280582e050f 100644 --- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Double512VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Double512VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Double512VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java index d2b565c4837..50804258349 100644 --- a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Double64VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Double64VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/Double64VectorTests.java index 9171f06b6ef..91cb65bf84b 100644 --- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Double64VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Double64VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Double64VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java index 289e8780a42..bfe58bb29a0 100644 --- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java @@ -25,7 +25,7 @@ * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * DoubleMaxVectorLoadStoreTests + * -XX:-TieredCompilation DoubleMaxVectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java index d45d8cade27..55a69ab1416 100644 --- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java +++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch DoubleMaxVectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation DoubleMaxVectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java index 0f6a15a60f6..714cc88b881 100644 --- a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Float128VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Float128VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/Float128VectorTests.java index 753a5f5a96c..2ae24435f9d 100644 --- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Float128VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Float128VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Float128VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java index 349fca44b4f..ed2cf475485 100644 --- a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Float256VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Float256VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/Float256VectorTests.java index 2ef46ccbf3c..777e2989d1f 100644 --- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Float256VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Float256VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Float256VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java index 75ebc602bd3..958b3645285 100644 --- a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Float512VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Float512VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/Float512VectorTests.java index 93e3c8b9e2f..bec251d800f 100644 --- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Float512VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Float512VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Float512VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java index d2f7bc0719c..9f8a5dd45e3 100644 --- a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Float64VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Float64VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/Float64VectorTests.java index 737301de6a9..f25193c86fb 100644 --- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Float64VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Float64VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Float64VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java index df4abd7b76d..d94ddd88906 100644 --- a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java @@ -25,7 +25,7 @@ * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * FloatMaxVectorLoadStoreTests + * -XX:-TieredCompilation FloatMaxVectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java index 9062ef5905a..8f4723f1493 100644 --- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java +++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch FloatMaxVectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation FloatMaxVectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java index 3a9dd68b0f0..8975e91e892 100644 --- a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Int128VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Int128VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Int128VectorTests.java b/test/jdk/jdk/incubator/vector/Int128VectorTests.java index aff5150fc53..cc88f6b284b 100644 --- a/test/jdk/jdk/incubator/vector/Int128VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Int128VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Int128VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Int128VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java index 66005366309..145d89ca6b7 100644 --- a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Int256VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Int256VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Int256VectorTests.java b/test/jdk/jdk/incubator/vector/Int256VectorTests.java index df682b3540b..a2343b08f06 100644 --- a/test/jdk/jdk/incubator/vector/Int256VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Int256VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Int256VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Int256VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java index b7712421aaa..1c1b076d0e8 100644 --- a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Int512VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Int512VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Int512VectorTests.java b/test/jdk/jdk/incubator/vector/Int512VectorTests.java index b4395ba1691..3033460ed8f 100644 --- a/test/jdk/jdk/incubator/vector/Int512VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Int512VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Int512VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Int512VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java index 0d4b2abde73..8878425b25d 100644 --- a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Int64VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Int64VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Int64VectorTests.java b/test/jdk/jdk/incubator/vector/Int64VectorTests.java index 660f362d736..5861a039da1 100644 --- a/test/jdk/jdk/incubator/vector/Int64VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Int64VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Int64VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Int64VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java index 00ddaedc1e5..3c615afebaf 100644 --- a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java @@ -25,7 +25,7 @@ * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * IntMaxVectorLoadStoreTests + * -XX:-TieredCompilation IntMaxVectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java index 92829c048e3..0fc95639cb0 100644 --- a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java +++ b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch IntMaxVectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation IntMaxVectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java index 03773381f09..f26817404bc 100644 --- a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Long128VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Long128VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Long128VectorTests.java b/test/jdk/jdk/incubator/vector/Long128VectorTests.java index f1fb7c1d95a..db6db483341 100644 --- a/test/jdk/jdk/incubator/vector/Long128VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Long128VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Long128VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Long128VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java index 9b9101fdb50..3eb2c4eb359 100644 --- a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Long256VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Long256VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Long256VectorTests.java b/test/jdk/jdk/incubator/vector/Long256VectorTests.java index ff0983da916..8794a134430 100644 --- a/test/jdk/jdk/incubator/vector/Long256VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Long256VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Long256VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Long256VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java index c56a0982ea9..b9da57a4ba6 100644 --- a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Long512VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Long512VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Long512VectorTests.java b/test/jdk/jdk/incubator/vector/Long512VectorTests.java index 8c79bb97b55..fce11aa298a 100644 --- a/test/jdk/jdk/incubator/vector/Long512VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Long512VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Long512VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Long512VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java index b43cf51ec3a..f832bc0e154 100644 --- a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Long64VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Long64VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Long64VectorTests.java b/test/jdk/jdk/incubator/vector/Long64VectorTests.java index a7cb17e71bf..1df5de54d40 100644 --- a/test/jdk/jdk/incubator/vector/Long64VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Long64VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Long64VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Long64VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java index 596066cc0c0..a48bd7452d7 100644 --- a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java @@ -25,7 +25,7 @@ * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * LongMaxVectorLoadStoreTests + * -XX:-TieredCompilation LongMaxVectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java index a8415ee1858..9c878b3529e 100644 --- a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java +++ b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch LongMaxVectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation LongMaxVectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java index 8603e37d5f1..f0455261a41 100644 --- a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Short128VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Short128VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Short128VectorTests.java b/test/jdk/jdk/incubator/vector/Short128VectorTests.java index 27fb3a844d4..df4ca390968 100644 --- a/test/jdk/jdk/incubator/vector/Short128VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Short128VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Short128VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Short128VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java index 0193f6f72ce..3828368c354 100644 --- a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Short256VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Short256VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Short256VectorTests.java b/test/jdk/jdk/incubator/vector/Short256VectorTests.java index 6a555957743..20b5ea4f7f5 100644 --- a/test/jdk/jdk/incubator/vector/Short256VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Short256VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Short256VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Short256VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java index fc24134cf1c..30392650e8a 100644 --- a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Short512VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Short512VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Short512VectorTests.java b/test/jdk/jdk/incubator/vector/Short512VectorTests.java index 03a54b5729e..29a1388d82b 100644 --- a/test/jdk/jdk/incubator/vector/Short512VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Short512VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Short512VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Short512VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java index 81e3412bd2e..425fc0c37e2 100644 --- a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation - * @run testng Short64VectorLoadStoreTests + * @run testng/othervm -XX:-TieredCompilation Short64VectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/Short64VectorTests.java b/test/jdk/jdk/incubator/vector/Short64VectorTests.java index c24cd7b583a..885e3901238 100644 --- a/test/jdk/jdk/incubator/vector/Short64VectorTests.java +++ b/test/jdk/jdk/incubator/vector/Short64VectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch Short64VectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation Short64VectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java index 45cd6dedb0a..9770eae468e 100644 --- a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java +++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java @@ -25,7 +25,7 @@ * @test * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * ShortMaxVectorLoadStoreTests + * -XX:-TieredCompilation ShortMaxVectorLoadStoreTests * */ diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java index b056149e5b3..f5b497bfa43 100644 --- a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java +++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch ShortMaxVectorTests + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation ShortMaxVectorTests */ // -- This file was mechanically generated: Do not edit! -- // diff --git a/test/jdk/jdk/incubator/vector/VectorReshapeTests.java b/test/jdk/jdk/incubator/vector/VectorReshapeTests.java index 83e86ea3736..422b6f702bf 100644 --- a/test/jdk/jdk/incubator/vector/VectorReshapeTests.java +++ b/test/jdk/jdk/incubator/vector/VectorReshapeTests.java @@ -40,7 +40,7 @@ * @modules jdk.incubator.vector * @modules java.base/jdk.internal.vm.annotation * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * VectorReshapeTests + * -XX:-TieredCompilation VectorReshapeTests */ @Test diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template index a5b677a02d9..656cd3c7631 100644 --- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template +++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template @@ -24,7 +24,7 @@ /* * @test * @modules jdk.incubator.vector - * @run testng/othervm -ea -esa -Xbatch $vectorteststype$ + * @run testng/othervm -ea -esa -Xbatch -XX:-TieredCompilation $vectorteststype$ */ #warn This file is preprocessed before being compiled diff --git a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template index cb952e3566b..1b44e8fc750 100644 --- a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template +++ b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template @@ -26,9 +26,9 @@ * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation #if[MaxBit] * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED - * $vectorteststype$ + * -XX:-TieredCompilation $vectorteststype$ #else[MaxBit] - * @run testng $vectorteststype$ + * @run testng/othervm -XX:-TieredCompilation $vectorteststype$ #end[MaxBit] * */ From 881bceb9a3bd8b7585d0b62faff7365f29d9339b Mon Sep 17 00:00:00 2001 From: Guoxiong Li Date: Mon, 28 Dec 2020 15:32:02 +0000 Subject: [PATCH 7/9] 8258662: JDK 17ea: Crash compiling instanceof check involving sealed interface Reviewed-by: vromero --- .../com/sun/tools/javac/code/Types.java | 4 +- .../tools/javac/sealed/T8258662/T8258662.java | 73 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 test/langtools/tools/javac/sealed/T8258662/T8258662.java diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java index e6fe7e88f51..de2a73e2e3a 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java @@ -1656,7 +1656,9 @@ public boolean isCastable(Type t, Type s, Warner warn) { } else { result = isCastable.visit(t,s); } - if (result && (t.tsym.isSealed() || s.tsym.isSealed())) { + if (result && t.hasTag(CLASS) && t.tsym.kind.matches(Kinds.KindSelector.TYP) + && s.hasTag(CLASS) && s.tsym.kind.matches(Kinds.KindSelector.TYP) + && (t.tsym.isSealed() || s.tsym.isSealed())) { return (t.isCompound() || s.isCompound()) ? false : !areDisjoint((ClassSymbol)t.tsym, (ClassSymbol)s.tsym); diff --git a/test/langtools/tools/javac/sealed/T8258662/T8258662.java b/test/langtools/tools/javac/sealed/T8258662/T8258662.java new file mode 100644 index 00000000000..367a6b73352 --- /dev/null +++ b/test/langtools/tools/javac/sealed/T8258662/T8258662.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2020, 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 8258662 + * @summary Types.isCastable crashes when involving sealed interface and type variable. + * @library /tools/lib + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * @build toolbox.ToolBox toolbox.JavacTask + * @run main T8258662 + */ + +import java.util.List; + +import toolbox.ToolBox; +import toolbox.TestRunner; +import toolbox.JavacTask; + +public class T8258662 extends TestRunner { + private ToolBox tb; + + public T8258662() { + super(System.err); + tb = new ToolBox(); + } + + public static void main(String[] args) throws Exception { + T8258662 t = new T8258662(); + t.runTests(); + } + + @Test + public void testSealedClassIsCastable() throws Exception { + String code = """ + class Test8258662 { + sealed interface I { + final class C implements I { } + } + static > void f(T x) { + if (x instanceof I) { } + } + }"""; + new JavacTask(tb) + .sources(code) + .classpath(".") + .options("--enable-preview", "-source", Integer.toString(Runtime.version().feature())) + .run() + .writeAll(); + } + +} From 8435f0daf2413a4c17578dd288e093fe006b3880 Mon Sep 17 00:00:00 2001 From: Guoxiong Li Date: Wed, 30 Dec 2020 17:20:54 +0000 Subject: [PATCH 8/9] 8258525: Some existing tests should use /nodynamiccopyright/ instead of the standard header Reviewed-by: jjg --- .../tools/javac/4917091/Test256a.java | 25 +-------- .../tools/javac/4917091/Test256a.out | 2 +- .../tools/javac/4917091/Test256b.java | 25 +-------- .../tools/javac/4917091/Test256b.out | 2 +- .../javac/6979683/TestCast6979683_BAD34.java | 25 +-------- .../6979683/TestCast6979683_BAD34.java.errlog | 2 +- .../javac/6979683/TestCast6979683_BAD35.java | 25 +-------- .../6979683/TestCast6979683_BAD35.java.errlog | 2 +- .../javac/6979683/TestCast6979683_BAD36.java | 25 +-------- .../6979683/TestCast6979683_BAD36.java.errlog | 2 +- .../javac/6979683/TestCast6979683_BAD37.java | 25 +-------- .../6979683/TestCast6979683_BAD37.java.errlog | 2 +- .../javac/6979683/TestCast6979683_BAD38.java | 25 +-------- .../6979683/TestCast6979683_BAD38.java.errlog | 2 +- .../javac/6979683/TestCast6979683_BAD39.java | 25 +-------- .../6979683/TestCast6979683_BAD39.java.errlog | 2 +- .../tools/javac/7023703/T7023703neg.java | 25 +-------- .../tools/javac/7023703/T7023703neg.out | 8 +-- .../tools/javac/7024568/T7024568.java | 25 +-------- .../tools/javac/7024568/T7024568.out | 2 +- .../tools/javac/AnonStaticMember_1.java | 25 +-------- .../tools/javac/AnonStaticMember_1.out | 2 +- .../tools/javac/ClassCycle/ClassCycle1a.out | 2 +- .../tools/javac/ClassCycle/ClassCycle1b.java | 24 +------- .../tools/javac/ClassCycle/ClassCycle2a.out | 2 +- .../tools/javac/ClassCycle/ClassCycle2b.java | 24 +------- .../tools/javac/ClassCycle/ClassCycle3a.out | 2 +- .../tools/javac/ClassCycle/ClassCycle3b.java | 24 +------- ...nalVariableAssignedToInCatchBlockTest.java | 25 +-------- ...inalVariableAssignedToInCatchBlockTest.out | 4 +- test/langtools/tools/javac/T6326754.java | 25 +-------- test/langtools/tools/javac/T6326754.out | 8 +-- .../SerializableAbstractClassTest.java | 25 +-------- .../SerializableAbstractClassTest.out | 2 +- .../langtools/tools/javac/T8171332/Buggy.java | 23 +------- .../tools/javac/T8171332/Processor.out | 6 +- .../DuplicatedAnnotatedPackagesTest.out | 4 +- .../javac/T8171528/pkg1/package-info.java | 1 + .../javac/T8171528/pkg2/package-info.java | 1 + .../javac/T8222035/MinContextOpTest.java | 25 +-------- .../javac/T8222035/MinContextOpTest_A.out | 6 +- .../javac/T8222035/MinContextOpTest_B.out | 2 +- .../tools/javac/T8255968/T8255968_1.java | 25 +-------- .../tools/javac/T8255968/T8255968_1.out | 2 +- .../tools/javac/T8255968/T8255968_10.java | 25 +-------- .../tools/javac/T8255968/T8255968_10.out | 2 +- .../tools/javac/T8255968/T8255968_11.java | 25 +-------- .../tools/javac/T8255968/T8255968_11.out | 2 +- .../tools/javac/T8255968/T8255968_12.java | 25 +-------- .../tools/javac/T8255968/T8255968_12.out | 2 +- .../tools/javac/T8255968/T8255968_13.java | 25 +-------- .../tools/javac/T8255968/T8255968_13.out | 2 +- .../tools/javac/T8255968/T8255968_14.java | 25 +-------- .../tools/javac/T8255968/T8255968_14.out | 2 +- .../tools/javac/T8255968/T8255968_15.java | 25 +-------- .../tools/javac/T8255968/T8255968_15.out | 2 +- .../tools/javac/T8255968/T8255968_16.java | 25 +-------- .../tools/javac/T8255968/T8255968_16.out | 2 +- .../tools/javac/T8255968/T8255968_2.java | 25 +-------- .../tools/javac/T8255968/T8255968_2.out | 2 +- .../tools/javac/T8255968/T8255968_3.java | 25 +-------- .../tools/javac/T8255968/T8255968_3.out | 2 +- .../tools/javac/T8255968/T8255968_4.java | 25 +-------- .../tools/javac/T8255968/T8255968_4.out | 2 +- .../tools/javac/T8255968/T8255968_5.java | 25 +-------- .../tools/javac/T8255968/T8255968_5.out | 2 +- .../tools/javac/T8255968/T8255968_6.java | 25 +-------- .../tools/javac/T8255968/T8255968_6.out | 2 +- .../tools/javac/T8255968/T8255968_7.java | 25 +-------- .../tools/javac/T8255968/T8255968_7.out | 2 +- .../TryWithResources/ResourceInterface.java | 25 +-------- .../TryWithResources/ResourceInterface.out | 2 +- .../analyzer/AnalyzerMandatoryWarnings.java | 2 +- .../tools/javac/analyzer/StuckLambdas.java | 25 +-------- .../tools/javac/analyzer/StuckLambdas.out | 4 +- .../clinit/AnnoWithClinitFail.java | 25 +-------- .../annotations/clinit/AnnoWithClinitFail.out | 4 +- .../tools/javac/annotations/default/Derr.java | 23 +------- .../tools/javac/annotations/default/Derr.out | 2 +- .../tools/javac/annotations/default/Eerr.java | 23 +------- .../tools/javac/annotations/default/Eerr.out | 2 +- .../annotations/neg/InvalidPackageAnno.out | 2 +- .../annotations/neg/bar/package-info.java | 23 +------- .../DefaultTargetTypeParameter.java | 25 +-------- .../DefaultTargetTypeParameter.out | 2 +- .../DefaultTargetTypeUse.java | 25 +-------- .../DefaultTargetTypeUse.out | 2 +- .../repeatingAnnotations/DuplicateErrors.java | 25 +-------- .../repeatingAnnotations/DuplicateErrors.out | 4 +- .../RepeatingTargetNotAllowed.java | 25 +-------- .../RepeatingTargetNotAllowed.out | 2 +- .../typeAnnotations/6967002/T6967002.java | 25 +-------- .../typeAnnotations/6967002/T6967002.out | 2 +- .../DeclVsUseErrorMessage.java | 25 +-------- .../typeAnnotations/DeclVsUseErrorMessage.out | 4 +- .../failures/TypeVariableMissingTA.java | 25 +-------- .../failures/TypeVariableMissingTA.out | 2 +- .../common/receiver/StaticThings.java | 25 +-------- .../failures/common/receiver/StaticThings.out | 8 +-- .../failures/common/receiver/WrongType.java | 25 +-------- .../failures/common/receiver/WrongType.out | 16 +++--- .../failures/target/DotClass.java | 25 +-------- .../failures/target/DotClass.out | 32 +++++------ .../RepeatingTypeAnnotations.java | 25 +-------- .../newlocations/RepeatingTypeAnnotations.out | 50 ++++++++--------- .../tools/javac/cast/6270087/T6270087neg.java | 25 +-------- .../tools/javac/cast/6270087/T6270087neg.out | 2 +- .../tools/javac/cast/6932571/T6932571neg.java | 25 +-------- .../tools/javac/cast/6932571/T6932571neg.out | 2 +- .../tools/javac/danglingDep/DepX.java | 25 +-------- .../tools/javac/danglingDep/DepX.out | 2 +- .../javac/defaultMethods/static/Static02.java | 25 +-------- .../javac/defaultMethods/static/Static02.out | 2 +- .../static/import/StaticImport2.java | 25 +-------- .../static/import/StaticImport2.out | 2 +- .../static/import/StaticImport3.java | 25 +-------- .../static/import/StaticImport3.out | 2 +- .../javac/depOverrides/doccomment/B3.java | 24 +------- .../javac/depOverrides/doccomment/I.java | 24 +------- .../javac/depOverrides/doccomment/P.java | 24 +------- .../javac/depOverrides/doccomment/Test1B3.out | 14 ++--- .../javac/depOverrides/doccomment/Test1I.out | 16 +++--- .../javac/depOverrides/doccomment/Test2P.out | 18 +++--- .../tools/javac/diags/EagerInitCheck.out | 2 +- .../tools/javac/diags/IEagerInitCheck.java | 23 +------- .../javac/generics/7022054/T7022054pos1.java | 25 +-------- .../javac/generics/7022054/T7022054pos1.out | 2 +- .../javac/generics/7022054/T7022054pos2.java | 25 +-------- .../javac/generics/7022054/T7022054pos2.out | 2 +- .../generics/inference/6650759/T6650759m.java | 25 +-------- .../generics/inference/6650759/T6650759m.out | 2 +- .../typevars/5060485/Compatibility.java | 25 +-------- .../typevars/5060485/Compatibility.out | 2 +- .../typevars/5060485/Compatibility02.java | 25 +-------- .../typevars/5060485/Compatibility02.out | 2 +- .../wildcards/6886247/T6886247_2.java | 27 +-------- .../generics/wildcards/6886247/T6886247_2.out | 2 +- .../generics/wildcards/7034495/T7034495.java | 25 +-------- .../generics/wildcards/7034495/T7034495.out | 2 +- .../wildcards/AssignmentDifferentTypes.java | 25 +-------- .../wildcards/AssignmentDifferentTypes.out | 16 +++--- .../wildcards/AssignmentSameType.java | 25 +-------- .../generics/wildcards/AssignmentSameType.out | 14 ++--- .../generics/wildcards/neg/CastFail.java | 25 +-------- .../javac/generics/wildcards/neg/CastFail.out | 42 +++++++------- .../generics/wildcards/neg/CastWarn.java | 25 +-------- .../javac/generics/wildcards/neg/CastWarn.out | 26 ++++----- .../javac/importChecks/ImportCanonical1.out | 2 +- .../javac/importChecks/ImportCanonical2.java | 23 +------- .../ImportCanonicalSameName.java | 25 +-------- .../ImportCanonicalSameName.out | 2 +- .../javac/importChecks/ImportsObservable.java | 25 +-------- .../javac/importChecks/ImportsObservable.out | 2 +- .../ImportOnDemandConflicts.out | 2 +- .../tools/javac/importOnDemand/p1/Object.java | 23 ++++++++ .../tools/javac/importOnDemand/p1/String.java | 2 + .../javac/importOnDemand/p2/Boolean.java | 23 ++++++++ .../javac/importscope/ImportInaccessible.java | 25 +-------- .../javac/importscope/ImportInaccessible.out | 2 +- .../javac/lambda/ExceptionsInLambda.java | 25 +-------- .../tools/javac/lambda/ExceptionsInLambda.out | 6 +- .../tools/javac/lambda/Intersection02.java | 25 +-------- .../tools/javac/lambda/Intersection02.out | 2 +- .../tools/javac/lambda/MethodReference25.java | 25 +-------- .../tools/javac/lambda/MethodReference25.out | 2 +- .../tools/javac/lambda/MethodReference56.java | 25 +-------- .../tools/javac/lambda/MethodReference56.out | 4 +- .../tools/javac/lambda/MethodReference58.java | 25 +-------- .../tools/javac/lambda/MethodReference58.out | 2 +- .../tools/javac/lambda/MethodReference60.java | 25 +-------- .../tools/javac/lambda/MethodReference60.out | 10 ++-- .../tools/javac/lambda/MostSpecific04.java | 25 +-------- .../tools/javac/lambda/MostSpecific04.out | 2 +- .../tools/javac/lambda/MostSpecific05.java | 25 +-------- .../tools/javac/lambda/MostSpecific05.out | 2 +- .../tools/javac/lambda/MostSpecific08.java | 25 +-------- .../tools/javac/lambda/MostSpecific08.out | 6 +- .../tools/javac/lambda/TargetType01.java | 25 +-------- .../tools/javac/lambda/TargetType01.out | 4 +- .../tools/javac/lambda/TargetType36.java | 25 +-------- .../tools/javac/lambda/TargetType36.out | 4 +- .../tools/javac/lambda/TargetType68.java | 25 +-------- .../tools/javac/lambda/TargetType68.out | 2 +- .../tools/javac/lambda/UnderscoreAsIdent.java | 25 +-------- .../tools/javac/lambda/UnderscoreAsIdent8.out | 34 +++++------ .../tools/javac/lambda/UnderscoreAsIdent9.out | 34 +++++------ .../InaccessibleMref01.java | 25 +-------- .../inaccessibleMref01/InaccessibleMref01.out | 2 +- .../methodReference/MethodRefStuck.java | 25 +-------- .../lambda/methodReference/MethodRefStuck.out | 2 +- .../MethodRefStuckParenthesized.java | 25 +-------- .../MethodRefStuckParenthesized.out | 2 +- .../MethodReferenceTestVarHandle_neg.java | 25 +-------- .../MethodReferenceTestVarHandle_neg.out | 2 +- .../tools/javac/lambda/speculative/A.java | 23 +------- .../tools/javac/lambda/speculative/Main.out | 2 +- .../tools/javac/limits/ArrayDims2.java | 25 +-------- .../tools/javac/limits/ArrayDims2.out | 2 +- .../tools/javac/limits/ArrayDims4.java | 25 +-------- .../tools/javac/limits/ArrayDims4.out | 2 +- .../tools/javac/limits/ArrayDims5.java | 25 +-------- .../tools/javac/limits/ArrayDims5.out | 2 +- .../tools/javac/limits/CodeSize.java | 25 +-------- .../langtools/tools/javac/limits/CodeSize.out | 2 +- .../tools/javac/limits/LongName.java | 25 +-------- .../langtools/tools/javac/limits/LongName.out | 2 +- .../tools/javac/limits/PoolSize1.java | 25 +-------- .../tools/javac/limits/PoolSize1.out | 2 +- .../tools/javac/limits/PoolSize2.java | 25 +-------- .../tools/javac/limits/PoolSize2.out | 2 +- .../tools/javac/limits/StringLength.java | 25 +-------- .../tools/javac/limits/StringLength.out | 2 +- .../tools/javac/overrridecrash/A.java | 23 +------- .../tools/javac/overrridecrash/B.out | 2 +- .../SingleCommaAnnotationValueFail.java | 25 +-------- .../parser/SingleCommaAnnotationValueFail.out | 4 +- .../tools/javac/parser/T4881269.java | 25 +-------- .../langtools/tools/javac/parser/T4881269.out | 8 +-- .../javac/patterns/CastConversionMatch.java | 2 +- .../tools/javac/patterns/NullsInPatterns.java | 25 +-------- .../tools/javac/patterns/NullsInPatterns.out | 4 +- .../patterns/PatternVariablesAreNonFinal.java | 25 +-------- .../patterns/PatternVariablesAreNonFinal.out | 2 +- .../javac/plugin/showtype/Identifiers.java | 2 +- .../javac/processing/TestMultipleErrors.java | 2 +- .../errors/TestParseErrors/ParseErrors.java | 24 +------- .../TestParseErrors/TestParseErrors.out | 4 +- .../TestMissingElement/InvalidSource.java | 23 +------- .../TestMissingElement/TestMissingElement.ref | 44 +++++++-------- .../model/trees/BrokenEnumConstructor.java | 25 +-------- .../model/trees/BrokenEnumConstructor.out | 2 +- .../model/util/directSupersOfErr/C1.java | 23 +------- .../directSupersOfErr/DirectSupersOfErr.ref | 2 +- .../tools/javac/recovery/LocalVarHiding.java | 25 +-------- .../tools/javac/recovery/LocalVarHiding.out | 14 ++--- .../tools/javac/sourcePath2/SourcePath2.out | 2 +- .../javac/sourcePath2/p/SourcePath2A.java | 23 +------- .../javac/staticImport/6695838/T6695838.out | 2 +- .../javac/staticImport/6695838/a/Foo.java | 23 +------- .../tools/javac/switchexpr/EmptySwitch.java | 25 +-------- .../tools/javac/switchexpr/EmptySwitch.out | 10 ++-- .../javac/switchexpr/WarnWrongYieldTest.java | 25 +-------- .../javac/switchexpr/WarnWrongYieldTest.out | 56 +++++++++---------- .../javac/switchexpr/WrongBreakTest.java | 25 +-------- .../tools/javac/switchexpr/WrongBreakTest.out | 12 ++-- .../javac/switchexpr/WrongYieldTest.java | 25 +-------- .../tools/javac/switchexpr/WrongYieldTest.out | 56 +++++++++---------- .../SwitchArrowBrokenConstant.java | 2 +- .../switchextra/SwitchStatementArrow.java | 2 +- .../javac/varargs/5088429/T5088429Neg01.java | 25 +-------- .../javac/varargs/5088429/T5088429Neg01.out | 2 +- .../javac/varargs/5088429/T5088429Neg02.java | 25 +-------- .../javac/varargs/5088429/T5088429Neg02.out | 2 +- .../tools/javac/varargs/VarargsOverride.java | 2 +- .../ClassUsingAnotherAuxiliary.java | 25 +-------- .../ClassUsingAnotherAuxiliary.out | 2 +- .../AuxiliaryClass/ClassUsingAuxiliary.java | 25 +-------- .../AuxiliaryClass/ClassUsingAuxiliary1.out | 2 +- .../AuxiliaryClass/ClassUsingAuxiliary2.out | 2 +- .../javac/warnings/MaxDiagsRecompile.all.out | 8 +-- .../javac/warnings/MaxDiagsRecompile.java | 25 +-------- .../javac/warnings/MaxDiagsRecompile.max1.out | 2 +- .../javac/warnings/MaxWarnsRecompile.all.out | 8 +-- .../javac/warnings/MaxWarnsRecompile.java | 25 +-------- .../javac/warnings/MaxWarnsRecompile.max1.out | 2 +- 265 files changed, 587 insertions(+), 3335 deletions(-) diff --git a/test/langtools/tools/javac/4917091/Test256a.java b/test/langtools/tools/javac/4917091/Test256a.java index 0c18e1dcd24..d20e0db17a3 100644 --- a/test/langtools/tools/javac/4917091/Test256a.java +++ b/test/langtools/tools/javac/4917091/Test256a.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 2011, 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 + * @test /nodynamiccopyright/ * @bug 4917091 * @summary javac rejects array over 128 in length * @compile/fail/ref=Test256a.out -XDrawDiagnostics Test256a.java diff --git a/test/langtools/tools/javac/4917091/Test256a.out b/test/langtools/tools/javac/4917091/Test256a.out index ccc107fc4bd..087a031e5e9 100644 --- a/test/langtools/tools/javac/4917091/Test256a.out +++ b/test/langtools/tools/javac/4917091/Test256a.out @@ -1,2 +1,2 @@ -Test256a.java:33:46: compiler.err.limit.dimensions +Test256a.java:10:46: compiler.err.limit.dimensions 1 error diff --git a/test/langtools/tools/javac/4917091/Test256b.java b/test/langtools/tools/javac/4917091/Test256b.java index 6a5c4a9baeb..358f4e8c083 100644 --- a/test/langtools/tools/javac/4917091/Test256b.java +++ b/test/langtools/tools/javac/4917091/Test256b.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 2011, 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 + * @test /nodynamiccopyright/ * @bug 4917091 * @summary javac rejects array over 128 in length * @compile/fail/ref=Test256b.out -XDrawDiagnostics Test256b.java diff --git a/test/langtools/tools/javac/4917091/Test256b.out b/test/langtools/tools/javac/4917091/Test256b.out index 3fc10cc4155..b19942b9c58 100644 --- a/test/langtools/tools/javac/4917091/Test256b.out +++ b/test/langtools/tools/javac/4917091/Test256b.out @@ -1,2 +1,2 @@ -Test256b.java:36:46: compiler.err.limit.dimensions +Test256b.java:13:46: compiler.err.limit.dimensions 1 error diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java index d58b2ce9697..8830913d6f3 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6979683 * @summary Verify that casts can narrow and unbox at the same time * @author jrose diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java.errlog index c463cae3641..727f499bc72 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java.errlog +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD34.java.errlog @@ -1,2 +1,2 @@ -TestCast6979683_BAD34.java:34:49: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, boolean) +TestCast6979683_BAD34.java:11:49: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, boolean) 1 error diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java index d738f273e96..452b79b8891 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6979683 * @summary Verify that casts can narrow and unbox at the same time * @author jrose diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java.errlog index 17c497fc37e..76fe4e4ecb5 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java.errlog +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD35.java.errlog @@ -1,2 +1,2 @@ -TestCast6979683_BAD35.java:35:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, int) +TestCast6979683_BAD35.java:12:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, int) 1 error diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java index a86137367a7..f2646996d82 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6979683 * @summary Verify that casts can narrow and unbox at the same time * @author jrose diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java.errlog index 05f7cb46eb3..b4518fdd4a9 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java.errlog +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD36.java.errlog @@ -1,2 +1,2 @@ -TestCast6979683_BAD36.java:36:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable, int) +TestCast6979683_BAD36.java:13:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable, int) 1 error diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java index f972b5337f8..d9ac158a8ab 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6979683 * @summary Verify that casts can narrow and unbox at the same time * @author jrose diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java.errlog index a490164bc44..3640dca889d 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java.errlog +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD37.java.errlog @@ -1,2 +1,2 @@ -TestCast6979683_BAD37.java:37:61: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable, int) +TestCast6979683_BAD37.java:14:61: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable, int) 1 error diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java index 043fa452619..ebc775fb1b7 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6979683 * @summary Verify that casts can narrow and unbox at the same time * @author jrose diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java.errlog index 90ebb73b1b4..14f59e48995 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java.errlog +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD38.java.errlog @@ -1,2 +1,2 @@ -TestCast6979683_BAD38.java:38:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable, float) +TestCast6979683_BAD38.java:15:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable, float) 1 error diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java b/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java index ab11d0d78ff..36024e0e9b0 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6979683 * @summary Verify that casts can narrow and unbox at the same time * @author jrose diff --git a/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java.errlog b/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java.errlog index 716d1e98eb3..7979cd198be 100644 --- a/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java.errlog +++ b/test/langtools/tools/javac/6979683/TestCast6979683_BAD39.java.errlog @@ -1,2 +1,2 @@ -TestCast6979683_BAD39.java:39:53: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, char) +TestCast6979683_BAD39.java:16:53: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, char) 1 error diff --git a/test/langtools/tools/javac/7023703/T7023703neg.java b/test/langtools/tools/javac/7023703/T7023703neg.java index b929d3e478e..1214daf4243 100644 --- a/test/langtools/tools/javac/7023703/T7023703neg.java +++ b/test/langtools/tools/javac/7023703/T7023703neg.java @@ -1,27 +1,4 @@ -/* - * Copyright (c) 2011, 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 +/* @test /nodynamiccopyright/ * @bug 7023703 * @summary Valid code doesn't compile * @compile/fail/ref=T7023703neg.out -XDrawDiagnostics T7023703neg.java diff --git a/test/langtools/tools/javac/7023703/T7023703neg.out b/test/langtools/tools/javac/7023703/T7023703neg.out index 66d5ce9fbba..8ac89f6bf80 100644 --- a/test/langtools/tools/javac/7023703/T7023703neg.out +++ b/test/langtools/tools/javac/7023703/T7023703neg.out @@ -1,5 +1,5 @@ -T7023703neg.java:37:13: compiler.err.var.might.be.assigned.in.loop: bug2 -T7023703neg.java:47:13: compiler.err.var.might.be.assigned.in.loop: bug2 -T7023703neg.java:57:13: compiler.err.var.might.be.assigned.in.loop: bug2 -T7023703neg.java:67:13: compiler.err.var.might.be.assigned.in.loop: bug2 +T7023703neg.java:14:13: compiler.err.var.might.be.assigned.in.loop: bug2 +T7023703neg.java:24:13: compiler.err.var.might.be.assigned.in.loop: bug2 +T7023703neg.java:34:13: compiler.err.var.might.be.assigned.in.loop: bug2 +T7023703neg.java:44:13: compiler.err.var.might.be.assigned.in.loop: bug2 4 errors diff --git a/test/langtools/tools/javac/7024568/T7024568.java b/test/langtools/tools/javac/7024568/T7024568.java index b54e3b0306f..b03b9f95e33 100644 --- a/test/langtools/tools/javac/7024568/T7024568.java +++ b/test/langtools/tools/javac/7024568/T7024568.java @@ -1,27 +1,4 @@ -/* - * Copyright (c) 2011, 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 +/* @test /nodynamiccopyright/ * @bug 7024568 * @summary Very long method resolution causing OOM error * @compile/fail/ref=T7024568.out -XDrawDiagnostics T7024568.java diff --git a/test/langtools/tools/javac/7024568/T7024568.out b/test/langtools/tools/javac/7024568/T7024568.out index 51b818f9efc..8fff965fe32 100644 --- a/test/langtools/tools/javac/7024568/T7024568.out +++ b/test/langtools/tools/javac/7024568/T7024568.out @@ -1,2 +1,2 @@ -T7024568.java:32:40: compiler.err.cant.resolve.location: kindname.variable, undefined, , , (compiler.misc.location: kindname.class, Main, null) +T7024568.java:9:40: compiler.err.cant.resolve.location: kindname.variable, undefined, , , (compiler.misc.location: kindname.class, Main, null) 1 error diff --git a/test/langtools/tools/javac/AnonStaticMember_1.java b/test/langtools/tools/javac/AnonStaticMember_1.java index bc7b2542e34..b008b4b3c1c 100644 --- a/test/langtools/tools/javac/AnonStaticMember_1.java +++ b/test/langtools/tools/javac/AnonStaticMember_1.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 1999, 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 + * @test /nodynamiccopyright/ * @bug 4279339 * @summary Verify that an anonymous class can contain a static field only if source >= 16 * @author maddox diff --git a/test/langtools/tools/javac/AnonStaticMember_1.out b/test/langtools/tools/javac/AnonStaticMember_1.out index 7398987790e..c8700f93dc9 100644 --- a/test/langtools/tools/javac/AnonStaticMember_1.out +++ b/test/langtools/tools/javac/AnonStaticMember_1.out @@ -1,4 +1,4 @@ - compiler.warn.source.no.system.modules.path: 15 -AnonStaticMember_1.java:36:20: compiler.err.icls.cant.have.static.decl: compiler.misc.anonymous.class: AnonStaticMember_1$1 +AnonStaticMember_1.java:13:20: compiler.err.icls.cant.have.static.decl: compiler.misc.anonymous.class: AnonStaticMember_1$1 1 error 1 warning diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle1a.out b/test/langtools/tools/javac/ClassCycle/ClassCycle1a.out index 09d84339eb2..7ff9a01fafe 100644 --- a/test/langtools/tools/javac/ClassCycle/ClassCycle1a.out +++ b/test/langtools/tools/javac/ClassCycle/ClassCycle1a.out @@ -1,2 +1,2 @@ -ClassCycle1b.java:28:1: compiler.err.cyclic.inheritance: ClassCycle1b +ClassCycle1b.java:6:1: compiler.err.cyclic.inheritance: ClassCycle1b 1 error diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle1b.java b/test/langtools/tools/javac/ClassCycle/ClassCycle1b.java index 04e15491486..afc8f31893e 100644 --- a/test/langtools/tools/javac/ClassCycle/ClassCycle1b.java +++ b/test/langtools/tools/javac/ClassCycle/ClassCycle1b.java @@ -1,27 +1,5 @@ /* - * Copyright (c) 2001, 2015, 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. - */ - -/* + * /nodynamiccopyright/ * Auxiliary source file for ClassCycle1a. */ diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle2a.out b/test/langtools/tools/javac/ClassCycle/ClassCycle2a.out index dda4ad75e22..99d14993251 100644 --- a/test/langtools/tools/javac/ClassCycle/ClassCycle2a.out +++ b/test/langtools/tools/javac/ClassCycle/ClassCycle2a.out @@ -1,2 +1,2 @@ -ClassCycle2b.java:28:1: compiler.err.cyclic.inheritance: ClassCycle2b +ClassCycle2b.java:6:1: compiler.err.cyclic.inheritance: ClassCycle2b 1 error diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle2b.java b/test/langtools/tools/javac/ClassCycle/ClassCycle2b.java index d77c21f6113..4ff7c9de49a 100644 --- a/test/langtools/tools/javac/ClassCycle/ClassCycle2b.java +++ b/test/langtools/tools/javac/ClassCycle/ClassCycle2b.java @@ -1,27 +1,5 @@ /* - * Copyright (c) 2001, 2015, 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. - */ - -/* + * /nodynamiccopyright/ * Auxiliary source file for ClassCycle2a. */ diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle3a.out b/test/langtools/tools/javac/ClassCycle/ClassCycle3a.out index 99a34e942bb..142b0c636c0 100644 --- a/test/langtools/tools/javac/ClassCycle/ClassCycle3a.out +++ b/test/langtools/tools/javac/ClassCycle/ClassCycle3a.out @@ -1,2 +1,2 @@ -ClassCycle3b.java:28:1: compiler.err.cyclic.inheritance: ClassCycle3b +ClassCycle3b.java:6:1: compiler.err.cyclic.inheritance: ClassCycle3b 1 error diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle3b.java b/test/langtools/tools/javac/ClassCycle/ClassCycle3b.java index 8848e1cdceb..a0d2fe91186 100644 --- a/test/langtools/tools/javac/ClassCycle/ClassCycle3b.java +++ b/test/langtools/tools/javac/ClassCycle/ClassCycle3b.java @@ -1,27 +1,5 @@ /* - * Copyright (c) 2001, 2015, 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. - */ - -/* + * /nodynamiccopyright/ * Auxiliary source file for ClassCycle3a. */ diff --git a/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java b/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java index ec1caf3523c..e649b72d3d6 100644 --- a/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java +++ b/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 6356530 * @summary -Xlint:serial does not flag abstract classes with concrete methods/members * @compile/fail/ref=FinalVariableAssignedToInCatchBlockTest.out -XDrawDiagnostics FinalVariableAssignedToInCatchBlockTest.java diff --git a/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out b/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out index 58ed58efe31..1bcbb005b13 100644 --- a/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out +++ b/test/langtools/tools/javac/T6326693/FinalVariableAssignedToInCatchBlockTest.out @@ -1,3 +1,3 @@ -FinalVariableAssignedToInCatchBlockTest.java:52:13: compiler.err.var.might.already.be.assigned: i -FinalVariableAssignedToInCatchBlockTest.java:92:9: compiler.err.var.might.already.be.assigned: i +FinalVariableAssignedToInCatchBlockTest.java:29:13: compiler.err.var.might.already.be.assigned: i +FinalVariableAssignedToInCatchBlockTest.java:69:9: compiler.err.var.might.already.be.assigned: i 2 errors diff --git a/test/langtools/tools/javac/T6326754.java b/test/langtools/tools/javac/T6326754.java index 5eee1ccc2a9..5612ac65c0c 100644 --- a/test/langtools/tools/javac/T6326754.java +++ b/test/langtools/tools/javac/T6326754.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6326754 * @summary Compiler will fail to handle -Xmaxerrs with -ve numbers * diff --git a/test/langtools/tools/javac/T6326754.out b/test/langtools/tools/javac/T6326754.out index 00963b8c864..28af27c7471 100644 --- a/test/langtools/tools/javac/T6326754.out +++ b/test/langtools/tools/javac/T6326754.out @@ -1,7 +1,7 @@ -T6326754.java:44:12: compiler.err.name.clash.same.erasure: TestConstructor(T), TestConstructor(K) -T6326754.java:52:17: compiler.err.name.clash.same.erasure: setT(K), setT(T) -T6326754.java:64:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, T) -T6326754.java:70:11: compiler.err.cant.apply.symbol: kindname.method, setT, java.lang.Object, compiler.misc.no.args, kindname.class, TestC, (compiler.misc.arg.length.mismatch) +T6326754.java:21:12: compiler.err.name.clash.same.erasure: TestConstructor(T), TestConstructor(K) +T6326754.java:29:17: compiler.err.name.clash.same.erasure: setT(K), setT(T) +T6326754.java:41:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, T) +T6326754.java:47:11: compiler.err.cant.apply.symbol: kindname.method, setT, java.lang.Object, compiler.misc.no.args, kindname.class, TestC, (compiler.misc.arg.length.mismatch) - compiler.note.unchecked.filename: T6326754.java - compiler.note.unchecked.recompile 4 errors diff --git a/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.java b/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.java index 2b224be30ac..bf421d9a8ef 100644 --- a/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.java +++ b/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2013, 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 + * @test /nodynamiccopyright/ * @bug 6356530 8191637 * @summary -Xlint:serial does not flag abstract classes with persisent fields * @compile/fail/ref=SerializableAbstractClassTest.out -XDrawDiagnostics -Werror -Xlint:serial SerializableAbstractClassTest.java diff --git a/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.out b/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.out index 11c67dad864..ec610f1481b 100644 --- a/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.out +++ b/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.out @@ -1,4 +1,4 @@ -SerializableAbstractClassTest.java:31:10: compiler.warn.missing.SVUID: SerializableAbstractClassTest +SerializableAbstractClassTest.java:8:10: compiler.warn.missing.SVUID: SerializableAbstractClassTest - compiler.err.warnings.and.werror 1 error 1 warning diff --git a/test/langtools/tools/javac/T8171332/Buggy.java b/test/langtools/tools/javac/T8171332/Buggy.java index 229a3894c74..bd110fea3ac 100644 --- a/test/langtools/tools/javac/T8171332/Buggy.java +++ b/test/langtools/tools/javac/T8171332/Buggy.java @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2017, 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. - */ +/* /nodynamiccopyright/ */ @Deprecated enum Buggy implements Buggy {} diff --git a/test/langtools/tools/javac/T8171332/Processor.out b/test/langtools/tools/javac/T8171332/Processor.out index d5fb0881dff..c3fd0dc80f0 100644 --- a/test/langtools/tools/javac/T8171332/Processor.out +++ b/test/langtools/tools/javac/T8171332/Processor.out @@ -1,4 +1,4 @@ -Buggy.java:24:35: compiler.err.intf.expected.here -Buggy.java:24:13: compiler.err.cyclic.inheritance: Buggy -Buggy.java:24:1: compiler.err.annotation.type.not.applicable +Buggy.java:3:35: compiler.err.intf.expected.here +Buggy.java:3:13: compiler.err.cyclic.inheritance: Buggy +Buggy.java:3:1: compiler.err.annotation.type.not.applicable 3 errors diff --git a/test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out b/test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out index cdfe50c8bbe..099629b68ae 100644 --- a/test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out +++ b/test/langtools/tools/javac/T8171528/DuplicatedAnnotatedPackagesTest.out @@ -1,4 +1,4 @@ -package-info.java:2:9: compiler.warn.pkg-info.already.seen: test -package-info.java:1:1: compiler.err.already.annotated: kindname.package, test +package-info.java:3:9: compiler.warn.pkg-info.already.seen: test +package-info.java:2:1: compiler.err.already.annotated: kindname.package, test 1 error 1 warning diff --git a/test/langtools/tools/javac/T8171528/pkg1/package-info.java b/test/langtools/tools/javac/T8171528/pkg1/package-info.java index 5ff93a776a7..87eb456f581 100644 --- a/test/langtools/tools/javac/T8171528/pkg1/package-info.java +++ b/test/langtools/tools/javac/T8171528/pkg1/package-info.java @@ -1,2 +1,3 @@ +/* /nodynamiccopyright/ */ @Deprecated package test; diff --git a/test/langtools/tools/javac/T8171528/pkg2/package-info.java b/test/langtools/tools/javac/T8171528/pkg2/package-info.java index 5ff93a776a7..87eb456f581 100644 --- a/test/langtools/tools/javac/T8171528/pkg2/package-info.java +++ b/test/langtools/tools/javac/T8171528/pkg2/package-info.java @@ -1,2 +1,3 @@ +/* /nodynamiccopyright/ */ @Deprecated package test; diff --git a/test/langtools/tools/javac/T8222035/MinContextOpTest.java b/test/langtools/tools/javac/T8222035/MinContextOpTest.java index a9dfdd998e4..c0ee8e738c7 100644 --- a/test/langtools/tools/javac/T8222035/MinContextOpTest.java +++ b/test/langtools/tools/javac/T8222035/MinContextOpTest.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2019, Google LLC. 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 + * @test /nodynamiccopyright/ * @bug 8222035 * @summary minimal inference context optimization is forcing resolution with incomplete constraints * @compile/fail/ref=MinContextOpTest_A.out -XDrawDiagnostics -source 15 MinContextOpTest.java diff --git a/test/langtools/tools/javac/T8222035/MinContextOpTest_A.out b/test/langtools/tools/javac/T8222035/MinContextOpTest_A.out index 3d2dfd5fd9a..2321b85909d 100644 --- a/test/langtools/tools/javac/T8222035/MinContextOpTest_A.out +++ b/test/langtools/tools/javac/T8222035/MinContextOpTest_A.out @@ -1,6 +1,6 @@ - compiler.warn.source.no.system.modules.path: 15 -MinContextOpTest.java:39:25: compiler.err.mod.not.allowed.here: static -MinContextOpTest.java:45:25: compiler.err.mod.not.allowed.here: static -MinContextOpTest.java:51:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function, java.util.function.Function>)) +MinContextOpTest.java:16:25: compiler.err.mod.not.allowed.here: static +MinContextOpTest.java:22:25: compiler.err.mod.not.allowed.here: static +MinContextOpTest.java:28:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function, java.util.function.Function>)) 3 errors 1 warning diff --git a/test/langtools/tools/javac/T8222035/MinContextOpTest_B.out b/test/langtools/tools/javac/T8222035/MinContextOpTest_B.out index 658fcd8318c..e035d4ec492 100644 --- a/test/langtools/tools/javac/T8222035/MinContextOpTest_B.out +++ b/test/langtools/tools/javac/T8222035/MinContextOpTest_B.out @@ -1,2 +1,2 @@ -MinContextOpTest.java:51:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function, java.util.function.Function>)) +MinContextOpTest.java:28:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function, java.util.function.Function>)) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_1.java b/test/langtools/tools/javac/T8255968/T8255968_1.java index 4c19225c35e..b039f55c1f4 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_1.java +++ b/test/langtools/tools/javac/T8255968/T8255968_1.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_1.out -XDrawDiagnostics T8255968_1.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_1.out b/test/langtools/tools/javac/T8255968/T8255968_1.out index 710b9f3562a..bd8979654f4 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_1.out +++ b/test/langtools/tools/javac/T8255968/T8255968_1.out @@ -1,2 +1,2 @@ -T8255968_1.java:32:25: compiler.err.report.access: T8255968_1_Test(int), private, T8255968_1_Test +T8255968_1.java:9:25: compiler.err.report.access: T8255968_1_Test(int), private, T8255968_1_Test 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_10.java b/test/langtools/tools/javac/T8255968/T8255968_10.java index ea67b9a2baf..49172deb012 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_10.java +++ b/test/langtools/tools/javac/T8255968/T8255968_10.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_10.out -XDrawDiagnostics T8255968_10.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_10.out b/test/langtools/tools/javac/T8255968/T8255968_10.out index 45485766e44..638306b75fa 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_10.out +++ b/test/langtools/tools/javac/T8255968/T8255968_10.out @@ -1,2 +1,2 @@ -T8255968_10.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.report.access: T8255968_10_Test(int), private, T8255968_10_Test)) +T8255968_10.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.report.access: T8255968_10_Test(int), private, T8255968_10_Test)) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_11.java b/test/langtools/tools/javac/T8255968/T8255968_11.java index bec6e6e7a7f..42d264a0956 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_11.java +++ b/test/langtools/tools/javac/T8255968/T8255968_11.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_11.out -XDrawDiagnostics T8255968_11.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_11.out b/test/langtools/tools/javac/T8255968/T8255968_11.out index 63b1546402a..641d3e96a82 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_11.out +++ b/test/langtools/tools/javac/T8255968/T8255968_11.out @@ -1,2 +1,2 @@ -T8255968_11.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, T8255968_11_Test, java.lang.String, int, kindname.class, T8255968_11_Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))) +T8255968_11.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, T8255968_11_Test, java.lang.String, int, kindname.class, T8255968_11_Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_12.java b/test/langtools/tools/javac/T8255968/T8255968_12.java index f58181617c7..ff2a5704785 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_12.java +++ b/test/langtools/tools/javac/T8255968/T8255968_12.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_12.out -XDrawDiagnostics T8255968_12.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_12.out b/test/langtools/tools/javac/T8255968/T8255968_12.out index 5d9205c15ce..e694b6d3dd6 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_12.out +++ b/test/langtools/tools/javac/T8255968/T8255968_12.out @@ -1,2 +1,2 @@ -T8255968_12.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_12_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_12_Test, T8255968_12_Test(int), (compiler.misc.report.access: T8255968_12_Test(int), private, T8255968_12_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_12_Test, T8255968_12_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))})) +T8255968_12.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_12_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_12_Test, T8255968_12_Test(int), (compiler.misc.report.access: T8255968_12_Test(int), private, T8255968_12_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_12_Test, T8255968_12_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))})) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_13.java b/test/langtools/tools/javac/T8255968/T8255968_13.java index a1a0005f3e7..d73a3b011fe 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_13.java +++ b/test/langtools/tools/javac/T8255968/T8255968_13.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_13.out -XDrawDiagnostics T8255968_13.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_13.out b/test/langtools/tools/javac/T8255968/T8255968_13.out index 316c5a9a981..aaac9697689 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_13.out +++ b/test/langtools/tools/javac/T8255968/T8255968_13.out @@ -1,2 +1,2 @@ -T8255968_13.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_13_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_13_Test, T8255968_13_Test(int), (compiler.misc.report.access: T8255968_13_Test(int), private, T8255968_13_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_13_Test, T8255968_13_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))})) +T8255968_13.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_13_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_13_Test, T8255968_13_Test(int), (compiler.misc.report.access: T8255968_13_Test(int), private, T8255968_13_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_13_Test, T8255968_13_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))})) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_14.java b/test/langtools/tools/javac/T8255968/T8255968_14.java index f80c84cb8cb..9172a2b390d 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_14.java +++ b/test/langtools/tools/javac/T8255968/T8255968_14.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_14.out -XDrawDiagnostics T8255968_14.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_14.out b/test/langtools/tools/javac/T8255968/T8255968_14.out index 8df0f90875d..e45ebd73b9e 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_14.out +++ b/test/langtools/tools/javac/T8255968/T8255968_14.out @@ -1,2 +1,2 @@ -T8255968_14.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_14_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_14_Test, T8255968_14_Test(int), (compiler.misc.report.access: T8255968_14_Test(int), private, T8255968_14_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_14_Test, T8255968_14_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_14_Test, T8255968_14_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))})) +T8255968_14.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_14_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_14_Test, T8255968_14_Test(int), (compiler.misc.report.access: T8255968_14_Test(int), private, T8255968_14_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_14_Test, T8255968_14_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_14_Test, T8255968_14_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))})) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_15.java b/test/langtools/tools/javac/T8255968/T8255968_15.java index 49f900381ef..7b7e0ab1f8b 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_15.java +++ b/test/langtools/tools/javac/T8255968/T8255968_15.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_15.out -XDrawDiagnostics T8255968_15.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_15.out b/test/langtools/tools/javac/T8255968/T8255968_15.out index cf9e7cd8af7..061e71d2813 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_15.out +++ b/test/langtools/tools/javac/T8255968/T8255968_15.out @@ -1,2 +1,2 @@ -T8255968_15.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_15_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_15_Test, T8255968_15_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_15_Test, T8255968_15_Test(int), (compiler.misc.report.access: T8255968_15_Test(int), private, T8255968_15_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_15_Test, T8255968_15_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))})) +T8255968_15.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_15_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_15_Test, T8255968_15_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_15_Test, T8255968_15_Test(int), (compiler.misc.report.access: T8255968_15_Test(int), private, T8255968_15_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_15_Test, T8255968_15_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))})) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_16.java b/test/langtools/tools/javac/T8255968/T8255968_16.java index 96383388970..c893cfd2070 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_16.java +++ b/test/langtools/tools/javac/T8255968/T8255968_16.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_16.out -XDrawDiagnostics T8255968_16.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_16.out b/test/langtools/tools/javac/T8255968/T8255968_16.out index 790dac8e8a3..0037614f9eb 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_16.out +++ b/test/langtools/tools/javac/T8255968/T8255968_16.out @@ -1,2 +1,2 @@ -T8255968_16.java:32:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_16_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_16_Test, T8255968_16_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_16_Test, T8255968_16_Test(int), (compiler.misc.report.access: T8255968_16_Test(int), private, T8255968_16_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_16_Test, T8255968_16_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))})) +T8255968_16.java:9:41: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbols: kindname.constructor, T8255968_16_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_16_Test, T8255968_16_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_16_Test, T8255968_16_Test(int), (compiler.misc.report.access: T8255968_16_Test(int), private, T8255968_16_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_16_Test, T8255968_16_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))})) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_2.java b/test/langtools/tools/javac/T8255968/T8255968_2.java index 01fe3480113..238415e27d2 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_2.java +++ b/test/langtools/tools/javac/T8255968/T8255968_2.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_2.out -XDrawDiagnostics T8255968_2.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_2.out b/test/langtools/tools/javac/T8255968/T8255968_2.out index 41b878a7811..70dce886919 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_2.out +++ b/test/langtools/tools/javac/T8255968/T8255968_2.out @@ -1,2 +1,2 @@ -T8255968_2.java:32:25: compiler.err.cant.apply.symbol: kindname.constructor, T8255968_2_Test, java.lang.String, int, kindname.class, T8255968_2_Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)) +T8255968_2.java:9:25: compiler.err.cant.apply.symbol: kindname.constructor, T8255968_2_Test, java.lang.String, int, kindname.class, T8255968_2_Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)) 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_3.java b/test/langtools/tools/javac/T8255968/T8255968_3.java index 0125995a5f1..d2de78b1266 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_3.java +++ b/test/langtools/tools/javac/T8255968/T8255968_3.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_3.out -XDrawDiagnostics T8255968_3.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_3.out b/test/langtools/tools/javac/T8255968/T8255968_3.out index 55d6efad3a4..0b33802261a 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_3.out +++ b/test/langtools/tools/javac/T8255968/T8255968_3.out @@ -1,2 +1,2 @@ -T8255968_3.java:32:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_3_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_3_Test, T8255968_3_Test(int), (compiler.misc.report.access: T8255968_3_Test(int), private, T8255968_3_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_3_Test, T8255968_3_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))} +T8255968_3.java:9:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_3_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_3_Test, T8255968_3_Test(int), (compiler.misc.report.access: T8255968_3_Test(int), private, T8255968_3_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_3_Test, T8255968_3_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))} 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_4.java b/test/langtools/tools/javac/T8255968/T8255968_4.java index 57e4f511060..348d395bdcb 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_4.java +++ b/test/langtools/tools/javac/T8255968/T8255968_4.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_4.out -XDrawDiagnostics T8255968_4.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_4.out b/test/langtools/tools/javac/T8255968/T8255968_4.out index d038fbfbae8..6af612dbc48 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_4.out +++ b/test/langtools/tools/javac/T8255968/T8255968_4.out @@ -1,2 +1,2 @@ -T8255968_4.java:32:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_4_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_4_Test, T8255968_4_Test(int), (compiler.misc.report.access: T8255968_4_Test(int), private, T8255968_4_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_4_Test, T8255968_4_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))} +T8255968_4.java:9:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_4_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_4_Test, T8255968_4_Test(int), (compiler.misc.report.access: T8255968_4_Test(int), private, T8255968_4_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_4_Test, T8255968_4_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String)))} 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_5.java b/test/langtools/tools/javac/T8255968/T8255968_5.java index 1b42ac84080..1c1282a0b3e 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_5.java +++ b/test/langtools/tools/javac/T8255968/T8255968_5.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_5.out -XDrawDiagnostics T8255968_5.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_5.out b/test/langtools/tools/javac/T8255968/T8255968_5.out index a74a2d0629d..e8a7de13e21 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_5.out +++ b/test/langtools/tools/javac/T8255968/T8255968_5.out @@ -1,2 +1,2 @@ -T8255968_5.java:32:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_5_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_5_Test, T8255968_5_Test(int), (compiler.misc.report.access: T8255968_5_Test(int), private, T8255968_5_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_5_Test, T8255968_5_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_5_Test, T8255968_5_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))} +T8255968_5.java:9:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_5_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_5_Test, T8255968_5_Test(int), (compiler.misc.report.access: T8255968_5_Test(int), private, T8255968_5_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_5_Test, T8255968_5_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_5_Test, T8255968_5_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))} 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_6.java b/test/langtools/tools/javac/T8255968/T8255968_6.java index fda79dc9693..f17748df5c1 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_6.java +++ b/test/langtools/tools/javac/T8255968/T8255968_6.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_6.out -XDrawDiagnostics T8255968_6.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_6.out b/test/langtools/tools/javac/T8255968/T8255968_6.out index c10d2807aa2..eef16c42b27 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_6.out +++ b/test/langtools/tools/javac/T8255968/T8255968_6.out @@ -1,2 +1,2 @@ -T8255968_6.java:32:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_6_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_6_Test, T8255968_6_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_6_Test, T8255968_6_Test(int), (compiler.misc.report.access: T8255968_6_Test(int), private, T8255968_6_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_6_Test, T8255968_6_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))} +T8255968_6.java:9:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_6_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_6_Test, T8255968_6_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_6_Test, T8255968_6_Test(int), (compiler.misc.report.access: T8255968_6_Test(int), private, T8255968_6_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_6_Test, T8255968_6_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))} 1 error diff --git a/test/langtools/tools/javac/T8255968/T8255968_7.java b/test/langtools/tools/javac/T8255968/T8255968_7.java index be8802fb749..5529c5c29c4 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_7.java +++ b/test/langtools/tools/javac/T8255968/T8255968_7.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @bug 8255968 * @summary Confusing error message for inaccessible constructor * @run compile/fail/ref=T8255968_7.out -XDrawDiagnostics T8255968_7.java diff --git a/test/langtools/tools/javac/T8255968/T8255968_7.out b/test/langtools/tools/javac/T8255968/T8255968_7.out index 41c9873c592..762000a630c 100644 --- a/test/langtools/tools/javac/T8255968/T8255968_7.out +++ b/test/langtools/tools/javac/T8255968/T8255968_7.out @@ -1,2 +1,2 @@ -T8255968_7.java:32:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_7_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_7_Test, T8255968_7_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_7_Test, T8255968_7_Test(int), (compiler.misc.report.access: T8255968_7_Test(int), private, T8255968_7_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_7_Test, T8255968_7_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))} +T8255968_7.java:9:25: compiler.err.cant.apply.symbols: kindname.constructor, T8255968_7_Test, int,{(compiler.misc.inapplicable.method: kindname.constructor, T8255968_7_Test, T8255968_7_Test(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_7_Test, T8255968_7_Test(int), (compiler.misc.report.access: T8255968_7_Test(int), private, T8255968_7_Test)),(compiler.misc.inapplicable.method: kindname.constructor, T8255968_7_Test, T8255968_7_Test(int[]), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, int[])))} 1 error diff --git a/test/langtools/tools/javac/TryWithResources/ResourceInterface.java b/test/langtools/tools/javac/TryWithResources/ResourceInterface.java index 2cf42605502..a9b15645c4d 100644 --- a/test/langtools/tools/javac/TryWithResources/ResourceInterface.java +++ b/test/langtools/tools/javac/TryWithResources/ResourceInterface.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6970833 * @author Maurizio Cimadamore * @summary Try-with-resource implementation throws an NPE during Flow analysis diff --git a/test/langtools/tools/javac/TryWithResources/ResourceInterface.out b/test/langtools/tools/javac/TryWithResources/ResourceInterface.out index 6a968f0d73c..500624fa8a1 100644 --- a/test/langtools/tools/javac/TryWithResources/ResourceInterface.out +++ b/test/langtools/tools/javac/TryWithResources/ResourceInterface.out @@ -1,2 +1,2 @@ -ResourceInterface.java:38:23: compiler.err.unreported.exception.implicit.close: ResourceInterface.E1, r2 +ResourceInterface.java:15:23: compiler.err.unreported.exception.implicit.close: ResourceInterface.E1, r2 1 error diff --git a/test/langtools/tools/javac/analyzer/AnalyzerMandatoryWarnings.java b/test/langtools/tools/javac/analyzer/AnalyzerMandatoryWarnings.java index 4a4b53ac419..223ab7cc750 100644 --- a/test/langtools/tools/javac/analyzer/AnalyzerMandatoryWarnings.java +++ b/test/langtools/tools/javac/analyzer/AnalyzerMandatoryWarnings.java @@ -1,5 +1,5 @@ /** - * @test + * @test /nodynamiccopyright/ * @bug 8230105 * @summary Verify analyzers work reasonably in combination with mandatory warnings * @compile/ref=AnalyzerMandatoryWarnings.out -Xlint:deprecation -XDrawDiagnostics -Xmaxwarns 1 -XDfind=lambda AnalyzerMandatoryWarnings.java diff --git a/test/langtools/tools/javac/analyzer/StuckLambdas.java b/test/langtools/tools/javac/analyzer/StuckLambdas.java index 9591c914551..4b380223307 100644 --- a/test/langtools/tools/javac/analyzer/StuckLambdas.java +++ b/test/langtools/tools/javac/analyzer/StuckLambdas.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2017, 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 + * @test /nodynamiccopyright/ * @bug 8230105 * @summary Verify the analyzers work reasonably for stuck lambdas * @compile/ref=StuckLambdas.out -XDfind=local -XDrawDiagnostics StuckLambdas.java diff --git a/test/langtools/tools/javac/analyzer/StuckLambdas.out b/test/langtools/tools/javac/analyzer/StuckLambdas.out index 2315493102e..93b2dfafabd 100644 --- a/test/langtools/tools/javac/analyzer/StuckLambdas.out +++ b/test/langtools/tools/javac/analyzer/StuckLambdas.out @@ -1,3 +1,3 @@ -StuckLambdas.java:50:20: compiler.warn.local.redundant.type -StuckLambdas.java:53:64: compiler.warn.local.redundant.type +StuckLambdas.java:27:20: compiler.warn.local.redundant.type +StuckLambdas.java:30:64: compiler.warn.local.redundant.type 2 warnings diff --git a/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.java b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.java index 52d0e8a5e96..341d7f6cdc9 100644 --- a/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.java +++ b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8013485 * @summary Annotations that gets a clinit can't be verified for correct elements in a second compilation unit * @compile/fail/ref=AnnoWithClinitFail.out -XDrawDiagnostics AnnoWithClinitFail.java diff --git a/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.out b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.out index c9526b43daf..18986926723 100644 --- a/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.out +++ b/test/langtools/tools/javac/annotations/clinit/AnnoWithClinitFail.out @@ -1,3 +1,3 @@ -AnnoWithClinitFail.java:37:5: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo -AnnoWithClinitFail.java:44:1: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo +AnnoWithClinitFail.java:14:5: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo +AnnoWithClinitFail.java:21:1: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo 2 errors diff --git a/test/langtools/tools/javac/annotations/default/Derr.java b/test/langtools/tools/javac/annotations/default/Derr.java index a5896d03546..e006605c2df 100644 --- a/test/langtools/tools/javac/annotations/default/Derr.java +++ b/test/langtools/tools/javac/annotations/default/Derr.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2003, 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. - */ +/* /nodynamiccopyright/ */ @A(y=1) // error: x missing class D { diff --git a/test/langtools/tools/javac/annotations/default/Derr.out b/test/langtools/tools/javac/annotations/default/Derr.out index ed61b90e577..cb0539363cf 100644 --- a/test/langtools/tools/javac/annotations/default/Derr.out +++ b/test/langtools/tools/javac/annotations/default/Derr.out @@ -1,2 +1,2 @@ -Derr.java:24:1: compiler.err.annotation.missing.default.value: A, x +Derr.java:3:1: compiler.err.annotation.missing.default.value: A, x 1 error diff --git a/test/langtools/tools/javac/annotations/default/Eerr.java b/test/langtools/tools/javac/annotations/default/Eerr.java index 15f6259b9d1..396025894e6 100644 --- a/test/langtools/tools/javac/annotations/default/Eerr.java +++ b/test/langtools/tools/javac/annotations/default/Eerr.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2003, 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. - */ +/* /nodynamiccopyright/ */ @A(x=1, x=2) // error: duplicate x class E { diff --git a/test/langtools/tools/javac/annotations/default/Eerr.out b/test/langtools/tools/javac/annotations/default/Eerr.out index b443906fe10..de2a93fed5e 100644 --- a/test/langtools/tools/javac/annotations/default/Eerr.out +++ b/test/langtools/tools/javac/annotations/default/Eerr.out @@ -1,2 +1,2 @@ -Eerr.java:24:9: compiler.err.duplicate.annotation.member.value: x, A +Eerr.java:3:9: compiler.err.duplicate.annotation.member.value: x, A 1 error diff --git a/test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.out b/test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.out index 0b1fe35725e..c7a0518995b 100644 --- a/test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.out +++ b/test/langtools/tools/javac/annotations/neg/InvalidPackageAnno.out @@ -1,2 +1,2 @@ -package-info.java:24:1: compiler.err.annotation.type.not.applicable +package-info.java:3:1: compiler.err.annotation.type.not.applicable 1 error diff --git a/test/langtools/tools/javac/annotations/neg/bar/package-info.java b/test/langtools/tools/javac/annotations/neg/bar/package-info.java index 12dbf2322b8..ecab8d1398c 100644 --- a/test/langtools/tools/javac/annotations/neg/bar/package-info.java +++ b/test/langtools/tools/javac/annotations/neg/bar/package-info.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2014, 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. - */ +/* /nodynamiccopyright/ */ @java.lang.annotation.Documented package bar; diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java index 2338329b321..ad62073588e 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.java @@ -1,30 +1,7 @@ -/* - * 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. - */ - import java.lang.annotation.*; /** - * @test + * @test /nodynamiccopyright/ * @bug 8006547 * @compile/fail/ref=DefaultTargetTypeParameter.out -XDrawDiagnostics DefaultTargetTypeParameter.java */ diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out index fc1f934ea34..e8623b75e84 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeParameter.out @@ -1,2 +1,2 @@ -DefaultTargetTypeParameter.java:39:1: compiler.err.invalid.repeatable.annotation.incompatible.target: Container, DefaultTargetTypeParameter +DefaultTargetTypeParameter.java:16:1: compiler.err.invalid.repeatable.annotation.incompatible.target: Container, DefaultTargetTypeParameter 1 error diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java index 4c158434309..f42db4fe818 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.java @@ -1,30 +1,7 @@ -/* - * 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. - */ - import java.lang.annotation.*; /** - * @test + * @test /nodynamiccopyright/ * @bug 8006547 * @compile/fail/ref=DefaultTargetTypeUse.out -XDrawDiagnostics DefaultTargetTypeUse.java */ diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out index 1aba28b9e42..50b625e65bb 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/DefaultTargetTypeUse.out @@ -1,2 +1,2 @@ -DefaultTargetTypeUse.java:39:1: compiler.err.invalid.repeatable.annotation.incompatible.target: Container, DefaultTargetTypeUse +DefaultTargetTypeUse.java:16:1: compiler.err.invalid.repeatable.annotation.incompatible.target: Container, DefaultTargetTypeUse 1 error diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java index a7a08eff8b2..3c899d816be 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.java @@ -1,28 +1,5 @@ -/* - * 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 + * @test /nodynamiccopyright/ * @bug 7196531 * @compile/fail/ref=DuplicateErrors.out -XDrawDiagnostics DuplicateErrors.java */ diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out index d0fd2d40195..21dce5e05df 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out @@ -1,3 +1,3 @@ -DuplicateErrors.java:34:1: compiler.err.duplicate.annotation.missing.container: Foo -DuplicateErrors.java:35:1: compiler.err.duplicate.annotation.missing.container: Foo +DuplicateErrors.java:11:1: compiler.err.duplicate.annotation.missing.container: Foo +DuplicateErrors.java:12:1: compiler.err.duplicate.annotation.missing.container: Foo 2 errors diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java index 7d2ba5e7673..a5d3b058f70 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @summary Container annotation is not checked for semantic correctness * @bug 8001114 * diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out index f73112f2415..12a85189982 100644 --- a/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out +++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out @@ -1,2 +1,2 @@ -RepeatingTargetNotAllowed.java:43:5: compiler.err.invalid.repeatable.annotation.not.applicable: Foos, f +RepeatingTargetNotAllowed.java:20:5: compiler.err.invalid.repeatable.annotation.not.applicable: Foos, f 1 error diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.java b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.java index a0cbc78c690..f05d0884b54 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6967002 8006775 * @summary JDK7 b99 javac compilation error (java.lang.AssertionError) * @author Maurizio Cimadamore diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out index f7e2685ff0a..86480c2bfa8 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out @@ -1,2 +1,2 @@ -T6967002.java:33:22: compiler.err.expected: ')' +T6967002.java:10:22: compiler.err.expected: ')' 1 error diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java b/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java index 1c3f5617d10..9861956f0f1 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2008, 2015, 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 + * @test /nodynamiccopyright/ * @bug 8073534 * @summary Check for correct type annotation error messages. * @compile/fail/ref=DeclVsUseErrorMessage.out -XDrawDiagnostics DeclVsUseErrorMessage.java diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out b/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out index c455f2c8964..a84d96312fc 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/DeclVsUseErrorMessage.out @@ -1,3 +1,3 @@ -DeclVsUseErrorMessage.java:40:5: compiler.err.annotation.type.not.applicable -DeclVsUseErrorMessage.java:44:23: compiler.err.annotation.type.not.applicable.to.type: DeclVsUseErrorMessage.A +DeclVsUseErrorMessage.java:17:5: compiler.err.annotation.type.not.applicable +DeclVsUseErrorMessage.java:21:23: compiler.err.annotation.type.not.applicable.to.type: DeclVsUseErrorMessage.A 2 errors diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java index fee881498c4..aa1776b2ade 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2013, 2015, 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 + * @test /nodynamiccopyright/ * @bug 8026564 * @summary A missing annotation type in a type variable bound * should result in the same errors with and without an diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out index 4308d85cd5a..b1a3fb3a616 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out @@ -1,2 +1,2 @@ -TypeVariableMissingTA.java:41:40: compiler.err.cant.resolve: kindname.class, MISSING, , +TypeVariableMissingTA.java:18:40: compiler.err.cant.resolve: kindname.class, MISSING, , 1 error diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java index 35ee8432812..4f50bdcf13f 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2008, 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 + * @test /nodynamiccopyright/ * @bug 8006775 * @summary the receiver parameter and static methods/classes * @author Werner Dietl diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out index e64bdba48d4..ef6a3128c06 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out @@ -1,5 +1,5 @@ -StaticThings.java:33:26: compiler.err.non-static.cant.be.ref: kindname.variable, this -StaticThings.java:36:28: compiler.err.non-static.cant.be.ref: kindname.variable, this -StaticThings.java:52:32: compiler.err.non-static.cant.be.ref: kindname.variable, this -StaticThings.java:54:37: compiler.err.non-static.cant.be.ref: kindname.variable, this +StaticThings.java:10:26: compiler.err.non-static.cant.be.ref: kindname.variable, this +StaticThings.java:13:28: compiler.err.non-static.cant.be.ref: kindname.variable, this +StaticThings.java:29:32: compiler.err.non-static.cant.be.ref: kindname.variable, this +StaticThings.java:31:37: compiler.err.non-static.cant.be.ref: kindname.variable, this 4 errors diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java index 14911c3fd80..ad9e2013123 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2008, 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 + * @test /nodynamiccopyright/ * @bug 8006775 * @summary the receiver parameter has the type of the surrounding class * @author Werner Dietl diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out index b5442674a08..b30098e1c27 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out @@ -1,9 +1,9 @@ -WrongType.java:48:16: compiler.err.incorrect.receiver.type: WrongType, java.lang.Object -WrongType.java:50:16: compiler.err.incorrect.receiver.type: WrongType, java.lang.Object -WrongType.java:55:15: compiler.err.cant.resolve.location: kindname.class, XYZ, , , (compiler.misc.location: kindname.class, WrongType, null) -WrongType.java:63:23: compiler.err.incorrect.receiver.type: WrongType.Inner, WrongType -WrongType.java:64:24: compiler.err.incorrect.receiver.type: WrongType.Inner, java.lang.Object -WrongType.java:65:27: compiler.err.doesnt.exist: Outer -WrongType.java:66:31: compiler.err.cant.resolve.location: kindname.class, XY, , , (compiler.misc.location: kindname.class, WrongType, null) -WrongType.java:70:24: compiler.err.incorrect.receiver.type: WrongType.Generics, WrongType.Generics +WrongType.java:25:16: compiler.err.incorrect.receiver.type: WrongType, java.lang.Object +WrongType.java:27:16: compiler.err.incorrect.receiver.type: WrongType, java.lang.Object +WrongType.java:32:15: compiler.err.cant.resolve.location: kindname.class, XYZ, , , (compiler.misc.location: kindname.class, WrongType, null) +WrongType.java:40:23: compiler.err.incorrect.receiver.type: WrongType.Inner, WrongType +WrongType.java:41:24: compiler.err.incorrect.receiver.type: WrongType.Inner, java.lang.Object +WrongType.java:42:27: compiler.err.doesnt.exist: Outer +WrongType.java:43:31: compiler.err.cant.resolve.location: kindname.class, XY, , , (compiler.misc.location: kindname.class, WrongType, null) +WrongType.java:47:24: compiler.err.incorrect.receiver.type: WrongType.Generics, WrongType.Generics 8 errors diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java index 68d728ed10a..b2ac84e213b 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2009, 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 + * @test /nodynamiccopyright/ * @summary Class literals are not type uses and cannot be annotated * @author Werner Dietl * @compile/fail/ref=DotClass.out -XDrawDiagnostics DotClass.java diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out index c40f3d7cd74..f1d8c2d9900 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out @@ -1,17 +1,17 @@ -DotClass.java:47:42: compiler.err.no.annotations.on.dot.class -DotClass.java:50:33: compiler.err.no.annotations.on.dot.class -DotClass.java:52:52: compiler.err.no.annotations.on.dot.class -DotClass.java:57:44: compiler.err.no.annotations.on.dot.class -DotClass.java:58:26: compiler.err.no.annotations.on.dot.class -DotClass.java:59:26: compiler.err.no.annotations.on.dot.class -DotClass.java:60:35: compiler.err.no.annotations.on.dot.class -DotClass.java:62:48: compiler.err.no.annotations.on.dot.class -DotClass.java:63:49: compiler.err.no.annotations.on.dot.class -DotClass.java:64:28: compiler.err.no.annotations.on.dot.class -DotClass.java:65:35: compiler.err.no.annotations.on.dot.class -DotClass.java:68:54: compiler.err.no.annotations.on.dot.class -DotClass.java:69:54: compiler.err.no.annotations.on.dot.class -DotClass.java:70:54: compiler.err.no.annotations.on.dot.class -DotClass.java:71:54: compiler.err.no.annotations.on.dot.class -DotClass.java:72:54: compiler.err.no.annotations.on.dot.class +DotClass.java:24:42: compiler.err.no.annotations.on.dot.class +DotClass.java:27:33: compiler.err.no.annotations.on.dot.class +DotClass.java:29:52: compiler.err.no.annotations.on.dot.class +DotClass.java:34:44: compiler.err.no.annotations.on.dot.class +DotClass.java:35:26: compiler.err.no.annotations.on.dot.class +DotClass.java:36:26: compiler.err.no.annotations.on.dot.class +DotClass.java:37:35: compiler.err.no.annotations.on.dot.class +DotClass.java:39:48: compiler.err.no.annotations.on.dot.class +DotClass.java:40:49: compiler.err.no.annotations.on.dot.class +DotClass.java:41:28: compiler.err.no.annotations.on.dot.class +DotClass.java:42:35: compiler.err.no.annotations.on.dot.class +DotClass.java:45:54: compiler.err.no.annotations.on.dot.class +DotClass.java:46:54: compiler.err.no.annotations.on.dot.class +DotClass.java:47:54: compiler.err.no.annotations.on.dot.class +DotClass.java:48:54: compiler.err.no.annotations.on.dot.class +DotClass.java:49:54: compiler.err.no.annotations.on.dot.class 16 errors \ No newline at end of file diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java index 63b940a63e0..b4a0edc0db6 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java @@ -1,30 +1,7 @@ -/* - * Copyright (c) 2012, 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. - */ - import java.lang.annotation.*; /* - * @test + * @test /nodynamiccopyright/ * @bug 8006775 * @summary repeating type annotations are possible * @author Werner Dietl diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out index 20a73852f44..43c6b34ce47 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out +++ b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out @@ -1,28 +1,28 @@ -RepeatingTypeAnnotations.java:39:25: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:41:25: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:42:25: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:50:31: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:52:24: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:61:21: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:63:38: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:65:24: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:72:21: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:77:28: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:79:21: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:79:36: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:81:19: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:85:19: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:85:34: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:89:18: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:89:33: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:93:19: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:93:35: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:97:19: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:97:34: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:101:37: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:101:26: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:101:56: compiler.err.duplicate.annotation.missing.container: TA -RepeatingTypeAnnotations.java:101:72: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:16:25: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:18:25: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:19:25: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:27:31: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:29:24: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:38:21: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:40:38: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:42:24: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:49:21: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:54:28: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:56:21: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:56:36: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:58:19: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:63:19: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:63:34: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:66:18: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:66:33: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:70:19: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:70:35: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:74:19: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:74:34: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:88:37: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:88:26: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:88:56: compiler.err.duplicate.annotation.missing.container: TA +RepeatingTypeAnnotations.java:88:72: compiler.err.duplicate.annotation.missing.container: TA - compiler.note.unchecked.filename: RepeatingTypeAnnotations.java - compiler.note.unchecked.recompile 25 errors diff --git a/test/langtools/tools/javac/cast/6270087/T6270087neg.java b/test/langtools/tools/javac/cast/6270087/T6270087neg.java index e0525c9aea8..5f1ff62c904 100644 --- a/test/langtools/tools/javac/cast/6270087/T6270087neg.java +++ b/test/langtools/tools/javac/cast/6270087/T6270087neg.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6270087 6932571 * @summary Javac rejects legal cast * @compile/fail/ref=T6270087neg.out -XDrawDiagnostics T6270087neg.java diff --git a/test/langtools/tools/javac/cast/6270087/T6270087neg.out b/test/langtools/tools/javac/cast/6270087/T6270087neg.out index 91bb8411ca3..65ade449d74 100644 --- a/test/langtools/tools/javac/cast/6270087/T6270087neg.out +++ b/test/langtools/tools/javac/cast/6270087/T6270087neg.out @@ -1,2 +1,2 @@ -T6270087neg.java:36:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6270087neg.Foo, T6270087neg.Foo) +T6270087neg.java:13:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6270087neg.Foo, T6270087neg.Foo) 1 error diff --git a/test/langtools/tools/javac/cast/6932571/T6932571neg.java b/test/langtools/tools/javac/cast/6932571/T6932571neg.java index f4e1c511e3a..90d9e3b858e 100644 --- a/test/langtools/tools/javac/cast/6932571/T6932571neg.java +++ b/test/langtools/tools/javac/cast/6932571/T6932571neg.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6932571 * @summary Compiling Generics causing Inconvertible types * @compile/fail/ref=T6932571neg.out -XDrawDiagnostics T6932571neg.java diff --git a/test/langtools/tools/javac/cast/6932571/T6932571neg.out b/test/langtools/tools/javac/cast/6932571/T6932571neg.out index 9a9422a1221..a58b7c7d3bf 100644 --- a/test/langtools/tools/javac/cast/6932571/T6932571neg.out +++ b/test/langtools/tools/javac/cast/6932571/T6932571neg.out @@ -1,2 +1,2 @@ -T6932571neg.java:39:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6932571neg.S, G) +T6932571neg.java:16:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6932571neg.S, G) 1 error diff --git a/test/langtools/tools/javac/danglingDep/DepX.java b/test/langtools/tools/javac/danglingDep/DepX.java index c2228ba8e0e..896ddd3733f 100644 --- a/test/langtools/tools/javac/danglingDep/DepX.java +++ b/test/langtools/tools/javac/danglingDep/DepX.java @@ -1,29 +1,6 @@ -/* - * Copyright (c) 2005, 2010, 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. - */ - /* * control test (2): verify that compiler handles at-deprecated correctly - * @test + * @test /nodynamiccopyright/ * @clean X DepX refX * @compile/ref=DepX.out -XDrawDiagnostics DepX.java RefX.java */ diff --git a/test/langtools/tools/javac/danglingDep/DepX.out b/test/langtools/tools/javac/danglingDep/DepX.out index 433e1871b92..8e069810a6c 100644 --- a/test/langtools/tools/javac/danglingDep/DepX.out +++ b/test/langtools/tools/javac/danglingDep/DepX.out @@ -1,4 +1,4 @@ -DepX.java:38:1: compiler.warn.missing.deprecated.annotation +DepX.java:15:1: compiler.warn.missing.deprecated.annotation - compiler.note.deprecated.filename: RefX.java - compiler.note.deprecated.recompile 1 warning diff --git a/test/langtools/tools/javac/defaultMethods/static/Static02.java b/test/langtools/tools/javac/defaultMethods/static/Static02.java index 240c16edaf2..da01aa7ee6e 100644 --- a/test/langtools/tools/javac/defaultMethods/static/Static02.java +++ b/test/langtools/tools/javac/defaultMethods/static/Static02.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8005166 * @summary Add support for static interface methods * smoke test for static interface methods diff --git a/test/langtools/tools/javac/defaultMethods/static/Static02.out b/test/langtools/tools/javac/defaultMethods/static/Static02.out index 10a5722a856..36645d2ec11 100644 --- a/test/langtools/tools/javac/defaultMethods/static/Static02.out +++ b/test/langtools/tools/javac/defaultMethods/static/Static02.out @@ -1,2 +1,2 @@ -Static02.java:40:15: compiler.err.illegal.static.intf.meth.call: Static02.I +Static02.java:17:15: compiler.err.illegal.static.intf.meth.call: Static02.I 1 error diff --git a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.java b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.java index 865f03a33d0..2378af2c97e 100644 --- a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.java +++ b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8005166 * @summary Add support for static interface methods * Smoke test for static imports of static interface methods diff --git a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.out b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.out index d21b3a9963e..48cc8eca1ab 100644 --- a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.out +++ b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport2.out @@ -1,2 +1,2 @@ -StaticImport2.java:36:9: compiler.err.cant.resolve.location.args: kindname.method, m, , , (compiler.misc.location: kindname.class, StaticImport2, null) +StaticImport2.java:13:9: compiler.err.cant.resolve.location.args: kindname.method, m, , , (compiler.misc.location: kindname.class, StaticImport2, null) 1 error diff --git a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.java b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.java index 67df0028316..3f72ea0f7bd 100644 --- a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.java +++ b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8005166 * @summary Add support for static interface methods * Smoke test for static imports of static interface methods diff --git a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.out b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.out index 51bfb5d3971..0f44b4b60b7 100644 --- a/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.out +++ b/test/langtools/tools/javac/defaultMethods/static/import/StaticImport3.out @@ -1,2 +1,2 @@ -StaticImport3.java:36:9: compiler.err.cant.resolve.location.args: kindname.method, m, , , (compiler.misc.location: kindname.class, StaticImport3, null) +StaticImport3.java:13:9: compiler.err.cant.resolve.location.args: kindname.method, m, , , (compiler.misc.location: kindname.class, StaticImport3, null) 1 error diff --git a/test/langtools/tools/javac/depOverrides/doccomment/B3.java b/test/langtools/tools/javac/depOverrides/doccomment/B3.java index 0c8607d3710..b090105be97 100644 --- a/test/langtools/tools/javac/depOverrides/doccomment/B3.java +++ b/test/langtools/tools/javac/depOverrides/doccomment/B3.java @@ -1,26 +1,4 @@ -/* - * Copyright (c) 2005, 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. - */ - +/* /nodynamiccopyright/ */ // combinations of methods defined in an interface // and overridden in subtypes diff --git a/test/langtools/tools/javac/depOverrides/doccomment/I.java b/test/langtools/tools/javac/depOverrides/doccomment/I.java index ab99e95c30a..ccd3db59a5a 100644 --- a/test/langtools/tools/javac/depOverrides/doccomment/I.java +++ b/test/langtools/tools/javac/depOverrides/doccomment/I.java @@ -1,26 +1,4 @@ -/* - * Copyright (c) 2005, 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. - */ - +/* /nodynamiccopyright/ */ // combinations of methods defined in an interface // and overridden in subtypes diff --git a/test/langtools/tools/javac/depOverrides/doccomment/P.java b/test/langtools/tools/javac/depOverrides/doccomment/P.java index df548050e14..b2b3165171f 100644 --- a/test/langtools/tools/javac/depOverrides/doccomment/P.java +++ b/test/langtools/tools/javac/depOverrides/doccomment/P.java @@ -1,26 +1,4 @@ -/* - * Copyright (c) 2005, 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. - */ - +/* /nodynamiccopyright/ */ // combinations of methods defined in a base class // and overridden in subtypes diff --git a/test/langtools/tools/javac/depOverrides/doccomment/Test1B3.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1B3.out index c1bb87237da..ed9e8b55bbd 100644 --- a/test/langtools/tools/javac/depOverrides/doccomment/Test1B3.out +++ b/test/langtools/tools/javac/depOverrides/doccomment/Test1B3.out @@ -1,8 +1,8 @@ -B3.java:32:36: compiler.warn.missing.deprecated.annotation -B3.java:35:36: compiler.warn.missing.deprecated.annotation -B3.java:38:36: compiler.warn.missing.deprecated.annotation -B3.java:41:36: compiler.warn.missing.deprecated.annotation -B3.java:44:36: compiler.warn.missing.deprecated.annotation -B3.java:47:36: compiler.warn.missing.deprecated.annotation -B3.java:31:10: compiler.warn.missing.deprecated.annotation +B3.java:10:36: compiler.warn.missing.deprecated.annotation +B3.java:13:36: compiler.warn.missing.deprecated.annotation +B3.java:16:36: compiler.warn.missing.deprecated.annotation +B3.java:19:36: compiler.warn.missing.deprecated.annotation +B3.java:22:36: compiler.warn.missing.deprecated.annotation +B3.java:25:36: compiler.warn.missing.deprecated.annotation +B3.java:9:10: compiler.warn.missing.deprecated.annotation 7 warnings diff --git a/test/langtools/tools/javac/depOverrides/doccomment/Test1I.out b/test/langtools/tools/javac/depOverrides/doccomment/Test1I.out index 67e135cdd7f..4c6f1b2838c 100644 --- a/test/langtools/tools/javac/depOverrides/doccomment/Test1I.out +++ b/test/langtools/tools/javac/depOverrides/doccomment/Test1I.out @@ -1,9 +1,9 @@ -I.java:30:36: compiler.warn.missing.deprecated.annotation -I.java:31:36: compiler.warn.missing.deprecated.annotation -I.java:32:36: compiler.warn.missing.deprecated.annotation -I.java:33:36: compiler.warn.missing.deprecated.annotation -I.java:34:36: compiler.warn.missing.deprecated.annotation -I.java:35:36: compiler.warn.missing.deprecated.annotation -I.java:36:36: compiler.warn.missing.deprecated.annotation -I.java:37:36: compiler.warn.missing.deprecated.annotation +I.java:8:36: compiler.warn.missing.deprecated.annotation +I.java:9:36: compiler.warn.missing.deprecated.annotation +I.java:10:36: compiler.warn.missing.deprecated.annotation +I.java:11:36: compiler.warn.missing.deprecated.annotation +I.java:12:36: compiler.warn.missing.deprecated.annotation +I.java:13:36: compiler.warn.missing.deprecated.annotation +I.java:14:36: compiler.warn.missing.deprecated.annotation +I.java:15:36: compiler.warn.missing.deprecated.annotation 8 warnings diff --git a/test/langtools/tools/javac/depOverrides/doccomment/Test2P.out b/test/langtools/tools/javac/depOverrides/doccomment/Test2P.out index 89147214dce..97fa8ae0f46 100644 --- a/test/langtools/tools/javac/depOverrides/doccomment/Test2P.out +++ b/test/langtools/tools/javac/depOverrides/doccomment/Test2P.out @@ -1,10 +1,10 @@ -P.java:30:36: compiler.warn.missing.deprecated.annotation -P.java:31:36: compiler.warn.missing.deprecated.annotation -P.java:32:36: compiler.warn.missing.deprecated.annotation -P.java:33:36: compiler.warn.missing.deprecated.annotation -P.java:34:36: compiler.warn.missing.deprecated.annotation -P.java:35:36: compiler.warn.missing.deprecated.annotation -P.java:36:36: compiler.warn.missing.deprecated.annotation -P.java:37:36: compiler.warn.missing.deprecated.annotation -P.java:38:36: compiler.warn.missing.deprecated.annotation +P.java:8:36: compiler.warn.missing.deprecated.annotation +P.java:9:36: compiler.warn.missing.deprecated.annotation +P.java:10:36: compiler.warn.missing.deprecated.annotation +P.java:11:36: compiler.warn.missing.deprecated.annotation +P.java:12:36: compiler.warn.missing.deprecated.annotation +P.java:13:36: compiler.warn.missing.deprecated.annotation +P.java:14:36: compiler.warn.missing.deprecated.annotation +P.java:15:36: compiler.warn.missing.deprecated.annotation +P.java:16:36: compiler.warn.missing.deprecated.annotation 9 warnings diff --git a/test/langtools/tools/javac/diags/EagerInitCheck.out b/test/langtools/tools/javac/diags/EagerInitCheck.out index 6c2c03563eb..2e6dd001a14 100644 --- a/test/langtools/tools/javac/diags/EagerInitCheck.out +++ b/test/langtools/tools/javac/diags/EagerInitCheck.out @@ -1,2 +1,2 @@ -IEagerInitCheck.java:25:17: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: double, float) +IEagerInitCheck.java:4:17: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: double, float) 1 error \ No newline at end of file diff --git a/test/langtools/tools/javac/diags/IEagerInitCheck.java b/test/langtools/tools/javac/diags/IEagerInitCheck.java index 24ae4074505..f8648507a13 100644 --- a/test/langtools/tools/javac/diags/IEagerInitCheck.java +++ b/test/langtools/tools/javac/diags/IEagerInitCheck.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2016, 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. - */ +/* /nodynamiccopyright/ */ public interface IEagerInitCheck { float VAL = 1.0; diff --git a/test/langtools/tools/javac/generics/7022054/T7022054pos1.java b/test/langtools/tools/javac/generics/7022054/T7022054pos1.java index 25003a8a8be..8c2a7393d19 100644 --- a/test/langtools/tools/javac/generics/7022054/T7022054pos1.java +++ b/test/langtools/tools/javac/generics/7022054/T7022054pos1.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2011, 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 + * @test /nodynamiccopyright/ * @bug 7022054 * * @summary Invalid compiler error on covariant overriding methods with the same erasure diff --git a/test/langtools/tools/javac/generics/7022054/T7022054pos1.out b/test/langtools/tools/javac/generics/7022054/T7022054pos1.out index 5901cb41ace..acb4c221447 100644 --- a/test/langtools/tools/javac/generics/7022054/T7022054pos1.out +++ b/test/langtools/tools/javac/generics/7022054/T7022054pos1.out @@ -1,2 +1,2 @@ -T7022054pos1.java:39:25: compiler.err.name.clash.same.erasure.no.override: m, java.lang.String, T7022054pos1.B, m, java.lang.String, T7022054pos1.A +T7022054pos1.java:16:25: compiler.err.name.clash.same.erasure.no.override: m, java.lang.String, T7022054pos1.B, m, java.lang.String, T7022054pos1.A 1 error diff --git a/test/langtools/tools/javac/generics/7022054/T7022054pos2.java b/test/langtools/tools/javac/generics/7022054/T7022054pos2.java index 613b4542f90..9685cfadccd 100644 --- a/test/langtools/tools/javac/generics/7022054/T7022054pos2.java +++ b/test/langtools/tools/javac/generics/7022054/T7022054pos2.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2011, 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 + * @test /nodynamiccopyright/ * @bug 7022054 * * @summary Invalid compiler error on covariant overriding methods with the same erasure diff --git a/test/langtools/tools/javac/generics/7022054/T7022054pos2.out b/test/langtools/tools/javac/generics/7022054/T7022054pos2.out index 406bef8f32d..98de493ab8f 100644 --- a/test/langtools/tools/javac/generics/7022054/T7022054pos2.out +++ b/test/langtools/tools/javac/generics/7022054/T7022054pos2.out @@ -1,2 +1,2 @@ -T7022054pos2.java:38:32: compiler.err.name.clash.same.erasure.no.hide: m(java.lang.String), T7022054pos2.B, m(java.lang.String), T7022054pos2.A +T7022054pos2.java:15:32: compiler.err.name.clash.same.erasure.no.hide: m(java.lang.String), T7022054pos2.B, m(java.lang.String), T7022054pos2.A 1 error diff --git a/test/langtools/tools/javac/generics/inference/6650759/T6650759m.java b/test/langtools/tools/javac/generics/inference/6650759/T6650759m.java index 0a4dc01eea2..eba1526efda 100644 --- a/test/langtools/tools/javac/generics/inference/6650759/T6650759m.java +++ b/test/langtools/tools/javac/generics/inference/6650759/T6650759m.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2009, 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 + * @test /nodynamiccopyright/ * @bug 6650759 8078024 * @summary Inference of formal type parameter (unused in formal parameters) is not performed * @compile/fail/ref=T6650759m.out T6650759m.java -XDrawDiagnostics diff --git a/test/langtools/tools/javac/generics/inference/6650759/T6650759m.out b/test/langtools/tools/javac/generics/inference/6650759/T6650759m.out index 3819a4cfe9b..bcb8610e2fb 100644 --- a/test/langtools/tools/javac/generics/inference/6650759/T6650759m.out +++ b/test/langtools/tools/javac/generics/inference/6650759/T6650759m.out @@ -1,2 +1,2 @@ -T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.incompatible.bounds: Z, (compiler.misc.upper.bounds: java.lang.Integer,java.lang.Object), (compiler.misc.lower.bounds: java.lang.String)) +T6650759m.java:20:36: compiler.err.prob.found.req: (compiler.misc.incompatible.bounds: Z, (compiler.misc.upper.bounds: java.lang.Integer,java.lang.Object), (compiler.misc.lower.bounds: java.lang.String)) 1 error diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java index ba332f52764..6564a37b367 100644 --- a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java +++ b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2006, 2010, 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 + * @test /nodynamiccopyright/ * @bug 5060485 * @summary The scope of a class type parameter is too wide * @author Peter von der Ah\u00e9 diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.out b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.out index bf66061f5d0..8ae2f14a66d 100644 --- a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.out +++ b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.out @@ -1,2 +1,2 @@ -Compatibility.java:36:35: compiler.err.not.within.bounds: Test.Y, T +Compatibility.java:13:35: compiler.err.not.within.bounds: Test.Y, T 1 error diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.java b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.java index 12a2ae200f6..c1c90682aac 100644 --- a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.java +++ b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2006, 2010, 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 + * @test /nodynamiccopyright/ * @bug 5060485 6977800 * @summary The scope of a class type parameter is too wide * @author Maurizio Cimadamore diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.out b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.out index bf66061f5d0..8ae2f14a66d 100644 --- a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.out +++ b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility02.out @@ -1,2 +1,2 @@ -Compatibility.java:36:35: compiler.err.not.within.bounds: Test.Y, T +Compatibility.java:13:35: compiler.err.not.within.bounds: Test.Y, T 1 error diff --git a/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.java b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.java index 395b77b56db..b2682215b79 100644 --- a/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.java +++ b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.java @@ -1,30 +1,7 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 6886247 - * @author Maurizio Cimadamore + * @author Maurizio Cimadamore * @summary regression: javac crashes with an assertion error in Attr.java * @compile/fail/ref=T6886247_2.out -XDrawDiagnostics T6886247_2.java */ diff --git a/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.out b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.out index e3534f17a40..f2901a6c26b 100644 --- a/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.out +++ b/test/langtools/tools/javac/generics/wildcards/6886247/T6886247_2.out @@ -1,2 +1,2 @@ -T6886247_2.java:35:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.type.captureof: 1, ?, E) +T6886247_2.java:12:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.type.captureof: 1, ?, E) 1 error diff --git a/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.java b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.java index eff792d5007..bf68192b643 100644 --- a/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.java +++ b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2008, 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 + * @test /nodynamiccopyright/ * @bug 7034495 * @summary Javac asserts on usage of wildcards in bounds * @compile/fail/ref=T7034495.out -XDrawDiagnostics T7034495.java diff --git a/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out index 59ac8fbfa1d..201e2b2d20c 100644 --- a/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out +++ b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out @@ -1,2 +1,2 @@ -T7034495.java:40:17: compiler.err.types.incompatible: T7034495.B, T7034495.A, (compiler.misc.incompatible.diff.ret: foo, ) +T7034495.java:17:17: compiler.err.types.incompatible: T7034495.B, T7034495.A, (compiler.misc.incompatible.diff.ret: foo, ) 1 error diff --git a/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java index b35b3ee83d5..558fe61c90e 100644 --- a/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java +++ b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2003, 2015, 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 + * @test /nodynamiccopyright/ * @summary Test subtyping for wildcards with related type bounds. * * @compile/fail/ref=AssignmentDifferentTypes.out -XDrawDiagnostics AssignmentDifferentTypes.java diff --git a/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.out b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.out index dc321f91baa..0181e93a221 100644 --- a/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.out +++ b/test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.out @@ -1,9 +1,9 @@ -AssignmentDifferentTypes.java:46:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:47:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:48:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:49:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:50:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:51:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:52:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentDifferentTypes.java:53:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:23:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:24:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:25:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:26:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:27:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:28:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:29:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentDifferentTypes.java:30:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) 8 errors diff --git a/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java index 175ee2879ac..39058ac8106 100644 --- a/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java +++ b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2003, 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 + * @test /nodynamiccopyright/ * @summary Test subtyping for wildcards with the same type bound. * * @compile/fail/ref=AssignmentSameType.out -XDrawDiagnostics AssignmentSameType.java diff --git a/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.out b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.out index b61344a4a12..3f71da9e902 100644 --- a/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.out +++ b/test/langtools/tools/javac/generics/wildcards/AssignmentSameType.out @@ -1,8 +1,8 @@ -AssignmentSameType.java:52:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentSameType.java:53:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentSameType.java:54:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentSameType.java:55:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentSameType.java:56:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentSameType.java:57:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) -AssignmentSameType.java:58:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:29:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:30:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:31:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:32:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:33:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:34:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) +AssignmentSameType.java:35:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Ref, Ref) 7 errors diff --git a/test/langtools/tools/javac/generics/wildcards/neg/CastFail.java b/test/langtools/tools/javac/generics/wildcards/neg/CastFail.java index 71245dab0f7..9c239fbf43d 100644 --- a/test/langtools/tools/javac/generics/wildcards/neg/CastFail.java +++ b/test/langtools/tools/javac/generics/wildcards/neg/CastFail.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2003, 2015, 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 + * @test /nodynamiccopyright/ * @bug 4916607 * @summary Test casts (errors) * @author gafter diff --git a/test/langtools/tools/javac/generics/wildcards/neg/CastFail.out b/test/langtools/tools/javac/generics/wildcards/neg/CastFail.out index 410b9d569d0..052ae4174a0 100644 --- a/test/langtools/tools/javac/generics/wildcards/neg/CastFail.out +++ b/test/langtools/tools/javac/generics/wildcards/neg/CastFail.out @@ -1,22 +1,22 @@ -CastFail.java:51:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA, CastFail.AB) -CastFail.java:52:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AC) -CastFail.java:53:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AC) -CastFail.java:54:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AD) -CastFail.java:55:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AE) -CastFail.java:56:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA, CastFail.AF) -CastFail.java:57:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA, CastFail.AG) -CastFail.java:71:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.BA, CastFail.BC) -CastFail.java:72:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.BB, CastFail.BD) -CastFail.java:73:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.BB, CastFail.BD) -CastFail.java:94:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.CE, CastFail.CD) -CastFail.java:95:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.CD, CastFail.CE) -CastFail.java:96:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.CD, CastFail.CE) -CastFail.java:112:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:113:37: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:114:34: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:115:38: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:116:34: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:119:36: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:120:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) -CastFail.java:123:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DC) +CastFail.java:28:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA, CastFail.AB) +CastFail.java:29:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AC) +CastFail.java:30:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AC) +CastFail.java:31:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AD) +CastFail.java:32:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA>, CastFail.AE) +CastFail.java:33:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA, CastFail.AF) +CastFail.java:34:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.AA, CastFail.AG) +CastFail.java:48:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.BA, CastFail.BC) +CastFail.java:49:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.BB, CastFail.BD) +CastFail.java:50:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.BB, CastFail.BD) +CastFail.java:71:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.CE, CastFail.CD) +CastFail.java:72:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.CD, CastFail.CE) +CastFail.java:73:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.CD, CastFail.CE) +CastFail.java:89:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:90:37: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:91:34: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:92:38: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:93:34: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:96:36: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:97:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DA) +CastFail.java:100:21: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: CastFail.DA, CastFail.DC) 21 errors diff --git a/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.java b/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.java index 5d34dd52c5a..5303933783a 100644 --- a/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.java +++ b/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2003, 2015, 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 + * @test /nodynamiccopyright/ * @bug 4916607 * @summary Test casts (warning) * @author gafter diff --git a/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.out b/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.out index b5b60868ec2..c6b6fb780ac 100644 --- a/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.out +++ b/test/langtools/tools/javac/generics/wildcards/neg/CastWarn.out @@ -1,14 +1,14 @@ -CastWarn.java:47:38: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:48:35: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:49:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:52:37: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:53:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:54:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:55:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:57:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:58:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA -CastWarn.java:61:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DB, CastWarn.DA -CastWarn.java:62:36: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DB, CastWarn.DA -CastWarn.java:63:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DB -CastWarn.java:64:36: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DB +CastWarn.java:24:38: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:25:35: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:26:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:29:37: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:30:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:31:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:32:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:34:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:35:21: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DA +CastWarn.java:38:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DB, CastWarn.DA +CastWarn.java:39:36: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DB, CastWarn.DA +CastWarn.java:40:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DB +CastWarn.java:41:36: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), CastWarn.DA, CastWarn.DB 13 warnings diff --git a/test/langtools/tools/javac/importChecks/ImportCanonical1.out b/test/langtools/tools/javac/importChecks/ImportCanonical1.out index 1e69e6ba9c5..49bacba44cf 100644 --- a/test/langtools/tools/javac/importChecks/ImportCanonical1.out +++ b/test/langtools/tools/javac/importChecks/ImportCanonical1.out @@ -1,2 +1,2 @@ -ImportCanonical2.java:25:13: compiler.err.import.requires.canonical: p1.A1.I +ImportCanonical2.java:4:13: compiler.err.import.requires.canonical: p1.A1.I 1 error diff --git a/test/langtools/tools/javac/importChecks/ImportCanonical2.java b/test/langtools/tools/javac/importChecks/ImportCanonical2.java index 274142aa258..0ff619d80e1 100644 --- a/test/langtools/tools/javac/importChecks/ImportCanonical2.java +++ b/test/langtools/tools/javac/importChecks/ImportCanonical2.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2002, 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. - */ +/* /nodynamiccopyright/ */ package p1; import p1.A2.I; diff --git a/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java index bb18eded40a..683fa947cbb 100644 --- a/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java +++ b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2017, Google Inc. 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 + * @test /nodynamiccopyright/ * @bug 8187247 * @summary canonical import check compares classes by simple name * @author cushon diff --git a/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out index 16baec5f37c..498c1e2bce0 100644 --- a/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out +++ b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out @@ -1,2 +1,2 @@ -ImportCanonicalSameName.java:36:12: compiler.err.import.requires.canonical: p2.A.I +ImportCanonicalSameName.java:13:12: compiler.err.import.requires.canonical: p2.A.I 1 error diff --git a/test/langtools/tools/javac/importChecks/ImportsObservable.java b/test/langtools/tools/javac/importChecks/ImportsObservable.java index 41c7a69bd2e..800d71b8a73 100644 --- a/test/langtools/tools/javac/importChecks/ImportsObservable.java +++ b/test/langtools/tools/javac/importChecks/ImportsObservable.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2015, 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 + * @test /nodynamiccopyright/ * @bug 4869999 8193302 * @summary Verify that the compiler does not prematurely decide a package is not observable. * @compile -source 8 -Xlint:-options ImportsObservable.java diff --git a/test/langtools/tools/javac/importChecks/ImportsObservable.out b/test/langtools/tools/javac/importChecks/ImportsObservable.out index 963b51a0962..e6b6e51e4bb 100644 --- a/test/langtools/tools/javac/importChecks/ImportsObservable.out +++ b/test/langtools/tools/javac/importChecks/ImportsObservable.out @@ -1,2 +1,2 @@ -ImportsObservable.java:32:1: compiler.err.doesnt.exist: javax +ImportsObservable.java:9:1: compiler.err.doesnt.exist: javax 1 error diff --git a/test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.out b/test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.out index 612a44dd2bf..42bb0c84a61 100644 --- a/test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.out +++ b/test/langtools/tools/javac/importOnDemand/ImportOnDemandConflicts.out @@ -1,2 +1,2 @@ -String.java:13:9: compiler.err.ref.ambiguous: Boolean, kindname.class, p2.Boolean, p2, kindname.class, java.lang.Boolean, java.lang +String.java:15:9: compiler.err.ref.ambiguous: Boolean, kindname.class, p2.Boolean, p2, kindname.class, java.lang.Boolean, java.lang 1 error diff --git a/test/langtools/tools/javac/importOnDemand/p1/Object.java b/test/langtools/tools/javac/importOnDemand/p1/Object.java index e631c00de07..7fec50bfa21 100644 --- a/test/langtools/tools/javac/importOnDemand/p1/Object.java +++ b/test/langtools/tools/javac/importOnDemand/p1/Object.java @@ -1,3 +1,26 @@ +/* + * Copyright (c) 2020, 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. + */ + package p1; public class Object { diff --git a/test/langtools/tools/javac/importOnDemand/p1/String.java b/test/langtools/tools/javac/importOnDemand/p1/String.java index 38c79b384c4..3f3abc89d84 100644 --- a/test/langtools/tools/javac/importOnDemand/p1/String.java +++ b/test/langtools/tools/javac/importOnDemand/p1/String.java @@ -1,3 +1,5 @@ +/* /nodynamiccopyright/ */ + package p1; import p2.*; diff --git a/test/langtools/tools/javac/importOnDemand/p2/Boolean.java b/test/langtools/tools/javac/importOnDemand/p2/Boolean.java index 958644a8dfd..c59d26693e3 100644 --- a/test/langtools/tools/javac/importOnDemand/p2/Boolean.java +++ b/test/langtools/tools/javac/importOnDemand/p2/Boolean.java @@ -1,3 +1,26 @@ +/* + * Copyright (c) 2020, 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. + */ + package p2; public class Boolean { diff --git a/test/langtools/tools/javac/importscope/ImportInaccessible.java b/test/langtools/tools/javac/importscope/ImportInaccessible.java index b046ed6920c..2ab8d98a7c3 100644 --- a/test/langtools/tools/javac/importscope/ImportInaccessible.java +++ b/test/langtools/tools/javac/importscope/ImportInaccessible.java @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2014, 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 + * @test /nodynamiccopyright/ * @bug 8067886 * @summary Verify that type import on demand won't put inaccessible types into the Scope * @compile/fail/ref=ImportInaccessible.out -XDrawDiagnostics ImportInaccessible.java diff --git a/test/langtools/tools/javac/importscope/ImportInaccessible.out b/test/langtools/tools/javac/importscope/ImportInaccessible.out index dbaa028696e..c9638881408 100644 --- a/test/langtools/tools/javac/importscope/ImportInaccessible.out +++ b/test/langtools/tools/javac/importscope/ImportInaccessible.out @@ -1,2 +1,2 @@ -ImportInaccessible.java:34:35: compiler.err.cant.resolve.location: kindname.class, Inner, , , (compiler.misc.location: kindname.class, p.ImportInaccessible, null) +ImportInaccessible.java:11:35: compiler.err.cant.resolve.location: kindname.class, Inner, , , (compiler.misc.location: kindname.class, p.ImportInaccessible, null) 1 error diff --git a/test/langtools/tools/javac/lambda/ExceptionsInLambda.java b/test/langtools/tools/javac/lambda/ExceptionsInLambda.java index bb63dae8543..a5941f36f00 100644 --- a/test/langtools/tools/javac/lambda/ExceptionsInLambda.java +++ b/test/langtools/tools/javac/lambda/ExceptionsInLambda.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8015809 * @summary Producing individual errors for uncaught undeclared exceptions inside lambda expressions, instead of one error for whole lambda * @compile/fail/ref=ExceptionsInLambda.out -XDrawDiagnostics ExceptionsInLambda.java diff --git a/test/langtools/tools/javac/lambda/ExceptionsInLambda.out b/test/langtools/tools/javac/lambda/ExceptionsInLambda.out index 5cfa24916f5..49e1fd3bb96 100644 --- a/test/langtools/tools/javac/lambda/ExceptionsInLambda.out +++ b/test/langtools/tools/javac/lambda/ExceptionsInLambda.out @@ -1,4 +1,4 @@ -ExceptionsInLambda.java:43:25: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.FileNotFoundException -ExceptionsInLambda.java:46:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.IOException -ExceptionsInLambda.java:51:22: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.FileNotFoundException +ExceptionsInLambda.java:20:25: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.FileNotFoundException +ExceptionsInLambda.java:23:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.IOException +ExceptionsInLambda.java:28:22: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.FileNotFoundException 3 errors diff --git a/test/langtools/tools/javac/lambda/Intersection02.java b/test/langtools/tools/javac/lambda/Intersection02.java index f02f5ea3928..79bb0de5e46 100644 --- a/test/langtools/tools/javac/lambda/Intersection02.java +++ b/test/langtools/tools/javac/lambda/Intersection02.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8010101 * @summary Intersection type cast issues redundant unchecked warning * @compile/fail/ref=Intersection02.out -Werror -Xlint:unchecked -XDrawDiagnostics Intersection02.java diff --git a/test/langtools/tools/javac/lambda/Intersection02.out b/test/langtools/tools/javac/lambda/Intersection02.out index f3844e278ce..c89fbbe392d 100644 --- a/test/langtools/tools/javac/lambda/Intersection02.out +++ b/test/langtools/tools/javac/lambda/Intersection02.out @@ -1,4 +1,4 @@ -Intersection02.java:39:62: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), java.util.List, java.lang.Object&java.util.List&java.io.Serializable&Intersection02.P +Intersection02.java:16:62: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), java.util.List, java.lang.Object&java.util.List&java.io.Serializable&Intersection02.P - compiler.err.warnings.and.werror 1 error 1 warning diff --git a/test/langtools/tools/javac/lambda/MethodReference25.java b/test/langtools/tools/javac/lambda/MethodReference25.java index 9ff11e59d33..ffd673b50f9 100644 --- a/test/langtools/tools/javac/lambda/MethodReference25.java +++ b/test/langtools/tools/javac/lambda/MethodReference25.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2011, 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 + * @test /nodynamiccopyright/ * @bug 8003280 * @summary Add lambda tests * check that non-boxing method references is not preferred over boxing one diff --git a/test/langtools/tools/javac/lambda/MethodReference25.out b/test/langtools/tools/javac/lambda/MethodReference25.out index 3b4e2674346..c15844d74fb 100644 --- a/test/langtools/tools/javac/lambda/MethodReference25.out +++ b/test/langtools/tools/javac/lambda/MethodReference25.out @@ -1,2 +1,2 @@ -MethodReference25.java:48:9: compiler.err.ref.ambiguous: call, kindname.method, call(int,MethodReference25.SAM1), MethodReference25, kindname.method, call(int,MethodReference25.SAM2), MethodReference25 +MethodReference25.java:25:9: compiler.err.ref.ambiguous: call, kindname.method, call(int,MethodReference25.SAM1), MethodReference25, kindname.method, call(int,MethodReference25.SAM2), MethodReference25 1 error diff --git a/test/langtools/tools/javac/lambda/MethodReference56.java b/test/langtools/tools/javac/lambda/MethodReference56.java index 9e79fab6cc0..e4f0cb0b3ad 100644 --- a/test/langtools/tools/javac/lambda/MethodReference56.java +++ b/test/langtools/tools/javac/lambda/MethodReference56.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8004101 * @summary Add checks for method reference well-formedness * @compile/fail/ref=MethodReference56.out -XDrawDiagnostics MethodReference56.java diff --git a/test/langtools/tools/javac/lambda/MethodReference56.out b/test/langtools/tools/javac/lambda/MethodReference56.out index 34ccd15956d..856b9dbf085 100644 --- a/test/langtools/tools/javac/lambda/MethodReference56.out +++ b/test/langtools/tools/javac/lambda/MethodReference56.out @@ -1,3 +1,3 @@ -MethodReference56.java:36:28: compiler.err.invalid.mref: kindname.method, (compiler.misc.static.mref.with.targs) -MethodReference56.java:39:28: compiler.err.invalid.mref: kindname.method, (compiler.misc.static.mref.with.targs) +MethodReference56.java:13:28: compiler.err.invalid.mref: kindname.method, (compiler.misc.static.mref.with.targs) +MethodReference56.java:16:28: compiler.err.invalid.mref: kindname.method, (compiler.misc.static.mref.with.targs) 2 errors diff --git a/test/langtools/tools/javac/lambda/MethodReference58.java b/test/langtools/tools/javac/lambda/MethodReference58.java index 83288ec6f35..a437831abee 100644 --- a/test/langtools/tools/javac/lambda/MethodReference58.java +++ b/test/langtools/tools/javac/lambda/MethodReference58.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8004102 8078024 * @summary Add support for generic functional descriptors * @compile/fail/ref=MethodReference58.out -XDrawDiagnostics MethodReference58.java diff --git a/test/langtools/tools/javac/lambda/MethodReference58.out b/test/langtools/tools/javac/lambda/MethodReference58.out index 18d0ae74d01..73a707401d6 100644 --- a/test/langtools/tools/javac/lambda/MethodReference58.out +++ b/test/langtools/tools/javac/lambda/MethodReference58.out @@ -1,2 +1,2 @@ -MethodReference58.java:41:23: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, g, Z, X, kindname.class, MethodReference58, (compiler.misc.incompatible.bounds: Z, (compiler.misc.upper.bounds: java.lang.Number), (compiler.misc.lower.bounds: X)))) +MethodReference58.java:18:23: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, g, Z, X, kindname.class, MethodReference58, (compiler.misc.incompatible.bounds: Z, (compiler.misc.upper.bounds: java.lang.Number), (compiler.misc.lower.bounds: X)))) 1 error diff --git a/test/langtools/tools/javac/lambda/MethodReference60.java b/test/langtools/tools/javac/lambda/MethodReference60.java index cc9b19ee50c..4209e1b9a32 100644 --- a/test/langtools/tools/javac/lambda/MethodReference60.java +++ b/test/langtools/tools/javac/lambda/MethodReference60.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8004102 * @summary Add support for array constructor references * @compile/fail/ref=MethodReference60.out -XDrawDiagnostics MethodReference60.java diff --git a/test/langtools/tools/javac/lambda/MethodReference60.out b/test/langtools/tools/javac/lambda/MethodReference60.out index 5aa973cf2ad..09f82366805 100644 --- a/test/langtools/tools/javac/lambda/MethodReference60.out +++ b/test/langtools/tools/javac/lambda/MethodReference60.out @@ -1,6 +1,6 @@ -MethodReference60.java:49:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, compiler.misc.no.args, kindname.class, Array, (compiler.misc.arg.length.mismatch))) -MethodReference60.java:50:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, int,int, kindname.class, Array, (compiler.misc.arg.length.mismatch))) -MethodReference60.java:51:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, java.lang.String, kindname.class, Array, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, int)))) -MethodReference60.java:52:42: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: int[], java.lang.Integer)) -MethodReference60.java:53:44: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: int[], java.lang.Integer[])) +MethodReference60.java:26:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, compiler.misc.no.args, kindname.class, Array, (compiler.misc.arg.length.mismatch))) +MethodReference60.java:27:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, int,int, kindname.class, Array, (compiler.misc.arg.length.mismatch))) +MethodReference60.java:28:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, java.lang.String, kindname.class, Array, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, int)))) +MethodReference60.java:29:42: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: int[], java.lang.Integer)) +MethodReference60.java:30:44: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: int[], java.lang.Integer[])) 5 errors diff --git a/test/langtools/tools/javac/lambda/MostSpecific04.java b/test/langtools/tools/javac/lambda/MostSpecific04.java index 74ac24e4bc4..363661964ad 100644 --- a/test/langtools/tools/javac/lambda/MostSpecific04.java +++ b/test/langtools/tools/javac/lambda/MostSpecific04.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8003280 * @summary Add lambda tests * Structural most specific doesn't handle cases with wildcards in functional interfaces diff --git a/test/langtools/tools/javac/lambda/MostSpecific04.out b/test/langtools/tools/javac/lambda/MostSpecific04.out index 3a672f0698e..a64a8736f09 100644 --- a/test/langtools/tools/javac/lambda/MostSpecific04.out +++ b/test/langtools/tools/javac/lambda/MostSpecific04.out @@ -1,2 +1,2 @@ -MostSpecific04.java:48:11: compiler.err.ref.ambiguous: map, kindname.method, map(MostSpecific04.DoubleMapper), MostSpecific04.MyList, kindname.method, map(MostSpecific04.LongMapper), MostSpecific04.MyList +MostSpecific04.java:25:11: compiler.err.ref.ambiguous: map, kindname.method, map(MostSpecific04.DoubleMapper), MostSpecific04.MyList, kindname.method, map(MostSpecific04.LongMapper), MostSpecific04.MyList 1 error diff --git a/test/langtools/tools/javac/lambda/MostSpecific05.java b/test/langtools/tools/javac/lambda/MostSpecific05.java index f001ccc195b..345578b509d 100644 --- a/test/langtools/tools/javac/lambda/MostSpecific05.java +++ b/test/langtools/tools/javac/lambda/MostSpecific05.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8003280 * @summary Add lambda tests * Structural most specific doesn't handle cases with wildcards in functional interfaces diff --git a/test/langtools/tools/javac/lambda/MostSpecific05.out b/test/langtools/tools/javac/lambda/MostSpecific05.out index d0d86c151b4..25d4b722ca7 100644 --- a/test/langtools/tools/javac/lambda/MostSpecific05.out +++ b/test/langtools/tools/javac/lambda/MostSpecific05.out @@ -1,2 +1,2 @@ -MostSpecific05.java:48:11: compiler.err.ref.ambiguous: map, kindname.method, map(MostSpecific05.ObjectConverter), MostSpecific05.MyMapper, kindname.method, map(MostSpecific05.NumberConverter), MostSpecific05.MyMapper +MostSpecific05.java:25:11: compiler.err.ref.ambiguous: map, kindname.method, map(MostSpecific05.ObjectConverter), MostSpecific05.MyMapper, kindname.method, map(MostSpecific05.NumberConverter), MostSpecific05.MyMapper 1 error diff --git a/test/langtools/tools/javac/lambda/MostSpecific08.java b/test/langtools/tools/javac/lambda/MostSpecific08.java index 0673ef0ba06..833197985fc 100644 --- a/test/langtools/tools/javac/lambda/MostSpecific08.java +++ b/test/langtools/tools/javac/lambda/MostSpecific08.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8008813 * @summary Structural most specific fails when method reference is passed to overloaded method * @compile/fail/ref=MostSpecific08.out -XDrawDiagnostics MostSpecific08.java diff --git a/test/langtools/tools/javac/lambda/MostSpecific08.out b/test/langtools/tools/javac/lambda/MostSpecific08.out index f4e47d7d0ed..de46dae5a91 100644 --- a/test/langtools/tools/javac/lambda/MostSpecific08.out +++ b/test/langtools/tools/javac/lambda/MostSpecific08.out @@ -1,4 +1,4 @@ -MostSpecific08.java:59:26: compiler.err.ref.ambiguous: apply, kindname.method, apply(MostSpecific08.PrimitiveFunction), MostSpecific08.Tester, kindname.method, apply(MostSpecific08.ReferenceFunction), MostSpecific08.Tester -MostSpecific08.java:61:41: compiler.err.ref.ambiguous: apply, kindname.method, apply(MostSpecific08.PrimitiveFunction), MostSpecific08.Tester, kindname.method, apply(MostSpecific08.ReferenceFunction), MostSpecific08.Tester -MostSpecific08.java:61:47: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: MostSpecific08.IntResult, MostSpecific08.ReferenceResult) +MostSpecific08.java:36:26: compiler.err.ref.ambiguous: apply, kindname.method, apply(MostSpecific08.PrimitiveFunction), MostSpecific08.Tester, kindname.method, apply(MostSpecific08.ReferenceFunction), MostSpecific08.Tester +MostSpecific08.java:38:41: compiler.err.ref.ambiguous: apply, kindname.method, apply(MostSpecific08.PrimitiveFunction), MostSpecific08.Tester, kindname.method, apply(MostSpecific08.ReferenceFunction), MostSpecific08.Tester +MostSpecific08.java:38:47: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: MostSpecific08.IntResult, MostSpecific08.ReferenceResult) 3 errors diff --git a/test/langtools/tools/javac/lambda/TargetType01.java b/test/langtools/tools/javac/lambda/TargetType01.java index 08caecc3e3b..cd045b4d219 100644 --- a/test/langtools/tools/javac/lambda/TargetType01.java +++ b/test/langtools/tools/javac/lambda/TargetType01.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2011, 2014, 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 + * @test /nodynamiccopyright/ * @bug 8003280 8009131 * @summary Add lambda tests * check nested case of overload resolution and lambda parameter inference diff --git a/test/langtools/tools/javac/lambda/TargetType01.out b/test/langtools/tools/javac/lambda/TargetType01.out index 4775056bd80..181c02b233b 100644 --- a/test/langtools/tools/javac/lambda/TargetType01.out +++ b/test/langtools/tools/javac/lambda/TargetType01.out @@ -1,3 +1,3 @@ -TargetType01.java:45:9: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01 -TargetType01.java:46:20: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01 +TargetType01.java:22:9: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01 +TargetType01.java:23:20: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01 2 errors diff --git a/test/langtools/tools/javac/lambda/TargetType36.java b/test/langtools/tools/javac/lambda/TargetType36.java index 38f9c2add40..d97128e05c8 100644 --- a/test/langtools/tools/javac/lambda/TargetType36.java +++ b/test/langtools/tools/javac/lambda/TargetType36.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 8003280 8013404 * @summary Add lambda tests * check that target type of cast is not propagated to conditional subexpressions diff --git a/test/langtools/tools/javac/lambda/TargetType36.out b/test/langtools/tools/javac/lambda/TargetType36.out index 92542ddd182..904ebde23f2 100644 --- a/test/langtools/tools/javac/lambda/TargetType36.out +++ b/test/langtools/tools/javac/lambda/TargetType36.out @@ -1,3 +1,3 @@ -TargetType36.java:40:30: compiler.err.unexpected.lambda -TargetType36.java:40:43: compiler.err.unexpected.lambda +TargetType36.java:17:30: compiler.err.unexpected.lambda +TargetType36.java:17:43: compiler.err.unexpected.lambda 2 errors diff --git a/test/langtools/tools/javac/lambda/TargetType68.java b/test/langtools/tools/javac/lambda/TargetType68.java index 13cad4f16b0..893381828d8 100644 --- a/test/langtools/tools/javac/lambda/TargetType68.java +++ b/test/langtools/tools/javac/lambda/TargetType68.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2013, 2015, 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 + * @test /nodynamiccopyright/ * @bug 8010303 8062373 * @summary Graph inference: missing incorporation step causes spurious inference error * @compile/fail/ref=TargetType68.out -XDrawDiagnostics TargetType68.java diff --git a/test/langtools/tools/javac/lambda/TargetType68.out b/test/langtools/tools/javac/lambda/TargetType68.out index 50933c0ca1d..068130c8ef7 100644 --- a/test/langtools/tools/javac/lambda/TargetType68.out +++ b/test/langtools/tools/javac/lambda/TargetType68.out @@ -1,2 +1,2 @@ -TargetType68.java:61:32: compiler.err.cant.inherit.from.final: TargetType68.XYChart.Series +TargetType68.java:38:32: compiler.err.cant.inherit.from.final: TargetType68.XYChart.Series 1 error diff --git a/test/langtools/tools/javac/lambda/UnderscoreAsIdent.java b/test/langtools/tools/javac/lambda/UnderscoreAsIdent.java index dc50aa143e0..d766b36e3fb 100644 --- a/test/langtools/tools/javac/lambda/UnderscoreAsIdent.java +++ b/test/langtools/tools/javac/lambda/UnderscoreAsIdent.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2013, 2014, 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 + * @test /nodynamiccopyright/ * @summary Check usages of underscore as identifier generate warnings * @compile/fail/ref=UnderscoreAsIdent8.out -source 8 -Xlint:-options -XDrawDiagnostics -Werror UnderscoreAsIdent.java * @compile/fail/ref=UnderscoreAsIdent9.out -XDrawDiagnostics -Werror UnderscoreAsIdent.java diff --git a/test/langtools/tools/javac/lambda/UnderscoreAsIdent8.out b/test/langtools/tools/javac/lambda/UnderscoreAsIdent8.out index bc9c9c0ae60..fa91c4ecbf1 100644 --- a/test/langtools/tools/javac/lambda/UnderscoreAsIdent8.out +++ b/test/langtools/tools/javac/lambda/UnderscoreAsIdent8.out @@ -1,20 +1,20 @@ -UnderscoreAsIdent.java:30:9: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:30:11: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:32:8: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:32:10: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:34:7: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:35:12: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:36:10: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:36:19: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:38:16: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:41:18: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:41:25: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:41:33: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:44:34: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:47:9: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:49:19: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:51:9: compiler.warn.underscore.as.identifier -UnderscoreAsIdent.java:53:22: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:7:9: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:7:11: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:9:8: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:9:10: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:11:7: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:12:12: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:13:10: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:13:19: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:15:16: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:18:18: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:18:25: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:18:33: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:21:34: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:24:9: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:26:19: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:28:9: compiler.warn.underscore.as.identifier +UnderscoreAsIdent.java:30:22: compiler.warn.underscore.as.identifier - compiler.err.warnings.and.werror 1 error 17 warnings diff --git a/test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out b/test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out index 420c69c32d6..67059af5258 100644 --- a/test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out +++ b/test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out @@ -1,18 +1,18 @@ -UnderscoreAsIdent.java:30:9: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:30:11: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:32:8: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:32:10: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:34:7: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:35:12: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:36:10: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:36:19: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:38:16: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:41:18: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:41:25: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:41:33: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:44:34: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:47:9: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:49:19: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:51:9: compiler.err.underscore.as.identifier -UnderscoreAsIdent.java:53:22: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:7:9: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:7:11: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:9:8: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:9:10: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:11:7: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:12:12: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:13:10: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:13:19: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:15:16: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:18:18: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:18:25: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:18:33: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:21:34: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:24:9: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:26:19: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:28:9: compiler.err.underscore.as.identifier +UnderscoreAsIdent.java:30:22: compiler.err.underscore.as.identifier 17 errors diff --git a/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java b/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java index 614ef3bb502..2a101961abb 100644 --- a/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java +++ b/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8003280 * @summary Add lambda tests * check that classfiles with member ref CP entries are read correctly diff --git a/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out b/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out index bc0f3b82e15..965f8edddea 100644 --- a/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out +++ b/test/langtools/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.out @@ -1,2 +1,2 @@ -InaccessibleMref01.java:37:17: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.not.def.public.cant.access: m(), p1.C)) +InaccessibleMref01.java:14:17: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.not.def.public.cant.access: m(), p1.C)) 1 error diff --git a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.java index a263864e9b0..52c9b1457d0 100644 --- a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.java +++ b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2018, Google LLC. 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 + * @test /nodynamiccopyright/ * @bug 8210483 * @summary AssertionError in DeferredAttr at setOverloadKind caused by JDK-8203679 * @compile/fail/ref=MethodRefStuck.out -XDrawDiagnostics MethodRefStuck.java diff --git a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.out b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.out index f66d626004d..d3aa75d1ba5 100644 --- a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.out +++ b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuck.out @@ -1,2 +1,2 @@ -MethodRefStuck.java:38:18: compiler.err.cant.apply.symbol: kindname.constructor, I, boolean, java.util.Optional, kindname.class, MethodRefStuck.I, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: U, java.util.Optional, boolean)) +MethodRefStuck.java:15:18: compiler.err.cant.apply.symbol: kindname.constructor, I, boolean, java.util.Optional, kindname.class, MethodRefStuck.I, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: U, java.util.Optional, boolean)) 1 error diff --git a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.java b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.java index 911327fb07f..014eed1107d 100644 --- a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.java +++ b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2018, Google LLC. 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 + * @test /nodynamiccopyright/ * @bug 8203679 * @summary This is a negative regression test for an AssertionError in DeferredAttr. * @compile/fail/ref=MethodRefStuckParenthesized.out -XDrawDiagnostics MethodRefStuckParenthesized.java diff --git a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.out b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.out index b63737eabcf..634a7d028f6 100644 --- a/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.out +++ b/test/langtools/tools/javac/lambda/methodReference/MethodRefStuckParenthesized.out @@ -1,2 +1,2 @@ -MethodRefStuckParenthesized.java:48:5: compiler.err.cant.apply.symbol: kindname.method, f, MethodRefStuckParenthesized.I, MethodRefStuckParenthesized.J, kindname.class, MethodRefStuckParenthesized, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: X, MethodRefStuckParenthesized.J, MethodRefStuckParenthesized.I)) +MethodRefStuckParenthesized.java:25:5: compiler.err.cant.apply.symbol: kindname.method, f, MethodRefStuckParenthesized.I, MethodRefStuckParenthesized.J, kindname.class, MethodRefStuckParenthesized, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: X, MethodRefStuckParenthesized.J, MethodRefStuckParenthesized.I)) 1 error diff --git a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java index 96dd4262692..f5f2993aa85 100644 --- a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java +++ b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.java @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2020, 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 + * @test /nodynamiccopyright/ * @summary test for VarHandle signature polymorphic methods with wrong return type * @compile/fail/ref=MethodReferenceTestVarHandle_neg.out -XDrawDiagnostics MethodReferenceTestVarHandle_neg.java */ diff --git a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.out b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.out index 3b57af5e5d7..47cd55fb682 100644 --- a/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.out +++ b/test/langtools/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestVarHandle_neg.out @@ -1,2 +1,2 @@ -MethodReferenceTestVarHandle_neg.java:43:18: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: void, int)) +MethodReferenceTestVarHandle_neg.java:20:18: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: void, int)) 1 error \ No newline at end of file diff --git a/test/langtools/tools/javac/lambda/speculative/A.java b/test/langtools/tools/javac/lambda/speculative/A.java index da3436ed130..6d8cf08d85d 100644 --- a/test/langtools/tools/javac/lambda/speculative/A.java +++ b/test/langtools/tools/javac/lambda/speculative/A.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2012, 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. - */ +/* /nodynamiccopyright/ */ public class A { public A(NonExistentClass nec) {} diff --git a/test/langtools/tools/javac/lambda/speculative/Main.out b/test/langtools/tools/javac/lambda/speculative/Main.out index 91348ae9906..34397dc7535 100644 --- a/test/langtools/tools/javac/lambda/speculative/Main.out +++ b/test/langtools/tools/javac/lambda/speculative/Main.out @@ -1,2 +1,2 @@ -A.java:25:14: compiler.err.cant.resolve.location: kindname.class, NonExistentClass, , , (compiler.misc.location: kindname.class, A, null) +A.java:4:14: compiler.err.cant.resolve.location: kindname.class, NonExistentClass, , , (compiler.misc.location: kindname.class, A, null) 1 error diff --git a/test/langtools/tools/javac/limits/ArrayDims2.java b/test/langtools/tools/javac/limits/ArrayDims2.java index fc7f613158e..947fba8b850 100644 --- a/test/langtools/tools/javac/limits/ArrayDims2.java +++ b/test/langtools/tools/javac/limits/ArrayDims2.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4309152 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/ArrayDims2.out b/test/langtools/tools/javac/limits/ArrayDims2.out index 4479f686a00..f1b036b953e 100644 --- a/test/langtools/tools/javac/limits/ArrayDims2.out +++ b/test/langtools/tools/javac/limits/ArrayDims2.out @@ -1,2 +1,2 @@ -ArrayDims2.java:60:22: compiler.err.limit.dimensions +ArrayDims2.java:37:22: compiler.err.limit.dimensions 1 error diff --git a/test/langtools/tools/javac/limits/ArrayDims4.java b/test/langtools/tools/javac/limits/ArrayDims4.java index d3ee5658bb6..31a3f1a719d 100644 --- a/test/langtools/tools/javac/limits/ArrayDims4.java +++ b/test/langtools/tools/javac/limits/ArrayDims4.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4309152 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/ArrayDims4.out b/test/langtools/tools/javac/limits/ArrayDims4.out index 47799f350ed..b4b9d37993f 100644 --- a/test/langtools/tools/javac/limits/ArrayDims4.out +++ b/test/langtools/tools/javac/limits/ArrayDims4.out @@ -1,2 +1,2 @@ -ArrayDims4.java:34:23: compiler.err.limit.dimensions +ArrayDims4.java:11:23: compiler.err.limit.dimensions 1 error diff --git a/test/langtools/tools/javac/limits/ArrayDims5.java b/test/langtools/tools/javac/limits/ArrayDims5.java index 4c2a9cdd577..8902ec5b630 100644 --- a/test/langtools/tools/javac/limits/ArrayDims5.java +++ b/test/langtools/tools/javac/limits/ArrayDims5.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4741759 * @summary javac fails to diagnose too many array dimensions * @author gafter diff --git a/test/langtools/tools/javac/limits/ArrayDims5.out b/test/langtools/tools/javac/limits/ArrayDims5.out index 839e77428ca..8b679c7827f 100644 --- a/test/langtools/tools/javac/limits/ArrayDims5.out +++ b/test/langtools/tools/javac/limits/ArrayDims5.out @@ -1,2 +1,2 @@ -ArrayDims5.java:43:9: compiler.err.limit.dimensions +ArrayDims5.java:20:9: compiler.err.limit.dimensions 1 error diff --git a/test/langtools/tools/javac/limits/CodeSize.java b/test/langtools/tools/javac/limits/CodeSize.java index 130b7be0cda..6fd721f8d08 100644 --- a/test/langtools/tools/javac/limits/CodeSize.java +++ b/test/langtools/tools/javac/limits/CodeSize.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4309152 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/CodeSize.out b/test/langtools/tools/javac/limits/CodeSize.out index d31dcc7013c..6efbe17893d 100644 --- a/test/langtools/tools/javac/limits/CodeSize.out +++ b/test/langtools/tools/javac/limits/CodeSize.out @@ -1,2 +1,2 @@ -CodeSize.java:34:10: compiler.err.limit.code +CodeSize.java:11:10: compiler.err.limit.code 1 error diff --git a/test/langtools/tools/javac/limits/LongName.java b/test/langtools/tools/javac/limits/LongName.java index 943c30274bc..62bce151133 100644 --- a/test/langtools/tools/javac/limits/LongName.java +++ b/test/langtools/tools/javac/limits/LongName.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4309152 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/LongName.out b/test/langtools/tools/javac/limits/LongName.out index 5b64c85087b..a379cf43a3b 100644 --- a/test/langtools/tools/javac/limits/LongName.out +++ b/test/langtools/tools/javac/limits/LongName.out @@ -1,2 +1,2 @@ -LongName.java:33:1: compiler.err.limit.string.overflow: abcdefghijklnmopqrst +LongName.java:10:1: compiler.err.limit.string.overflow: abcdefghijklnmopqrst 1 error diff --git a/test/langtools/tools/javac/limits/PoolSize1.java b/test/langtools/tools/javac/limits/PoolSize1.java index 480feed7c43..896a90d73d4 100644 --- a/test/langtools/tools/javac/limits/PoolSize1.java +++ b/test/langtools/tools/javac/limits/PoolSize1.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4309152 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/PoolSize1.out b/test/langtools/tools/javac/limits/PoolSize1.out index cfcdbd6c0b9..32335f4830f 100644 --- a/test/langtools/tools/javac/limits/PoolSize1.out +++ b/test/langtools/tools/javac/limits/PoolSize1.out @@ -1,2 +1,2 @@ -PoolSize1.java:35:1: compiler.err.limit.pool +PoolSize1.java:12:1: compiler.err.limit.pool 1 error diff --git a/test/langtools/tools/javac/limits/PoolSize2.java b/test/langtools/tools/javac/limits/PoolSize2.java index 66f4ffe3933..d5f946ca727 100644 --- a/test/langtools/tools/javac/limits/PoolSize2.java +++ b/test/langtools/tools/javac/limits/PoolSize2.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 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 + * @test /nodynamiccopyright/ * @bug 4309152 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/PoolSize2.out b/test/langtools/tools/javac/limits/PoolSize2.out index 5b688066ceb..c82fcbba1d3 100644 --- a/test/langtools/tools/javac/limits/PoolSize2.out +++ b/test/langtools/tools/javac/limits/PoolSize2.out @@ -1,2 +1,2 @@ -PoolSize2.java:35:1: compiler.err.limit.pool +PoolSize2.java:12:1: compiler.err.limit.pool 1 error diff --git a/test/langtools/tools/javac/limits/StringLength.java b/test/langtools/tools/javac/limits/StringLength.java index 5d4e35c3e94..b7ce4d116d4 100644 --- a/test/langtools/tools/javac/limits/StringLength.java +++ b/test/langtools/tools/javac/limits/StringLength.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2002, 2003, 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 + * @test /nodynamiccopyright/ * @bug 4309152 4805490 * @summary Compiler silently generates bytecode that exceeds VM limits * @author gafter diff --git a/test/langtools/tools/javac/limits/StringLength.out b/test/langtools/tools/javac/limits/StringLength.out index b0c3a520a00..8c79025542a 100644 --- a/test/langtools/tools/javac/limits/StringLength.out +++ b/test/langtools/tools/javac/limits/StringLength.out @@ -1,2 +1,2 @@ -StringLength.java:45:37: compiler.err.limit.string +StringLength.java:22:37: compiler.err.limit.string 1 error diff --git a/test/langtools/tools/javac/overrridecrash/A.java b/test/langtools/tools/javac/overrridecrash/A.java index f89493a90ac..dd98e09cdf3 100644 --- a/test/langtools/tools/javac/overrridecrash/A.java +++ b/test/langtools/tools/javac/overrridecrash/A.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2003, 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. - */ +/* /nodynamiccopyright/ */ public class A { private protected int m() { return -1; } diff --git a/test/langtools/tools/javac/overrridecrash/B.out b/test/langtools/tools/javac/overrridecrash/B.out index cfe1aa11dcf..8624e3f7935 100644 --- a/test/langtools/tools/javac/overrridecrash/B.out +++ b/test/langtools/tools/javac/overrridecrash/B.out @@ -1,3 +1,3 @@ B.java:12:27: compiler.err.illegal.combination.of.modifiers: private, protected -A.java:25:27: compiler.err.illegal.combination.of.modifiers: private, protected +A.java:4:27: compiler.err.illegal.combination.of.modifiers: private, protected 2 errors diff --git a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.java b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.java index 4467d98ba71..95ff540c004 100644 --- a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.java +++ b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8012722 * @summary Single comma in array initializer should parse * @compile/fail/ref=SingleCommaAnnotationValueFail.out -XDrawDiagnostics diff --git a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out index 3748ccfeb97..23d1082361b 100644 --- a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out +++ b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out @@ -1,3 +1,3 @@ -SingleCommaAnnotationValueFail.java:34:12: compiler.err.expected: '}' -SingleCommaAnnotationValueFail.java:34:14: compiler.err.expected4: class, interface, enum, record +SingleCommaAnnotationValueFail.java:11:12: compiler.err.expected: '}' +SingleCommaAnnotationValueFail.java:11:14: compiler.err.expected4: class, interface, enum, record 2 errors diff --git a/test/langtools/tools/javac/parser/T4881269.java b/test/langtools/tools/javac/parser/T4881269.java index 8c5ca9b6fa9..0824d995a0e 100644 --- a/test/langtools/tools/javac/parser/T4881269.java +++ b/test/langtools/tools/javac/parser/T4881269.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2011, 2012, 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 + * @test /nodynamiccopyright/ * @bug 4881269 * @summary improve diagnostic for ill-formed tokens * @compile/fail/ref=T4881269.out -XDrawDiagnostics T4881269.java diff --git a/test/langtools/tools/javac/parser/T4881269.out b/test/langtools/tools/javac/parser/T4881269.out index b8436172ea7..051346acbd4 100644 --- a/test/langtools/tools/javac/parser/T4881269.out +++ b/test/langtools/tools/javac/parser/T4881269.out @@ -1,5 +1,5 @@ -T4881269.java:32:13: compiler.err.illegal.dot -T4881269.java:33:27: compiler.err.illegal.dot -T4881269.java:33:22: compiler.err.not.stmt -T4881269.java:34:19: compiler.err.illegal.dot +T4881269.java:9:13: compiler.err.illegal.dot +T4881269.java:10:27: compiler.err.illegal.dot +T4881269.java:10:22: compiler.err.not.stmt +T4881269.java:11:19: compiler.err.illegal.dot 4 errors diff --git a/test/langtools/tools/javac/patterns/CastConversionMatch.java b/test/langtools/tools/javac/patterns/CastConversionMatch.java index 1300bf09d16..a6dde442082 100644 --- a/test/langtools/tools/javac/patterns/CastConversionMatch.java +++ b/test/langtools/tools/javac/patterns/CastConversionMatch.java @@ -1,5 +1,5 @@ /* - * @test /nodynamicopyright/ + * @test /nodynamiccopyright/ * @bug 8231827 * @summary Match which involves a cast conversion * @compile/fail/ref=CastConversionMatch.out -XDrawDiagnostics CastConversionMatch.java diff --git a/test/langtools/tools/javac/patterns/NullsInPatterns.java b/test/langtools/tools/javac/patterns/NullsInPatterns.java index e9f6221d153..5873886b2ed 100644 --- a/test/langtools/tools/javac/patterns/NullsInPatterns.java +++ b/test/langtools/tools/javac/patterns/NullsInPatterns.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2017, 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 + * @test /nodynamiccopyright/ * @bug 8231827 * @summary Testing pattern matching against the null constant * @compile/fail/ref=NullsInPatterns.out -XDrawDiagnostics NullsInPatterns.java diff --git a/test/langtools/tools/javac/patterns/NullsInPatterns.out b/test/langtools/tools/javac/patterns/NullsInPatterns.out index 14b5e56f825..4c771b36ca4 100644 --- a/test/langtools/tools/javac/patterns/NullsInPatterns.out +++ b/test/langtools/tools/javac/patterns/NullsInPatterns.out @@ -1,3 +1,3 @@ -NullsInPatterns.java:35:18: compiler.err.instanceof.pattern.no.subtype: java.util.List, compiler.misc.type.null -NullsInPatterns.java:46:18: compiler.err.instanceof.pattern.no.subtype: java.util.List, compiler.misc.type.null +NullsInPatterns.java:12:18: compiler.err.instanceof.pattern.no.subtype: java.util.List, compiler.misc.type.null +NullsInPatterns.java:23:18: compiler.err.instanceof.pattern.no.subtype: java.util.List, compiler.misc.type.null 2 errors diff --git a/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java b/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java index 6ee3adf30b8..96cb69e8021 100644 --- a/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java +++ b/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2017, 2020, 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 + * @test /nodynamiccopyright/ * @bug 8231827 * @summary Pattern variables are non-final. * @compile/fail/ref=PatternVariablesAreNonFinal.out -XDrawDiagnostics PatternVariablesAreNonFinal.java diff --git a/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.out b/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.out index c2f3f410a7f..314e1d05b97 100644 --- a/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.out +++ b/test/langtools/tools/javac/patterns/PatternVariablesAreNonFinal.out @@ -1,2 +1,2 @@ -PatternVariablesAreNonFinal.java:38:40: compiler.err.cant.ref.non.effectively.final.var: s, (compiler.misc.inner.cls) +PatternVariablesAreNonFinal.java:15:40: compiler.err.cant.ref.non.effectively.final.var: s, (compiler.misc.inner.cls) 1 error diff --git a/test/langtools/tools/javac/plugin/showtype/Identifiers.java b/test/langtools/tools/javac/plugin/showtype/Identifiers.java index 9bcac670b84..73ceb25f56e 100644 --- a/test/langtools/tools/javac/plugin/showtype/Identifiers.java +++ b/test/langtools/tools/javac/plugin/showtype/Identifiers.java @@ -1,4 +1,4 @@ -/* /nodynamiccopyright */ +/* /nodynamiccopyright/ */ public class Identifiers { public double E = Math.E; diff --git a/test/langtools/tools/javac/processing/TestMultipleErrors.java b/test/langtools/tools/javac/processing/TestMultipleErrors.java index d5b297bb553..b9cc2b6b0e2 100644 --- a/test/langtools/tools/javac/processing/TestMultipleErrors.java +++ b/test/langtools/tools/javac/processing/TestMultipleErrors.java @@ -1,5 +1,5 @@ /* - * @test /nodynamiccopyright + * @test /nodynamiccopyright/ * @bug 8066843 * @summary Annotation processors should be able to print multiple errors at the same location. * @library /tools/javac/lib diff --git a/test/langtools/tools/javac/processing/errors/TestParseErrors/ParseErrors.java b/test/langtools/tools/javac/processing/errors/TestParseErrors/ParseErrors.java index 9911916f5f9..e363e8fab4b 100644 --- a/test/langtools/tools/javac/processing/errors/TestParseErrors/ParseErrors.java +++ b/test/langtools/tools/javac/processing/errors/TestParseErrors/ParseErrors.java @@ -1,26 +1,4 @@ -/* - * Copyright (c) 2010, 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. - */ - +/* /nodynamiccopyright/ */ import java.util.List; import java.util.Vector; diff --git a/test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out b/test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out index f84325eb93d..5131e247efb 100644 --- a/test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out +++ b/test/langtools/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out @@ -1,3 +1,3 @@ -ParseErrors.java:37:37: compiler.err.expected: token.identifier -ParseErrors.java:38:1: compiler.err.illegal.start.of.type +ParseErrors.java:15:37: compiler.err.expected: token.identifier +ParseErrors.java:16:1: compiler.err.illegal.start.of.type 2 errors diff --git a/test/langtools/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java b/test/langtools/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java index a58bccf6296..d049f5201d0 100644 --- a/test/langtools/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java +++ b/test/langtools/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2011, 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. - */ +/* /nodynamiccopyright/ */ import java.util.*; diff --git a/test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref b/test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref index d71a2cce8ba..0f62950e31b 100644 --- a/test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref +++ b/test/langtools/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref @@ -24,26 +24,26 @@ Round 2: input files: {} annotations: [] last round: true -InvalidSource.java:55:42: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:58:44: compiler.err.doesnt.exist: A -InvalidSource.java:61:54: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.package, java.util, null) -InvalidSource.java:64:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:67:44: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:70:46: compiler.err.doesnt.exist: A -InvalidSource.java:73:55: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:76:59: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:79:46: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:79:49: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:82:44: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:85:46: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:88:50: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:91:45: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:91:48: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:94:49: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:97:51: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:97:57: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:100:49: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:103:51: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:103:57: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) -InvalidSource.java:106:58: compiler.err.cant.resolve.location: kindname.class, X, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:34:42: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:37:44: compiler.err.doesnt.exist: A +InvalidSource.java:40:54: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.package, java.util, null) +InvalidSource.java:43:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:46:44: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:49:46: compiler.err.doesnt.exist: A +InvalidSource.java:52:55: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:55:59: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:58:46: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:58:49: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:61:44: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:64:46: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:67:50: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:70:45: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:70:48: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:73:49: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:76:51: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:76:57: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:79:49: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:82:51: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:82:57: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null) +InvalidSource.java:85:58: compiler.err.cant.resolve.location: kindname.class, X, , , (compiler.misc.location: kindname.class, InvalidSource, null) 22 errors \ No newline at end of file diff --git a/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.java b/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.java index ed39a82d6a9..ff491e7eff5 100644 --- a/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.java +++ b/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2016, 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 + * @test /nodynamiccopyright/ * @bug 8047347 * @summary Verify that an explicit (incorrect) super constructor invocation in enums is not cleared * by JavacProcessingEnvironment diff --git a/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.out b/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.out index 9b514e7223c..5a98902cf96 100644 --- a/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.out +++ b/test/langtools/tools/javac/processing/model/trees/BrokenEnumConstructor.out @@ -1,2 +1,2 @@ -BrokenEnumConstructor.java:39:30: compiler.err.call.to.super.not.allowed.in.enum.ctor: BrokenEnumConstructor +BrokenEnumConstructor.java:16:30: compiler.err.call.to.super.not.allowed.in.enum.ctor: BrokenEnumConstructor 1 error diff --git a/test/langtools/tools/javac/processing/model/util/directSupersOfErr/C1.java b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/C1.java index cb097f0b3dd..9b3b9910613 100644 --- a/test/langtools/tools/javac/processing/model/util/directSupersOfErr/C1.java +++ b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/C1.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2006, 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. - */ +/* /nodynamiccopyright/ */ class C1 extends Bogus { } diff --git a/test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref index 8fe9c7ed8be..ee4c00d29ec 100644 --- a/test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref +++ b/test/langtools/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref @@ -1,2 +1,2 @@ -C1.java:24:18: compiler.err.cant.resolve: kindname.class, Bogus, , +C1.java:3:18: compiler.err.cant.resolve: kindname.class, Bogus, , 1 error diff --git a/test/langtools/tools/javac/recovery/LocalVarHiding.java b/test/langtools/tools/javac/recovery/LocalVarHiding.java index 3833f91f471..7ab77bc77b8 100644 --- a/test/langtools/tools/javac/recovery/LocalVarHiding.java +++ b/test/langtools/tools/javac/recovery/LocalVarHiding.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8227010 * @summary Verify error recovery after variable redeclaration * @compile/fail/ref=LocalVarHiding.out -XDrawDiagnostics LocalVarHiding.java diff --git a/test/langtools/tools/javac/recovery/LocalVarHiding.out b/test/langtools/tools/javac/recovery/LocalVarHiding.out index 80853461e0b..b35ecec3692 100644 --- a/test/langtools/tools/javac/recovery/LocalVarHiding.out +++ b/test/langtools/tools/javac/recovery/LocalVarHiding.out @@ -1,8 +1,8 @@ -LocalVarHiding.java:35:21: compiler.err.already.defined: kindname.variable, l1, kindname.method, test(LocalVarHiding.Decl) -LocalVarHiding.java:43:21: compiler.err.already.defined: kindname.variable, l2, kindname.method, test(LocalVarHiding.Decl) -LocalVarHiding.java:52:25: compiler.err.already.defined: kindname.variable, l3, kindname.method, test(LocalVarHiding.Decl) -LocalVarHiding.java:63:30: compiler.err.already.defined: kindname.variable, l4, kindname.method, test(LocalVarHiding.Decl) -LocalVarHiding.java:71:26: compiler.err.already.defined: kindname.variable, l5, kindname.method, test(LocalVarHiding.Decl) -LocalVarHiding.java:79:16: compiler.err.already.defined: kindname.variable, l6, kindname.method, test(LocalVarHiding.Decl) -LocalVarHiding.java:82:29: compiler.err.already.defined: kindname.variable, l6, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:12:21: compiler.err.already.defined: kindname.variable, l1, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:20:21: compiler.err.already.defined: kindname.variable, l2, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:29:25: compiler.err.already.defined: kindname.variable, l3, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:40:30: compiler.err.already.defined: kindname.variable, l4, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:48:26: compiler.err.already.defined: kindname.variable, l5, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:56:16: compiler.err.already.defined: kindname.variable, l6, kindname.method, test(LocalVarHiding.Decl) +LocalVarHiding.java:59:29: compiler.err.already.defined: kindname.variable, l6, kindname.method, test(LocalVarHiding.Decl) 7 errors diff --git a/test/langtools/tools/javac/sourcePath2/SourcePath2.out b/test/langtools/tools/javac/sourcePath2/SourcePath2.out index bdebdf1b43c..0c11a112fc4 100644 --- a/test/langtools/tools/javac/sourcePath2/SourcePath2.out +++ b/test/langtools/tools/javac/sourcePath2/SourcePath2.out @@ -1,2 +1,2 @@ -SourcePath2A.java:30:5: compiler.err.cant.resolve.location: kindname.class, this_should_not, , , (compiler.misc.location: kindname.class, p.Trash, null) +SourcePath2A.java:9:5: compiler.err.cant.resolve.location: kindname.class, this_should_not, , , (compiler.misc.location: kindname.class, p.Trash, null) 1 error diff --git a/test/langtools/tools/javac/sourcePath2/p/SourcePath2A.java b/test/langtools/tools/javac/sourcePath2/p/SourcePath2A.java index dbab40d9c6e..8702c167f00 100644 --- a/test/langtools/tools/javac/sourcePath2/p/SourcePath2A.java +++ b/test/langtools/tools/javac/sourcePath2/p/SourcePath2A.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2002, 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. - */ +/* /nodynamiccopyright/ */ package p; diff --git a/test/langtools/tools/javac/staticImport/6695838/T6695838.out b/test/langtools/tools/javac/staticImport/6695838/T6695838.out index b688c1a6c25..7336d11007c 100644 --- a/test/langtools/tools/javac/staticImport/6695838/T6695838.out +++ b/test/langtools/tools/javac/staticImport/6695838/T6695838.out @@ -1,2 +1,2 @@ -Foo.java:26:1: compiler.err.cyclic.inheritance: a.Foo +Foo.java:5:1: compiler.err.cyclic.inheritance: a.Foo 1 error \ No newline at end of file diff --git a/test/langtools/tools/javac/staticImport/6695838/a/Foo.java b/test/langtools/tools/javac/staticImport/6695838/a/Foo.java index cf00add4843..64a41945cff 100644 --- a/test/langtools/tools/javac/staticImport/6695838/a/Foo.java +++ b/test/langtools/tools/javac/staticImport/6695838/a/Foo.java @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2008, 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. - */ +/* /nodynamiccopyright/ */ package a; diff --git a/test/langtools/tools/javac/switchexpr/EmptySwitch.java b/test/langtools/tools/javac/switchexpr/EmptySwitch.java index f2682581cbb..208b3d574f2 100644 --- a/test/langtools/tools/javac/switchexpr/EmptySwitch.java +++ b/test/langtools/tools/javac/switchexpr/EmptySwitch.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2018, 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 + * @test /nodynamiccopyright/ * @bug 8206986 8226510 * @summary Verify than a switch that does not yield a value is rejected. * @compile/fail/ref=EmptySwitch.out -XDrawDiagnostics -XDshould-stop.at=FLOW EmptySwitch.java diff --git a/test/langtools/tools/javac/switchexpr/EmptySwitch.out b/test/langtools/tools/javac/switchexpr/EmptySwitch.out index f00069487d3..bdf61b0b304 100644 --- a/test/langtools/tools/javac/switchexpr/EmptySwitch.out +++ b/test/langtools/tools/javac/switchexpr/EmptySwitch.out @@ -1,6 +1,6 @@ -EmptySwitch.java:33:10: compiler.err.switch.expression.empty -EmptySwitch.java:35:10: compiler.err.switch.expression.no.result.expressions -EmptySwitch.java:38:10: compiler.err.switch.expression.no.result.expressions -EmptySwitch.java:44:9: compiler.err.switch.expression.completes.normally -EmptySwitch.java:47:26: compiler.err.rule.completes.normally +EmptySwitch.java:10:10: compiler.err.switch.expression.empty +EmptySwitch.java:12:10: compiler.err.switch.expression.no.result.expressions +EmptySwitch.java:15:10: compiler.err.switch.expression.no.result.expressions +EmptySwitch.java:21:9: compiler.err.switch.expression.completes.normally +EmptySwitch.java:24:26: compiler.err.rule.completes.normally 5 errors diff --git a/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.java b/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.java index a1e0ec4b42b..bb2944a5330 100644 --- a/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.java +++ b/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8223305 8226522 * @summary Verify correct warnings w.r.t. yield * @compile/ref=WarnWrongYieldTest.out -Xlint:-options -source 13 -XDrawDiagnostics -XDshould-stop.at=ATTR WarnWrongYieldTest.java diff --git a/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.out b/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.out index 2bb0626f547..55d8651ab28 100644 --- a/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.out +++ b/test/langtools/tools/javac/switchexpr/WarnWrongYieldTest.out @@ -1,29 +1,29 @@ -WarnWrongYieldTest.java:39:11: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:45:5: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:72:15: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:75:15: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:81:21: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:93:9: compiler.warn.invalid.yield -WarnWrongYieldTest.java:98:9: compiler.warn.invalid.yield -WarnWrongYieldTest.java:103:9: compiler.warn.invalid.yield -WarnWrongYieldTest.java:108:9: compiler.warn.invalid.yield -WarnWrongYieldTest.java:113:9: compiler.warn.invalid.yield -WarnWrongYieldTest.java:118:9: compiler.warn.invalid.yield -WarnWrongYieldTest.java:123:22: compiler.warn.invalid.yield -WarnWrongYieldTest.java:152:24: compiler.warn.invalid.yield -WarnWrongYieldTest.java:164:18: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:168:23: compiler.warn.restricted.type.not.allowed: yield, 14 -WarnWrongYieldTest.java:34:28: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:45:5: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:168:23: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:72:9: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:75:9: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:75:24: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:78:25: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:81:15: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:81:30: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:84:27: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:84:43: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:153:24: compiler.warn.illegal.ref.to.restricted.type: yield -WarnWrongYieldTest.java:164:18: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:16:11: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:22:5: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:49:15: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:52:15: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:58:21: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:70:9: compiler.warn.invalid.yield +WarnWrongYieldTest.java:75:9: compiler.warn.invalid.yield +WarnWrongYieldTest.java:80:9: compiler.warn.invalid.yield +WarnWrongYieldTest.java:85:9: compiler.warn.invalid.yield +WarnWrongYieldTest.java:90:9: compiler.warn.invalid.yield +WarnWrongYieldTest.java:95:9: compiler.warn.invalid.yield +WarnWrongYieldTest.java:100:22: compiler.warn.invalid.yield +WarnWrongYieldTest.java:129:24: compiler.warn.invalid.yield +WarnWrongYieldTest.java:141:18: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:145:23: compiler.warn.restricted.type.not.allowed: yield, 14 +WarnWrongYieldTest.java:11:28: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:22:5: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:145:23: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:49:9: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:52:9: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:52:24: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:55:25: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:58:15: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:58:30: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:61:27: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:61:43: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:130:24: compiler.warn.illegal.ref.to.restricted.type: yield +WarnWrongYieldTest.java:141:18: compiler.warn.illegal.ref.to.restricted.type: yield 28 warnings \ No newline at end of file diff --git a/test/langtools/tools/javac/switchexpr/WrongBreakTest.java b/test/langtools/tools/javac/switchexpr/WrongBreakTest.java index 113978a8d0a..88cfa11be0e 100644 --- a/test/langtools/tools/javac/switchexpr/WrongBreakTest.java +++ b/test/langtools/tools/javac/switchexpr/WrongBreakTest.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8223305 * @summary Ensure javac is not crashing for wrong breaks. * @compile/fail/ref=WrongBreakTest.out -XDrawDiagnostics -XDshould-stop.at=FLOW WrongBreakTest.java diff --git a/test/langtools/tools/javac/switchexpr/WrongBreakTest.out b/test/langtools/tools/javac/switchexpr/WrongBreakTest.out index e2bbf06159b..a80ff54a74a 100644 --- a/test/langtools/tools/javac/switchexpr/WrongBreakTest.out +++ b/test/langtools/tools/javac/switchexpr/WrongBreakTest.out @@ -1,7 +1,7 @@ -WrongBreakTest.java:36:41: compiler.err.illegal.start.of.expr -WrongBreakTest.java:35:39: compiler.err.break.outside.switch.expression -WrongBreakTest.java:35:17: compiler.err.switch.expression.no.result.expressions -WrongBreakTest.java:36:9: compiler.err.ref.ambiguous: test, kindname.method, test(int), WrongBreakTest, kindname.method, test(java.lang.Object), WrongBreakTest -WrongBreakTest.java:38:13: compiler.err.no.switch.expression -WrongBreakTest.java:41:13: compiler.err.no.switch.expression +WrongBreakTest.java:13:41: compiler.err.illegal.start.of.expr +WrongBreakTest.java:12:39: compiler.err.break.outside.switch.expression +WrongBreakTest.java:12:17: compiler.err.switch.expression.no.result.expressions +WrongBreakTest.java:13:9: compiler.err.ref.ambiguous: test, kindname.method, test(int), WrongBreakTest, kindname.method, test(java.lang.Object), WrongBreakTest +WrongBreakTest.java:15:13: compiler.err.no.switch.expression +WrongBreakTest.java:18:13: compiler.err.no.switch.expression 6 errors diff --git a/test/langtools/tools/javac/switchexpr/WrongYieldTest.java b/test/langtools/tools/javac/switchexpr/WrongYieldTest.java index 871864384d4..1adecfc9032 100644 --- a/test/langtools/tools/javac/switchexpr/WrongYieldTest.java +++ b/test/langtools/tools/javac/switchexpr/WrongYieldTest.java @@ -1,28 +1,5 @@ /* - * 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 + * @test /nodynamiccopyright/ * @bug 8223305 8226522 * @summary Ensure proper errors are returned for yields. * @compile/fail/ref=WrongYieldTest.out -XDrawDiagnostics -XDshould-stop.at=ATTR WrongYieldTest.java diff --git a/test/langtools/tools/javac/switchexpr/WrongYieldTest.out b/test/langtools/tools/javac/switchexpr/WrongYieldTest.out index ade6ceb1882..a3f17f7fecb 100644 --- a/test/langtools/tools/javac/switchexpr/WrongYieldTest.out +++ b/test/langtools/tools/javac/switchexpr/WrongYieldTest.out @@ -1,29 +1,29 @@ -WrongYieldTest.java:39:11: compiler.err.restricted.type.not.allowed: yield, 14 -WrongYieldTest.java:45:5: compiler.err.restricted.type.not.allowed.here: yield -WrongYieldTest.java:123:15: compiler.err.restricted.type.not.allowed.here: yield -WrongYieldTest.java:136:9: compiler.err.invalid.yield -WrongYieldTest.java:146:9: compiler.err.invalid.yield -WrongYieldTest.java:151:9: compiler.err.invalid.yield -WrongYieldTest.java:161:9: compiler.err.invalid.yield -WrongYieldTest.java:166:22: compiler.err.invalid.yield -WrongYieldTest.java:215:24: compiler.err.invalid.yield -WrongYieldTest.java:227:18: compiler.err.restricted.type.not.allowed.here: yield -WrongYieldTest.java:34:24: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:95:9: compiler.err.no.switch.expression -WrongYieldTest.java:95:15: compiler.err.cant.resolve.location: kindname.variable, y1, , , (compiler.misc.location: kindname.class, t.WrongYieldTest, null) -WrongYieldTest.java:99:9: compiler.err.no.switch.expression -WrongYieldTest.java:102:9: compiler.err.no.switch.expression -WrongYieldTest.java:102:15: compiler.err.cant.resolve.location: kindname.variable, y2, , , (compiler.misc.location: kindname.class, t.WrongYieldTest, null) -WrongYieldTest.java:102:24: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:116:32: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:120:25: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:123:30: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:126:23: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:126:39: compiler.err.illegal.ref.to.restricted.type: yield -WrongYieldTest.java:141:9: compiler.err.no.switch.expression.qualify -WrongYieldTest.java:156:9: compiler.err.no.switch.expression -WrongYieldTest.java:156:17: compiler.err.cant.deref: int -WrongYieldTest.java:201:9: compiler.err.no.switch.expression -WrongYieldTest.java:202:9: compiler.err.no.switch.expression -WrongYieldTest.java:216:24: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:16:11: compiler.err.restricted.type.not.allowed: yield, 14 +WrongYieldTest.java:22:5: compiler.err.restricted.type.not.allowed.here: yield +WrongYieldTest.java:100:15: compiler.err.restricted.type.not.allowed.here: yield +WrongYieldTest.java:113:9: compiler.err.invalid.yield +WrongYieldTest.java:123:9: compiler.err.invalid.yield +WrongYieldTest.java:128:9: compiler.err.invalid.yield +WrongYieldTest.java:138:9: compiler.err.invalid.yield +WrongYieldTest.java:143:22: compiler.err.invalid.yield +WrongYieldTest.java:192:24: compiler.err.invalid.yield +WrongYieldTest.java:204:18: compiler.err.restricted.type.not.allowed.here: yield +WrongYieldTest.java:11:24: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:72:9: compiler.err.no.switch.expression +WrongYieldTest.java:72:15: compiler.err.cant.resolve.location: kindname.variable, y1, , , (compiler.misc.location: kindname.class, t.WrongYieldTest, null) +WrongYieldTest.java:76:9: compiler.err.no.switch.expression +WrongYieldTest.java:79:9: compiler.err.no.switch.expression +WrongYieldTest.java:79:15: compiler.err.cant.resolve.location: kindname.variable, y2, , , (compiler.misc.location: kindname.class, t.WrongYieldTest, null) +WrongYieldTest.java:79:24: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:93:32: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:97:25: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:100:30: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:103:23: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:103:39: compiler.err.illegal.ref.to.restricted.type: yield +WrongYieldTest.java:118:9: compiler.err.no.switch.expression.qualify +WrongYieldTest.java:133:9: compiler.err.no.switch.expression +WrongYieldTest.java:133:17: compiler.err.cant.deref: int +WrongYieldTest.java:178:9: compiler.err.no.switch.expression +WrongYieldTest.java:179:9: compiler.err.no.switch.expression +WrongYieldTest.java:193:24: compiler.err.illegal.ref.to.restricted.type: yield 28 errors diff --git a/test/langtools/tools/javac/switchextra/SwitchArrowBrokenConstant.java b/test/langtools/tools/javac/switchextra/SwitchArrowBrokenConstant.java index f52efe3efeb..28d026d8eb9 100644 --- a/test/langtools/tools/javac/switchextra/SwitchArrowBrokenConstant.java +++ b/test/langtools/tools/javac/switchextra/SwitchArrowBrokenConstant.java @@ -1,5 +1,5 @@ /* - * @test /nodymaticcopyright/ + * @test /nodynamiccopyright/ * @bug 8206986 * @summary Verify reasonable errors are produced when neither ':' nor '->' * is found are the expression of a case diff --git a/test/langtools/tools/javac/switchextra/SwitchStatementArrow.java b/test/langtools/tools/javac/switchextra/SwitchStatementArrow.java index 317e537a78c..d6fe0df28ce 100644 --- a/test/langtools/tools/javac/switchextra/SwitchStatementArrow.java +++ b/test/langtools/tools/javac/switchextra/SwitchStatementArrow.java @@ -1,5 +1,5 @@ /* - * @test /nodymaticcopyright/ + * @test /nodynamiccopyright/ * @bug 8206986 * @summary Verify rule cases work properly. * @compile/fail/ref=SwitchStatementArrow-old.out -source 9 -Xlint:-options -XDrawDiagnostics SwitchStatementArrow.java diff --git a/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.java b/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.java index 723bac09f5e..d2c1897e0ee 100644 --- a/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.java +++ b/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 5088429 * * @summary varargs overloading problem diff --git a/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.out b/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.out index 4661eb00129..361ab248d1b 100644 --- a/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.out +++ b/test/langtools/tools/javac/varargs/5088429/T5088429Neg01.out @@ -1,2 +1,2 @@ -T5088429Neg01.java:42:9: compiler.err.ref.ambiguous: T5088429Neg01, kindname.constructor, T5088429Neg01(T5088429Neg01.A...), T5088429Neg01, kindname.constructor, T5088429Neg01(T5088429Neg01.A,T5088429Neg01.A...), T5088429Neg01 +T5088429Neg01.java:19:9: compiler.err.ref.ambiguous: T5088429Neg01, kindname.constructor, T5088429Neg01(T5088429Neg01.A...), T5088429Neg01, kindname.constructor, T5088429Neg01(T5088429Neg01.A,T5088429Neg01.A...), T5088429Neg01 1 error diff --git a/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.java b/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.java index ede3aa72353..887c19ba858 100644 --- a/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.java +++ b/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2010, 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 + * @test /nodynamiccopyright/ * @bug 5088429 * * @summary varargs overloading problem diff --git a/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.out b/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.out index 279c0f29b79..a26dd21cfaa 100644 --- a/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.out +++ b/test/langtools/tools/javac/varargs/5088429/T5088429Neg02.out @@ -1,2 +1,2 @@ -T5088429Neg02.java:42:9: compiler.err.ref.ambiguous: m, kindname.method, m(T5088429Neg02.A...), T5088429Neg02, kindname.method, m(T5088429Neg02.A,T5088429Neg02.A...), T5088429Neg02 +T5088429Neg02.java:19:9: compiler.err.ref.ambiguous: m, kindname.method, m(T5088429Neg02.A...), T5088429Neg02, kindname.method, m(T5088429Neg02.A,T5088429Neg02.A...), T5088429Neg02 1 error diff --git a/test/langtools/tools/javac/varargs/VarargsOverride.java b/test/langtools/tools/javac/varargs/VarargsOverride.java index 0fe2e17c2f3..d989a64113d 100644 --- a/test/langtools/tools/javac/varargs/VarargsOverride.java +++ b/test/langtools/tools/javac/varargs/VarargsOverride.java @@ -1,5 +1,5 @@ /* - * @test /nodynamiccopyright + * @test /nodynamiccopyright/ * @bug 4984022 * @summary overriding with method of different arity is prohibited * @author gafter diff --git a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java index 87b9f6e19bf..66a8f17d872 100644 --- a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java +++ b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.java @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 7153951 * @compile ClassUsingAnotherAuxiliary.java NotAClassName.java * @compile -Xlint:auxiliaryclass ClassUsingAnotherAuxiliary.java NotAClassName.java diff --git a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out index 5df6bdb1b0d..f162401a837 100644 --- a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out +++ b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAnotherAuxiliary.out @@ -1,4 +1,4 @@ -ClassUsingAnotherAuxiliary.java:33:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AnAuxiliaryClass, NotAClassName.java +ClassUsingAnotherAuxiliary.java:10:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AnAuxiliaryClass, NotAClassName.java - compiler.err.warnings.and.werror 1 error 1 warning diff --git a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java index ce40a81c972..de4c06fa539 100644 --- a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java +++ b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary.java @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2012, 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 + * @test /nodynamiccopyright/ * @bug 7153951 * @clean ClassUsingAuxiliary ClassWithAuxiliary AuxiliaryClass ClassWithAuxiliary$NotAnAuxiliaryClass ClassWithAuxiliary$NotAnAuxiliaryClassEither * @run compile ClassUsingAuxiliary.java ClassWithAuxiliary.java diff --git a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out index d319c0b08e3..e4c7e6277ad 100644 --- a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out +++ b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary1.out @@ -1,4 +1,4 @@ -ClassUsingAuxiliary.java:34:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AuxiliaryClass, ClassWithAuxiliary.java +ClassUsingAuxiliary.java:11:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AuxiliaryClass, ClassWithAuxiliary.java - compiler.err.warnings.and.werror 1 error 1 warning diff --git a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out index d319c0b08e3..e4c7e6277ad 100644 --- a/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out +++ b/test/langtools/tools/javac/warnings/AuxiliaryClass/ClassUsingAuxiliary2.out @@ -1,4 +1,4 @@ -ClassUsingAuxiliary.java:34:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AuxiliaryClass, ClassWithAuxiliary.java +ClassUsingAuxiliary.java:11:5: compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file: AuxiliaryClass, ClassWithAuxiliary.java - compiler.err.warnings.and.werror 1 error 1 warning diff --git a/test/langtools/tools/javac/warnings/MaxDiagsRecompile.all.out b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.all.out index d4d65e3ee6f..ba7cb4d158e 100644 --- a/test/langtools/tools/javac/warnings/MaxDiagsRecompile.all.out +++ b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.all.out @@ -1,5 +1,5 @@ -MaxDiagsRecompile.java:32:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol1, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) -MaxDiagsRecompile.java:33:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol2, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) -MaxDiagsRecompile.java:34:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol3, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) -MaxDiagsRecompile.java:35:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol4, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) +MaxDiagsRecompile.java:9:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol1, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) +MaxDiagsRecompile.java:10:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol2, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) +MaxDiagsRecompile.java:11:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol3, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) +MaxDiagsRecompile.java:12:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol4, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) 4 errors \ No newline at end of file diff --git a/test/langtools/tools/javac/warnings/MaxDiagsRecompile.java b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.java index 1de31ec19e9..c3627de7f0b 100644 --- a/test/langtools/tools/javac/warnings/MaxDiagsRecompile.java +++ b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.java @@ -1,28 +1,5 @@ /* - * Copyright (c) 2019, Google LLC. 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 + * @test /nodynamiccopyright/ * @summary suggest recompiling with -Xmaxerrs * @compile/fail/ref=MaxDiagsRecompile.max1.out -XDrawDiagnostics -Xmaxerrs 1 MaxDiagsRecompile.java * @compile/fail/ref=MaxDiagsRecompile.all.out -XDrawDiagnostics -Xmaxerrs 4 MaxDiagsRecompile.java diff --git a/test/langtools/tools/javac/warnings/MaxDiagsRecompile.max1.out b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.max1.out index 1056926d8a7..2850e290dd7 100644 --- a/test/langtools/tools/javac/warnings/MaxDiagsRecompile.max1.out +++ b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.max1.out @@ -1,3 +1,3 @@ -MaxDiagsRecompile.java:32:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol1, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) +MaxDiagsRecompile.java:9:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol1, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null) 1 error only showing the first 1 errors, of 4 total; use -Xmaxerrs if you would like to see more diff --git a/test/langtools/tools/javac/warnings/MaxWarnsRecompile.all.out b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.all.out index ce07a5b01d1..b1e2d893915 100644 --- a/test/langtools/tools/javac/warnings/MaxWarnsRecompile.all.out +++ b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.all.out @@ -1,5 +1,5 @@ -MaxWarnsRecompile.java:34:3: compiler.warn.raw.class.use: java.util.List, java.util.List -MaxWarnsRecompile.java:35:3: compiler.warn.raw.class.use: java.util.List, java.util.List -MaxWarnsRecompile.java:36:3: compiler.warn.raw.class.use: java.util.List, java.util.List -MaxWarnsRecompile.java:37:3: compiler.warn.raw.class.use: java.util.List, java.util.List +MaxWarnsRecompile.java:11:3: compiler.warn.raw.class.use: java.util.List, java.util.List +MaxWarnsRecompile.java:12:3: compiler.warn.raw.class.use: java.util.List, java.util.List +MaxWarnsRecompile.java:13:3: compiler.warn.raw.class.use: java.util.List, java.util.List +MaxWarnsRecompile.java:14:3: compiler.warn.raw.class.use: java.util.List, java.util.List 4 warnings \ No newline at end of file diff --git a/test/langtools/tools/javac/warnings/MaxWarnsRecompile.java b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.java index 23e23f99958..6adf848a2f0 100644 --- a/test/langtools/tools/javac/warnings/MaxWarnsRecompile.java +++ b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.java @@ -1,30 +1,7 @@ -/* - * Copyright (c) 2019, Google LLC. 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. - */ - import java.util.List; /* - * @test + * @test /nodynamiccopyright/ * @summary suggest recompiling with -Xmaxwarns * @compile/ref=MaxWarnsRecompile.max1.out -XDrawDiagnostics -Xlint:all -Xmaxwarns 1 MaxWarnsRecompile.java * @compile/ref=MaxWarnsRecompile.all.out -XDrawDiagnostics -Xlint:all -Xmaxwarns 4 MaxWarnsRecompile.java diff --git a/test/langtools/tools/javac/warnings/MaxWarnsRecompile.max1.out b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.max1.out index 02bb6babc79..aa0600d6054 100644 --- a/test/langtools/tools/javac/warnings/MaxWarnsRecompile.max1.out +++ b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.max1.out @@ -1,3 +1,3 @@ -MaxWarnsRecompile.java:34:3: compiler.warn.raw.class.use: java.util.List, java.util.List +MaxWarnsRecompile.java:11:3: compiler.warn.raw.class.use: java.util.List, java.util.List 1 warning only showing the first 1 warnings, of 4 total; use -Xmaxwarns if you would like to see more From f5ee356540d7aa4a7663c0d5d74f5fdb0726b426 Mon Sep 17 00:00:00 2001 From: Jamil Nimeh Date: Thu, 31 Dec 2020 18:03:54 +0000 Subject: [PATCH 9/9] 8179503: Java should support GET OCSP calls Reviewed-by: xuelei --- .../sun/security/provider/certpath/OCSP.java | 91 +++--- .../OCSP/GetAndPostTests.java | 264 ++++++++++++++++++ .../testlibrary/SimpleOCSPServer.java | 34 ++- 3 files changed, 334 insertions(+), 55 deletions(-) create mode 100644 test/jdk/java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java diff --git a/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java b/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java index d588c1a3fe9..51f49b9d377 100644 --- a/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java +++ b/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java @@ -24,12 +24,12 @@ */ package sun.security.provider.certpath; -import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; import java.net.URI; import java.net.URL; import java.net.HttpURLConnection; +import java.net.URLEncoder; import java.security.cert.CertificateException; import java.security.cert.CertPathValidatorException; import java.security.cert.CertPathValidatorException.BasicReason; @@ -37,7 +37,7 @@ import java.security.cert.Extension; import java.security.cert.TrustAnchor; import java.security.cert.X509Certificate; -import java.util.Arrays; +import java.util.Base64; import java.util.Collections; import java.util.Date; import java.util.List; @@ -46,6 +46,7 @@ import sun.security.action.GetIntegerAction; import sun.security.util.Debug; import sun.security.util.Event; +import sun.security.util.IOUtils; import sun.security.validator.Validator; import sun.security.x509.AccessDescription; import sun.security.x509.AuthorityInfoAccessExtension; @@ -224,71 +225,61 @@ public static byte[] getOCSPBytes(List certIds, URI responderURI, OCSPRequest request = new OCSPRequest(certIds, extensions); byte[] bytes = request.encodeBytes(); - InputStream in = null; - OutputStream out = null; - byte[] response = null; + if (debug != null) { + debug.println("connecting to OCSP service at: " + responderURI); + } + Event.report(Event.ReporterCategory.CRLCHECK, "event.ocsp.check", + responderURI.toString()); + URL url; + HttpURLConnection con = null; try { - URL url = responderURI.toURL(); - if (debug != null) { - debug.println("connecting to OCSP service at: " + url); + String encodedGetReq = responderURI.toString() + "/" + + URLEncoder.encode(Base64.getEncoder().encodeToString(bytes), + "UTF-8"); + + if (encodedGetReq.length() <= 255) { + url = new URL(encodedGetReq); + con = (HttpURLConnection)url.openConnection(); + con.setDoOutput(true); + con.setDoInput(true); + con.setRequestMethod("GET"); + } else { + url = responderURI.toURL(); + con = (HttpURLConnection)url.openConnection(); + con.setConnectTimeout(CONNECT_TIMEOUT); + con.setReadTimeout(CONNECT_TIMEOUT); + con.setDoOutput(true); + con.setDoInput(true); + con.setRequestMethod("POST"); + con.setRequestProperty + ("Content-type", "application/ocsp-request"); + con.setRequestProperty + ("Content-length", String.valueOf(bytes.length)); + OutputStream out = con.getOutputStream(); + out.write(bytes); + out.flush(); } - Event.report(Event.ReporterCategory.CRLCHECK, "event.ocsp.check", url.toString()); - HttpURLConnection con = (HttpURLConnection)url.openConnection(); - con.setConnectTimeout(CONNECT_TIMEOUT); - con.setReadTimeout(CONNECT_TIMEOUT); - con.setDoOutput(true); - con.setDoInput(true); - con.setRequestMethod("POST"); - con.setRequestProperty - ("Content-type", "application/ocsp-request"); - con.setRequestProperty - ("Content-length", String.valueOf(bytes.length)); - out = con.getOutputStream(); - out.write(bytes); - out.flush(); // Check the response if (debug != null && con.getResponseCode() != HttpURLConnection.HTTP_OK) { debug.println("Received HTTP error: " + con.getResponseCode() + " - " + con.getResponseMessage()); } - in = con.getInputStream(); + int contentLength = con.getContentLength(); if (contentLength == -1) { contentLength = Integer.MAX_VALUE; } - response = new byte[contentLength > 2048 ? 2048 : contentLength]; - int total = 0; - while (total < contentLength) { - int count = in.read(response, total, response.length - total); - if (count < 0) - break; - - total += count; - if (total >= response.length && total < contentLength) { - response = Arrays.copyOf(response, total * 2); - } - } - response = Arrays.copyOf(response, total); + + return IOUtils.readExactlyNBytes(con.getInputStream(), + contentLength); } finally { - if (in != null) { - try { - in.close(); - } catch (IOException ioe) { - throw ioe; - } - } - if (out != null) { - try { - out.close(); - } catch (IOException ioe) { - throw ioe; - } + if (con != null) { + con.disconnect(); } } - return response; } /** diff --git a/test/jdk/java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java b/test/jdk/java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java new file mode 100644 index 00000000000..d9cf7a5294e --- /dev/null +++ b/test/jdk/java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java @@ -0,0 +1,264 @@ +/* + * Copyright (c) 2020, 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 8179503 + * @summary Java should support GET OCSP calls + * @library /javax/net/ssl/templates /java/security/testlibrary + * @build SimpleOCSPServer + * @modules java.base/sun.security.util + * java.base/sun.security.provider.certpath + * java.base/sun.security.x509 + * @run main/othervm GetAndPostTests + */ + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URI; +import java.security.GeneralSecurityException; +import java.security.KeyFactory; +import java.security.KeyStore; +import java.security.PrivateKey; +import java.security.SecureRandom; +import java.security.cert.CertPath; +import java.security.cert.CertPathValidator; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.Extension; +import java.security.cert.PKIXCertPathChecker; +import java.security.cert.PKIXParameters; +import java.security.cert.PKIXRevocationChecker; +import java.security.cert.TrustAnchor; +import java.security.cert.X509Certificate; +import java.security.spec.PKCS8EncodedKeySpec; +import java.util.Base64; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import sun.security.testlibrary.SimpleOCSPServer; +import sun.security.testlibrary.SimpleOCSPServer; +import sun.security.testlibrary.SimpleOCSPServer; +import sun.security.util.DerOutputStream; +import sun.security.util.DerValue; +import sun.security.util.ObjectIdentifier; +import sun.security.testlibrary.SimpleOCSPServer; + +public class GetAndPostTests { + private static final String PASS = "passphrase"; + private static CertificateFactory certFac; + + public static void main(String args[]) throws Exception { + SimpleOCSPServer ocspResponder = null; + + try { + certFac = CertificateFactory.getInstance("X.509"); + + // Read in the certificates and keys needed for this test and + // create the keystore for the SimpleOCSPServer. For the purposes + // of this test, the CA certificate will also be the OCSP responder + // signing certificate. + SSLSocketTemplate.Cert certAuth = + SSLSocketTemplate.Cert.CA_ECDSA_SECP256R1; + X509Certificate caCert = pem2Cert(certAuth.certStr); + PrivateKey caKey = pem2Key(certAuth.privKeyStr, certAuth.keyAlgo); + X509Certificate endEntCert = + pem2Cert(SSLSocketTemplate.Cert.EE_ECDSA_SECP256R1.certStr); + + KeyStore.Builder keyStoreBuilder = + KeyStore.Builder.newInstance("PKCS12", null, + new KeyStore.PasswordProtection(PASS.toCharArray())); + KeyStore ocspStore = keyStoreBuilder.getKeyStore(); + Certificate[] ocspChain = {caCert}; + ocspStore.setKeyEntry("ocspsigner", caKey, PASS.toCharArray(), + ocspChain); + + // Create the certificate path we'll use for cert path validation. + CertPath path = certFac.generateCertPath(List.of(endEntCert)); + + // Next, create and start the OCSP responder. Obtain the socket + // address so we can set that in the PKIXRevocationChecker since + // these certificates do not have AIA extensions on them. + ocspResponder = new SimpleOCSPServer(ocspStore, PASS, + "ocspsigner", null); + ocspResponder.setSignatureAlgorithm("SHA256WithECDSA"); + ocspResponder.enableLog(true); + ocspResponder.setNextUpdateInterval(3600); + ocspResponder.updateStatusDb(Map.of( + endEntCert.getSerialNumber(), + new SimpleOCSPServer.CertStatusInfo( + SimpleOCSPServer.CertStatus.CERT_STATUS_GOOD))); + ocspResponder.start(); + // Wait 5 seconds for server ready + for (int i = 0; (i < 100 && !ocspResponder.isServerReady()); i++) { + Thread.sleep(50); + } + if (!ocspResponder.isServerReady()) { + throw new RuntimeException("Server not ready yet"); + } + + int ocspPort = ocspResponder.getPort(); + URI ocspURI = new URI("http://localhost:" + ocspPort); + System.out.println("Configured CPV to connect to " + ocspURI); + + // Create the PKIXParameters needed for path validation and + // configure any necessary OCSP parameters to control the OCSP + // request size. + Set anchors = Set.of(new TrustAnchor(caCert, null)); + + CertPathValidator validator = CertPathValidator.getInstance("PKIX"); + PKIXRevocationChecker revChkr = + (PKIXRevocationChecker)validator.getRevocationChecker(); + revChkr.setOcspResponder(ocspURI); + revChkr.setOptions(Set.of( + PKIXRevocationChecker.Option.ONLY_END_ENTITY, + PKIXRevocationChecker.Option.NO_FALLBACK)); + + PKIXParameters params = new PKIXParameters(anchors); + params.setRevocationEnabled(true); + params.setDate(new Date(1590926400000L)); // 05/31/2020 @ 12:00:00Z + params.addCertPathChecker(revChkr); + + System.out.println("Test 1: Request < 255 bytes, HTTP GET"); + validator.validate(path, params); + + System.out.println("Test 2: Request > 255 bytes, HTTP POST"); + // Modify the PKIXRevocationChecker to include a bogus non-critical + // request extension that makes the request large enough to be + // issued as an HTTP POST. + List chkrList = params.getCertPathCheckers(); + for (PKIXCertPathChecker chkr : chkrList) { + if (chkr instanceof PKIXRevocationChecker) { + ((PKIXRevocationChecker)chkr).setOcspExtensions( + List.of(new BogusExtension("1.2.3.4.5.6.7.8.9", + false, 256))); + } + } + params.setCertPathCheckers(chkrList); + validator.validate(path, params); + + } finally { + if (ocspResponder != null) { + ocspResponder.stop(); + } + } + } + + /** + * Create an X509Certificate object from its PEM encoding + * + * @param pemCert the base64 encoded certificate + * + * @return the corresponding X509Certificate object from the PEM encoding. + * + * @throws IOException if any InputStream or Base64 decoding failures occur. + * @throws CertificateException if any certificate parsing errors occur. + */ + private static X509Certificate pem2Cert(String pemCert) + throws IOException, CertificateException { + return (X509Certificate)certFac.generateCertificate( + new ByteArrayInputStream(pemCert.getBytes())); + } + + /** + * Create a private key from its PEM-encoded PKCS#8 representation. + * + * @param pemKey the private key in PEM-encoded PKCS#8 unencrypted format + * @param algorithm the private key algorithm + * + * @return the PrivateKey extracted from the PKCS#8 encoding. + * + * @throws GeneralSecurityException if any errors take place during + * decoding or parsing. + */ + private static PrivateKey pem2Key(String pemKey, String algorithm) + throws GeneralSecurityException { + byte[] p8Der = Base64.getMimeDecoder().decode(pemKey); + PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(p8Der, algorithm); + KeyFactory kf = KeyFactory.getInstance(algorithm); + return kf.generatePrivate(spec); + } + + /** + * The BogusOcspExtension is an extension with random data in the + * extension value field. It is used in this test to expand the size + * of the OCSP request so it crosses the boundary that forces an HTTP + * POST operation instead of a GET. + */ + private static class BogusExtension implements Extension { + private final ObjectIdentifier oid; + private final boolean critical; + private final byte[] data; + + public BogusExtension(String oidStr, boolean isCrit, int size) + throws IOException { + // For this test we don't need anything larger than 10K + if (size > 0 && size <= 10240) { + data = new byte[size]; + } else { + throw new IllegalArgumentException( + "Size must be 0 < X <= 10240"); + } + oid = ObjectIdentifier.of(oidStr); + SecureRandom sr = new SecureRandom(); + sr.nextBytes(data); + critical = isCrit; + } + + @Override + public String getId() { + return oid.toString(); + } + + @Override + public boolean isCritical() { + return critical; + } + + @Override + public byte[] getValue() { + return data.clone(); + } + + @Override + public void encode(OutputStream out) throws IOException { + Objects.requireNonNull(out, "Non-null OutputStream required"); + + DerOutputStream dos1 = new DerOutputStream(); + DerOutputStream dos2 = new DerOutputStream(); + + dos1.putOID(oid); + if (critical) { + dos1.putBoolean(critical); + } + dos1.putOctetString(data); + + dos2.write(DerValue.tag_Sequence, dos1); + out.write(dos2.toByteArray()); + } + } +} diff --git a/test/jdk/java/security/testlibrary/SimpleOCSPServer.java b/test/jdk/java/security/testlibrary/SimpleOCSPServer.java index 1a29bef0c42..6f6c58089a3 100644 --- a/test/jdk/java/security/testlibrary/SimpleOCSPServer.java +++ b/test/jdk/java/security/testlibrary/SimpleOCSPServer.java @@ -703,21 +703,21 @@ public void run() { OutputStream out = ocspSocket.getOutputStream()) { peerSockAddr = (InetSocketAddress)ocspSocket.getRemoteSocketAddress(); - log("Received incoming connection from " + peerSockAddr); String[] headerTokens = readLine(in).split(" "); LocalOcspRequest ocspReq = null; LocalOcspResponse ocspResp = null; ResponseStatus respStat = ResponseStatus.INTERNAL_ERROR; try { if (headerTokens[0] != null) { + log("Received incoming HTTP " + headerTokens[0] + + " from " + peerSockAddr); switch (headerTokens[0]) { case "POST": - ocspReq = parseHttpOcspPost(in); + ocspReq = parseHttpOcspPost(in); break; case "GET": - // req = parseHttpOcspGet(in); - // TODO implement the GET parsing - throw new IOException("GET method unsupported"); + ocspReq = parseHttpOcspGet(headerTokens); + break; default: respStat = ResponseStatus.MALFORMED_REQUEST; throw new IOException("Not a GET or POST"); @@ -839,6 +839,30 @@ private LocalOcspRequest parseHttpOcspPost(InputStream inStream) } } + /** + * Parse the incoming HTTP GET of an OCSP Request. + * + * @param headerTokens the individual String tokens from the first + * line of the HTTP GET. + * + * @return the OCSP Request as a {@code LocalOcspRequest} + * + * @throws IOException if there are network related issues or problems + * occur during parsing of the OCSP request. + * @throws CertificateException if one or more of the certificates in + * the OCSP request cannot be read/parsed. + */ + private LocalOcspRequest parseHttpOcspGet(String[] headerTokens) + throws IOException, CertificateException { + // We have already established headerTokens[0] to be "GET". + // We should have the URL-encoded base64 representation of the + // OCSP request in headerTokens[1]. We need to strip any leading + // "/" off before decoding. + return new LocalOcspRequest(Base64.getMimeDecoder().decode( + URLDecoder.decode(headerTokens[1].replaceAll("/", ""), + "UTF-8"))); + } + /** * Read a line of text that is CRLF-delimited. *