--- old/make/autoconf/version-numbers 2018-12-03 18:11:25.277697000 -0800 +++ new/make/autoconf/version-numbers 2018-12-03 18:11:25.085601000 -0800 @@ -25,17 +25,17 @@ # Default version numbers to use unless overridden by configure -DEFAULT_VERSION_FEATURE=12 +DEFAULT_VERSION_FEATURE=12 # jtreg doesn't work (yet) if this is set to 13 DEFAULT_VERSION_INTERIM=0 DEFAULT_VERSION_UPDATE=0 DEFAULT_VERSION_PATCH=0 DEFAULT_VERSION_EXTRA1=0 DEFAULT_VERSION_EXTRA2=0 DEFAULT_VERSION_EXTRA3=0 -DEFAULT_VERSION_DATE=2019-03-19 -DEFAULT_VERSION_CLASSFILE_MAJOR=56 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" +DEFAULT_VERSION_DATE=2019-09-17 +DEFAULT_VERSION_CLASSFILE_MAJOR=57 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" DEFAULT_VERSION_CLASSFILE_MINOR=0 -DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12" +DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12 13" LAUNCHER_NAME=openjdk PRODUCT_NAME=OpenJDK --- old/make/common/SetupJavaCompilers.gmk 2018-12-03 18:11:25.813965000 -0800 +++ new/make/common/SetupJavaCompilers.gmk 2018-12-03 18:11:25.633874999 -0800 @@ -72,7 +72,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \ JVM := $(JAVA_JAVAC), \ JAVAC := $(NEW_JAVAC), \ - FLAGS := -source 12 -target 12 --doclint-format html5 \ + FLAGS := -source 13 -target 13 --doclint-format html5 \ -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \ SERVER_DIR := $(SJAVAC_SERVER_DIR), \ SERVER_JVM := $(SJAVAC_SERVER_JAVA))) @@ -82,7 +82,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \ JVM := $(JAVA_JAVAC), \ JAVAC := $(NEW_JAVAC), \ - FLAGS := -source 12 -target 12 \ + FLAGS := -source 13 -target 13 \ -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \ SERVER_DIR := $(SJAVAC_SERVER_DIR), \ SERVER_JVM := $(SJAVAC_SERVER_JAVA))) --- old/src/hotspot/share/classfile/classFileParser.cpp 2018-12-03 18:11:26.354235000 -0800 +++ new/src/hotspot/share/classfile/classFileParser.cpp 2018-12-03 18:11:26.170142999 -0800 @@ -119,6 +119,8 @@ #define JAVA_12_VERSION 56 +#define JAVA_13_VERSION 57 + void ClassFileParser::set_class_bad_constant_seen(short bad_constant) { assert((bad_constant == 19 || bad_constant == 20) && _major_version >= JAVA_9_VERSION, "Unexpected bad constant pool entry"); --- old/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java 2018-12-03 18:11:26.830473000 -0800 +++ new/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java 2018-12-03 18:11:26.638377000 -0800 @@ -50,6 +50,7 @@ 1.10 to 1.10.X 54,0 1.11 to 1.11.X 55,0 1.12 to 1.12.X 56,0 + 1.13 to 1.13.X 57,0 */ public static final Package.Version JAVA_MIN_CLASS_VERSION = @@ -79,6 +80,9 @@ public static final Package.Version JAVA12_MAX_CLASS_VERSION = Package.Version.of(56, 00); + public static final Package.Version JAVA13_MAX_CLASS_VERSION = + Package.Version.of(57, 00); + public static final int JAVA_PACKAGE_MAGIC = 0xCAFED00D; public static final Package.Version JAVA5_PACKAGE_VERSION = @@ -95,7 +99,7 @@ // upper limit, should point to the latest class version public static final Package.Version JAVA_MAX_CLASS_VERSION = - JAVA12_MAX_CLASS_VERSION; + JAVA13_MAX_CLASS_VERSION; // upper limit should point to the latest package version, for version info!. public static final Package.Version MAX_PACKAGE_VERSION = --- old/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java 2018-12-03 18:11:27.370742999 -0800 +++ new/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java 2018-12-03 18:11:27.182649000 -0800 @@ -63,7 +63,7 @@ public final class ModuleInfo { private final int JAVA_MIN_SUPPORTED_VERSION = 53; - private final int JAVA_MAX_SUPPORTED_VERSION = 56; + private final int JAVA_MAX_SUPPORTED_VERSION = 57; private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); --- old/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java 2018-12-03 18:11:28.067090999 -0800 +++ new/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java 2018-12-03 18:11:27.874995000 -0800 @@ -210,7 +210,7 @@ b = classFileBuffer; // Check the class' major_version. This field is after the magic and minor_version fields, which // use 4 and 2 bytes respectively. - if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V12) { + if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V13) { throw new IllegalArgumentException( "Unsupported class file major version " + readShort(classFileOffset + 6)); } --- old/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java 2018-12-03 18:11:28.647381000 -0800 +++ new/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java 2018-12-03 18:11:28.463289000 -0800 @@ -95,6 +95,7 @@ int V10 = 0 << 16 | 54; int V11 = 0 << 16 | 55; int V12 = 0 << 16 | 56; + int V13 = 0 << 16 | 57; /** * Version flag indicating that the class is using 'preview' features. --- old/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java 2018-12-03 18:11:29.047581000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java 2018-12-03 18:11:28.867491000 -0800 @@ -59,6 +59,7 @@ * 10: local-variable type inference (var) * 11: local-variable syntax for lambda parameters * 12: TBD + * 13: TBD */ /** @@ -183,7 +184,15 @@ * * @since 12 */ - RELEASE_12; + RELEASE_12, + + /** + * The version recognized by the Java Platform, Standard Edition + * 13. + * + * @since 13 + */ + RELEASE_13; // Note that when adding constants for newer releases, the // behavior of latest() and latestSupported() must be updated too. @@ -194,7 +203,7 @@ * @return the latest source version that can be modeled */ public static SourceVersion latest() { - return RELEASE_12; + return RELEASE_13; } private static final SourceVersion latestSupported = getLatestSupported(); @@ -204,6 +213,8 @@ String specVersion = System.getProperty("java.specification.version"); switch (specVersion) { + case "13": + return RELEASE_13; case "12": return RELEASE_12; case "11": --- old/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java 2018-12-03 18:11:29.575845000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java 2018-12-03 18:11:29.395755000 -0800 @@ -32,7 +32,7 @@ /** * A skeletal visitor for annotation values with default behavior * appropriate for source versions {@link SourceVersion#RELEASE_9 - * RELEASE_9} through {@link SourceVersion#RELEASE_12 RELEASE_12}. + * RELEASE_9} through {@link SourceVersion#RELEASE_13 RELEASE_13}. * *

WARNING: The {@code AnnotationValueVisitor} interface * implemented by this class may have methods added to it in the @@ -59,7 +59,7 @@ * @see AbstractAnnotationValueVisitor8 * @since 9 */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public abstract class AbstractAnnotationValueVisitor9 extends AbstractAnnotationValueVisitor8 { /** --- old/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java 2018-12-03 18:11:30.272193000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java 2018-12-03 18:11:30.084099000 -0800 @@ -34,7 +34,7 @@ /** * A skeletal visitor of program elements with default behavior * appropriate for source versions {@link SourceVersion#RELEASE_9 - * RELEASE_9} through {@link SourceVersion#RELEASE_12 RELEASE_12}. + * RELEASE_9} through {@link SourceVersion#RELEASE_13 RELEASE_13}. * *

WARNING: The {@code ElementVisitor} interface * implemented by this class may have methods added to it in the @@ -65,7 +65,7 @@ * @since 9 * @spec JPMS */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public abstract class AbstractElementVisitor9 extends AbstractElementVisitor8 { /** * Constructor for concrete subclasses to call. --- old/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java 2018-12-03 18:11:30.944529000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java 2018-12-03 18:11:30.764439000 -0800 @@ -33,7 +33,7 @@ /** * A skeletal visitor of types with default behavior appropriate for * source versions {@link SourceVersion#RELEASE_9 RELEASE_9} through - * {@link SourceVersion#RELEASE_12 RELEASE_12}. + * {@link SourceVersion#RELEASE_13 RELEASE_13}. * *

WARNING: The {@code TypeVisitor} interface implemented * by this class may have methods added to it in the future to @@ -63,7 +63,7 @@ * @see AbstractTypeVisitor8 * @since 9 */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public abstract class AbstractTypeVisitor9 extends AbstractTypeVisitor8 { /** * Constructor for concrete subclasses to call. --- old/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java 2018-12-03 18:11:31.616865000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java 2018-12-03 18:11:31.432773000 -0800 @@ -34,7 +34,7 @@ * A visitor of program elements based on their {@linkplain * ElementKind kind} with default behavior appropriate for source * versions {@link SourceVersion#RELEASE_9 RELEASE_9} through {@link - * SourceVersion#RELEASE_12 RELEASE_12}. + * SourceVersion#RELEASE_13 RELEASE_13}. * * For {@linkplain * Element elements} Xyz that may have more than one @@ -80,7 +80,7 @@ * @since 9 * @spec JPMS */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public class ElementKindVisitor9 extends ElementKindVisitor8 { /** * Constructor for concrete subclasses; uses {@code null} for the --- old/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java 2018-12-03 18:11:32.293203000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java 2018-12-03 18:11:32.109111000 -0800 @@ -34,7 +34,7 @@ /** * A scanning visitor of program elements with default behavior * appropriate for source versions {@link SourceVersion#RELEASE_9 - * RELEASE_9} through {@link SourceVersion#RELEASE_12 RELEASE_12}. + * RELEASE_9} through {@link SourceVersion#RELEASE_13 RELEASE_13}. * * The visitXyz methods in this * class scan their component elements by calling {@code scan} on @@ -92,7 +92,7 @@ * @since 9 * @spec JPMS */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public class ElementScanner9 extends ElementScanner8 { /** * Constructor for concrete subclasses; uses {@code null} for the --- old/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java 2018-12-03 18:11:32.989551000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java 2018-12-03 18:11:32.797455000 -0800 @@ -32,7 +32,7 @@ /** * A simple visitor for annotation values with default behavior * appropriate for source versions {@link SourceVersion#RELEASE_9 - * RELEASE_9} through {@link SourceVersion#RELEASE_12 RELEASE_12}. + * RELEASE_9} through {@link SourceVersion#RELEASE_13 RELEASE_13}. * * Visit methods call {@link #defaultAction * defaultAction} passing their arguments to {@code defaultAction}'s @@ -68,7 +68,7 @@ * @see SimpleAnnotationValueVisitor8 * @since 9 */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public class SimpleAnnotationValueVisitor9 extends SimpleAnnotationValueVisitor8 { /** * Constructor for concrete subclasses; uses {@code null} for the --- old/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java 2018-12-03 18:11:33.733923000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java 2018-12-03 18:11:33.541826999 -0800 @@ -33,7 +33,7 @@ /** * A simple visitor of program elements with default behavior * appropriate for source versions {@link SourceVersion#RELEASE_9 - * RELEASE_9} through {@link SourceVersion#RELEASE_12 RELEASE_12}. + * RELEASE_9} through {@link SourceVersion#RELEASE_13 RELEASE_13}. * * Visit methods corresponding to {@code RELEASE_9} and earlier * language constructs call {@link #defaultAction defaultAction}, @@ -73,7 +73,7 @@ * @since 9 * @spec JPMS */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public class SimpleElementVisitor9 extends SimpleElementVisitor8 { /** * Constructor for concrete subclasses; uses {@code null} for the --- old/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java 2018-12-03 18:11:34.426268999 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java 2018-12-03 18:11:34.234173000 -0800 @@ -33,7 +33,7 @@ /** * A simple visitor of types with default behavior appropriate for * source versions {@link SourceVersion#RELEASE_9 RELEASE_9} through - * {@link SourceVersion#RELEASE_12 RELEASE_12}. + * {@link SourceVersion#RELEASE_13 RELEASE_13}. * * Visit methods corresponding to {@code RELEASE_9} and earlier * language constructs call {@link #defaultAction defaultAction}, @@ -73,7 +73,7 @@ * @see SimpleTypeVisitor8 * @since 9 */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public class SimpleTypeVisitor9 extends SimpleTypeVisitor8 { /** * Constructor for concrete subclasses; uses {@code null} for the --- old/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java 2018-12-03 18:11:35.090601000 -0800 +++ new/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java 2018-12-03 18:11:34.910510999 -0800 @@ -34,7 +34,7 @@ * A visitor of types based on their {@linkplain TypeKind kind} with * default behavior appropriate for source versions {@link * SourceVersion#RELEASE_9 RELEASE_9} through {@link - * SourceVersion#RELEASE_12 RELEASE_12}. + * SourceVersion#RELEASE_13 RELEASE_13}. * * For {@linkplain * TypeMirror types} Xyz that may have more than one @@ -77,7 +77,7 @@ * @see TypeKindVisitor8 * @since 9 */ -@SupportedSourceVersion(RELEASE_12) +@SupportedSourceVersion(RELEASE_13) public class TypeKindVisitor9 extends TypeKindVisitor8 { /** * Constructor for concrete subclasses to call; uses {@code null} --- old/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java 2018-12-03 18:11:35.634873000 -0800 +++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java 2018-12-03 18:11:35.446779000 -0800 @@ -85,7 +85,10 @@ JDK11("11"), /** 12 covers the to be determined language features that will be added in JDK 12. */ - JDK12("12"); + JDK12("12"), + + /** 13 covers the to be determined language features that will be added in JDK 13. */ + JDK13("13"); private static final Context.Key sourceKey = new Context.Key<>(); @@ -136,6 +139,7 @@ } public Target requiredTarget() { + if (this.compareTo(JDK13) >= 0) return Target.JDK1_13; if (this.compareTo(JDK12) >= 0) return Target.JDK1_12; if (this.compareTo(JDK11) >= 0) return Target.JDK1_11; if (this.compareTo(JDK10) >= 0) return Target.JDK1_10; @@ -270,6 +274,8 @@ return RELEASE_11; case JDK12: return RELEASE_12; + case JDK13: + return RELEASE_13; default: return null; } --- old/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java 2018-12-03 18:11:36.023067000 -0800 +++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java 2018-12-03 18:11:35.842977000 -0800 @@ -116,7 +116,8 @@ V53(53, 0), // JDK 1.9: modules, indy string concat V54(54, 0), // JDK 10 V55(55, 0), // JDK 11: constant dynamic, nest mates - V56(56, 0); // JDK 12 + V56(56, 0), // JDK 12 + V57(57, 0); // JDK 13 Version(int major, int minor) { this.major = major; this.minor = minor; --- old/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java 2018-12-03 18:11:36.427269000 -0800 +++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java 2018-12-03 18:11:36.243177000 -0800 @@ -40,9 +40,9 @@ * deletion without notice. */ public enum Profile { - COMPACT1("compact1", 1, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12), - COMPACT2("compact2", 2, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12), - COMPACT3("compact3", 3, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12), + COMPACT1("compact1", 1, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12, Target.JDK1_13), + COMPACT2("compact2", 2, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12, Target.JDK1_13), + COMPACT3("compact3", 3, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12, Target.JDK1_13), DEFAULT { @Override --- old/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java 2018-12-03 18:11:36.855483000 -0800 +++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java 2018-12-03 18:11:36.671391000 -0800 @@ -70,7 +70,10 @@ JDK1_11("11", 55, 0), /** JDK 12. */ - JDK1_12("12", 56, 0); + JDK1_12("12", 56, 0), + + /** JDK 13. */ + JDK1_13("13", 57, 0); private static final Context.Key targetKey = new Context.Key<>(); --- old/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java 2018-12-03 18:11:37.395753000 -0800 +++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java 2018-12-03 18:11:37.207659000 -0800 @@ -55,7 +55,7 @@ * deletion without notice. */ @SupportedAnnotationTypes("*") -@SupportedSourceVersion(SourceVersion.RELEASE_12) +@SupportedSourceVersion(SourceVersion.RELEASE_13) public class PrintingProcessor extends AbstractProcessor { PrintWriter writer; --- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java 2018-12-03 18:11:38.128119000 -0800 +++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java 2018-12-03 18:11:37.928019000 -0800 @@ -49,7 +49,7 @@ private final List codeAttributes; private static final int MAJOR_VERSION_JAVA_MIN = 51; // JDK7 - private static final int MAJOR_VERSION_JAVA_MAX = 56; // JDK12 + private static final int MAJOR_VERSION_JAVA_MAX = 57; // JDK13 private static final int MAGIC = 0xCAFEBABE; /** --- old/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java 2018-12-03 18:11:38.692401000 -0800 +++ new/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java 2018-12-03 18:11:38.508309000 -0800 @@ -106,7 +106,7 @@ // Keep these updated manually until there's a compiler API // that allows querying of supported releases. final Set releasesWithoutForRemoval = Set.of("6", "7", "8"); - final Set releasesWithForRemoval = Set.of("9", "10", "11", "12"); + final Set releasesWithForRemoval = Set.of("9", "10", "11", "12", "13"); final Set validReleases; { --- old/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java 2018-12-03 18:11:39.260685000 -0800 +++ new/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java 2018-12-03 18:11:39.076593000 -0800 @@ -67,7 +67,7 @@ /* Class File Constants */ int JAVA_MAGIC = 0xcafebabe; int JAVA_MIN_SUPPORTED_VERSION = 45; - int JAVA_MAX_SUPPORTED_VERSION = 56; + int JAVA_MAX_SUPPORTED_VERSION = 57; int JAVA_MAX_SUPPORTED_MINOR_VERSION = 0; /* Generate class file version for 1.1 by default */ --- old/test/jdk/java/lang/module/ClassFileVersionsTest.java 2018-12-03 18:11:39.816963000 -0800 +++ new/test/jdk/java/lang/module/ClassFileVersionsTest.java 2018-12-03 18:11:39.628869000 -0800 @@ -56,6 +56,7 @@ { 54, 0, Set.of() }, // JDK 10 { 55, 0, Set.of() }, // JDK 11 { 56, 0, Set.of() }, // JDK 12 + { 57, 0, Set.of() }, // JDK 13 }; } @@ -79,7 +80,11 @@ { 56, 0, Set.of(TRANSITIVE) }, { 56, 0, Set.of(STATIC, TRANSITIVE) }, - { 57, 0, Set.of()}, // JDK 13 + { 57, 0, Set.of(STATIC) }, // JDK 13 + { 57, 0, Set.of(TRANSITIVE) }, + { 57, 0, Set.of(STATIC, TRANSITIVE) }, + + { 58, 0, Set.of()}, // JDK 14 }; } --- old/test/langtools/ProblemList.txt 2018-12-03 18:11:40.229169000 -0800 +++ new/test/langtools/ProblemList.txt 2018-12-03 18:11:40.041075000 -0800 @@ -56,6 +56,57 @@ tools/javac/modules/SourceInSymlinkTest.java 8180263 windows-all fails when run on a subst drive tools/javac/importscope/T8193717.java 8203925 generic-all the test requires too much memory +# Tests involving preview features of JDK 12 + +jdk/javadoc/tool/EnablePreviewOption.java 8888888 generic-all JDK 12 no longer the latest release +jdk/jshell/ToolEnablePreviewTest.java 8888888 generic-all JDK 12 no longer the latest release +jdk/jshell/ToolSimpleTest.java 8888888 generic-all JDK 12 no longer the latest release + +tools/javac/RawStringLiteralLangAPI.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/ConditionalWithVoid.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/RawStringLiteralLang.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/expswitch/ExpSwitchNestingTest.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/lambda/BadSwitchExpressionLambda.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/preview/classReaderTest/Client.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/BlockExpression.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/BooleanNumericNonNumeric.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/BreakTest.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/CaseTest.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/DefiniteAssignment1.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/DefiniteAssignment2.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/EmptySwitch.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExhaustiveEnumSwitch.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitch.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchBugsInGen.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchBreaks1.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchBreaks2.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchBugs.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchCodeFromJLS.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchDA.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchEmbedding.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchFallThrough.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchFallThrough1.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchFlow.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchInExpressionSwitch.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchInfer.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchIntersectionTypes.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchNotExhaustive.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ExpressionSwitchUnreachable.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ParseIncomplete.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/ParserRecovery.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/SwitchExpressionIsNotAConstant.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/SwitchExpressionSimpleVisitorTest.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchexpr/SwitchExpressionScopesIsolated.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/MultipleLabelsExpression.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/MultipleLabelsStatement.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/RuleParsingTest.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/SwitchArrowBrokenConstant.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/SwitchStatementArrow.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/SwitchStatementBroken.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/SwitchStatementBroken2.java 8888888 generic-all JDK 12 no longer the latest release +tools/javac/switchextra/SwitchStatementScopesIsolated.java 8888888 generic-all JDK 12 no longer the latest release + + ########################################################################### # # javap --- old/test/langtools/tools/javac/6330997/T6330997.java 2018-12-03 18:11:40.789449000 -0800 +++ new/test/langtools/tools/javac/6330997/T6330997.java 2018-12-03 18:11:40.609359000 -0800 @@ -32,8 +32,8 @@ * jdk.compiler/com.sun.tools.javac.main * jdk.compiler/com.sun.tools.javac.util * @clean T1 T2 - * @compile -source 11 -target 12 T1.java - * @compile -source 11 -target 12 T2.java + * @compile -source 12 -target 13 T1.java + * @compile -source 12 -target 13 T2.java * @run main/othervm T6330997 */ --- old/test/langtools/tools/javac/api/T6395981.java 2018-12-03 18:11:41.325717000 -0800 +++ new/test/langtools/tools/javac/api/T6395981.java 2018-12-03 18:11:41.141625000 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 6395981 6458819 7025784 8028543 8028544 8193291 8193292 8193292 + * @bug 6395981 6458819 7025784 8028543 8028544 8193291 8193292 8193292 8205393 * @summary JavaCompilerTool and Tool must specify version of JLS and JVMS * @author Peter von der Ah\u00e9 * @modules java.compiler @@ -31,7 +31,7 @@ * @run main/fail T6395981 * @run main/fail T6395981 RELEASE_3 RELEASE_5 RELEASE_6 * @run main/fail T6395981 RELEASE_0 RELEASE_1 RELEASE_2 RELEASE_3 RELEASE_4 RELEASE_5 RELEASE_6 - * @run main T6395981 RELEASE_3 RELEASE_4 RELEASE_5 RELEASE_6 RELEASE_7 RELEASE_8 RELEASE_9 RELEASE_10 RELEASE_11 RELEASE_12 + * @run main T6395981 RELEASE_3 RELEASE_4 RELEASE_5 RELEASE_6 RELEASE_7 RELEASE_8 RELEASE_9 RELEASE_10 RELEASE_11 RELEASE_12 RELEASE_13 */ import java.util.EnumSet; --- old/test/langtools/tools/javac/classfiles/ClassVersionChecker.java 2018-12-03 18:11:41.733921000 -0800 +++ new/test/langtools/tools/javac/classfiles/ClassVersionChecker.java 2018-12-03 18:11:41.549829000 -0800 @@ -47,7 +47,8 @@ NINE("9", 53), TEN("10", 54), ELEVEN("11", 55), - TWELVE("12", 56); + TWELVE("12", 56), + THIRTEEN("13", 57); private Version(String release, int classFileVer) { this.release = release; --- old/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java 2018-12-03 18:11:42.282194999 -0800 +++ new/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java 2018-12-03 18:11:42.098102999 -0800 @@ -110,7 +110,7 @@ * corresponding platform visitor type. */ - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static abstract class AbstractAnnotationValueVisitor extends AbstractAnnotationValueVisitor9 { /** @@ -121,7 +121,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static abstract class AbstractElementVisitor extends AbstractElementVisitor9 { /** * Constructor for concrete subclasses to call. @@ -131,7 +131,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static abstract class AbstractTypeVisitor extends AbstractTypeVisitor9 { /** * Constructor for concrete subclasses to call. @@ -141,7 +141,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static class ElementKindVisitor extends ElementKindVisitor9 { /** * Constructor for concrete subclasses; uses {@code null} for the @@ -162,7 +162,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static class ElementScanner extends ElementScanner9 { /** * Constructor for concrete subclasses; uses {@code null} for the @@ -181,7 +181,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static class SimpleAnnotationValueVisitor extends SimpleAnnotationValueVisitor9 { /** * Constructor for concrete subclasses; uses {@code null} for the @@ -202,7 +202,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static class SimpleElementVisitor extends SimpleElementVisitor9 { /** * Constructor for concrete subclasses; uses {@code null} for the @@ -223,7 +223,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static class SimpleTypeVisitor extends SimpleTypeVisitor9 { /** * Constructor for concrete subclasses; uses {@code null} for the @@ -244,7 +244,7 @@ } } - @SupportedSourceVersion(RELEASE_12) + @SupportedSourceVersion(RELEASE_13) public static class TypeKindVisitor extends TypeKindVisitor9 { /** * Constructor for concrete subclasses to call; uses {@code null} --- old/test/langtools/tools/javac/profiles/ProfileOptionTest.java 2018-12-03 18:11:42.858482999 -0800 +++ new/test/langtools/tools/javac/profiles/ProfileOptionTest.java 2018-12-03 18:11:42.666387000 -0800 @@ -151,6 +151,7 @@ case JDK1_10: case JDK1_11: case JDK1_12: + case JDK1_13: if (p == Profile.DEFAULT) break; if (ise == null) --- old/test/langtools/tools/javac/versions/Versions.java 2018-12-03 18:11:43.274691000 -0800 +++ new/test/langtools/tools/javac/versions/Versions.java 2018-12-03 18:11:43.082595000 -0800 @@ -69,9 +69,9 @@ Set.of("1.2", "1.3", "1.4", "1.5", "1.6"); public static final Set VALID_SOURCES = - Set.of("1.7", "1.8", "1.9", "1.10", "11", "12"); + Set.of("1.7", "1.8", "1.9", "1.10", "11", "12", "13"); - public static final String LATEST_MAJOR_VERSION = "56.0"; + public static final String LATEST_MAJOR_VERSION = "57.0"; static enum SourceTarget { SEVEN(true, "51.0", "7", Versions::checksrc17), @@ -79,7 +79,8 @@ NINE(true, "53.0", "9", Versions::checksrc19), TEN(true, "54.0", "10", Versions::checksrc110), ELEVEN(false, "55.0", "11", Versions::checksrc111), - TWELVE(false, "56.0", "12", Versions::checksrc112); + TWELVE(false, "56.0", "12", Versions::checksrc112), + THIRTEEN(false, "57.0", "13", Versions::checksrc113); private final boolean dotOne; private final String classFileVer; @@ -293,6 +294,11 @@ checksrc111(args); } + protected void checksrc113(String... args) { + printargs("checksrc113", args); + checksrc111(args); + } + protected void pass(String... args) { printargs("pass", args);