diff -r 28c968e64173 make/autoconf/version-numbers
--- a/make/autoconf/version-numbers Wed Feb 20 13:20:12 2019 -0800
+++ b/make/autoconf/version-numbers Wed Feb 20 16:58:51 2019 -0800
@@ -25,17 +25,17 @@
# Default version numbers to use unless overridden by configure
-DEFAULT_VERSION_FEATURE=13
+DEFAULT_VERSION_FEATURE=14
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-09-17
-DEFAULT_VERSION_CLASSFILE_MAJOR=57 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2020-03-18
+DEFAULT_VERSION_CLASSFILE_MAJOR=58 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12 13"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12 13 14"
LAUNCHER_NAME=openjdk
PRODUCT_NAME=OpenJDK
diff -r 28c968e64173 make/common/SetupJavaCompilers.gmk
--- a/make/common/SetupJavaCompilers.gmk Wed Feb 20 13:20:12 2019 -0800
+++ b/make/common/SetupJavaCompilers.gmk Wed Feb 20 16:58:51 2019 -0800
@@ -72,7 +72,7 @@
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
JVM := $(JAVA_JAVAC), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := -source 13 -target 13 --doclint-format html5 \
+ FLAGS := -source 14 -target 14 --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 13 -target 13 \
+ FLAGS := -source 14 -target 14 \
-encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
diff -r 28c968e64173 src/hotspot/share/classfile/classFileParser.cpp
--- a/src/hotspot/share/classfile/classFileParser.cpp Wed Feb 20 13:20:12 2019 -0800
+++ b/src/hotspot/share/classfile/classFileParser.cpp Wed Feb 20 16:58:51 2019 -0800
@@ -121,6 +121,8 @@
#define JAVA_13_VERSION 57
+#define JAVA_14_VERSION 58
+
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");
diff -r 28c968e64173 src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java Wed Feb 20 16:58:51 2019 -0800
@@ -51,6 +51,7 @@
1.11 to 1.11.X 55,0
1.12 to 1.12.X 56,0
1.13 to 1.13.X 57,0
+ 1.14 to 1.14.X 58,0
*/
public static final Package.Version JAVA_MIN_CLASS_VERSION =
@@ -83,6 +84,9 @@
public static final Package.Version JAVA13_MAX_CLASS_VERSION =
Package.Version.of(57, 00);
+ public static final Package.Version JAVA14_MAX_CLASS_VERSION =
+ Package.Version.of(58, 00);
+
public static final int JAVA_PACKAGE_MAGIC = 0xCAFED00D;
public static final Package.Version JAVA5_PACKAGE_VERSION =
diff -r 28c968e64173 src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java Wed Feb 20 16:58:51 2019 -0800
@@ -63,7 +63,7 @@
public final class ModuleInfo {
private final int JAVA_MIN_SUPPORTED_VERSION = 53;
- private final int JAVA_MAX_SUPPORTED_VERSION = 57;
+ private final int JAVA_MAX_SUPPORTED_VERSION = 58;
private static final JavaLangModuleAccess JLMA
= SharedSecrets.getJavaLangModuleAccess();
diff -r 28c968e64173 src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Wed Feb 20 16:58:51 2019 -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.V13) {
+ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V14) {
throw new IllegalArgumentException(
"Unsupported class file major version " + readShort(classFileOffset + 6));
}
diff -r 28c968e64173 src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Wed Feb 20 16:58:51 2019 -0800
@@ -96,6 +96,7 @@
int V11 = 0 << 16 | 55;
int V12 = 0 << 16 | 56;
int V13 = 0 << 16 | 57;
+ int V14 = 0 << 16 | 58;
/**
* Version flag indicating that the class is using 'preview' features.
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Wed Feb 20 16:58:51 2019 -0800
@@ -60,6 +60,7 @@
* 11: local-variable syntax for lambda parameters
* 12: TBD
* 13: TBD
+ * 14: TBD
*/
/**
@@ -192,7 +193,15 @@
*
* @since 13
*/
- RELEASE_13;
+ RELEASE_13,
+
+ /**
+ * The version recognized by the Java Platform, Standard Edition
+ * 14.
+ *
+ * @since 14
+ */
+ RELEASE_14;
// Note that when adding constants for newer releases, the
// behavior of latest() and latestSupported() must be updated too.
@@ -203,7 +212,7 @@
* @return the latest source version that can be modeled
*/
public static SourceVersion latest() {
- return RELEASE_13;
+ return RELEASE_14;
}
private static final SourceVersion latestSupported = getLatestSupported();
@@ -213,6 +222,8 @@
String specVersion = System.getProperty("java.specification.version");
switch (specVersion) {
+ case "14":
+ return RELEASE_14;
case "13":
return RELEASE_13;
case "12":
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * RELEASE_9} through {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
*
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_13)
+@SupportedSourceVersion(RELEASE_14)
public abstract class AbstractAnnotationValueVisitor9 extends AbstractAnnotationValueVisitor8 {
/**
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * RELEASE_9} through {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
*
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_13)
+@SupportedSourceVersion(RELEASE_14)
public abstract class AbstractElementVisitor9 extends AbstractElementVisitor8 {
/**
* Constructor for concrete subclasses to call.
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
*
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_13)
+@SupportedSourceVersion(RELEASE_14)
public abstract class AbstractTypeVisitor9 extends AbstractTypeVisitor8 {
/**
* Constructor for concrete subclasses to call.
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * SourceVersion#RELEASE_14 RELEASE_14}.
*
* For {@linkplain
* Element elements} Xyz that may have more than one
@@ -80,7 +80,7 @@
* @since 9
* @spec JPMS
*/
-@SupportedSourceVersion(RELEASE_13)
+@SupportedSourceVersion(RELEASE_14)
public class ElementKindVisitor9 extends ElementKindVisitor8 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * RELEASE_9} through {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
* 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_13)
+@SupportedSourceVersion(RELEASE_14)
public class ElementScanner9 extends ElementScanner8 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * RELEASE_9} through {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
* Visit methods call {@link #defaultAction
* defaultAction} passing their arguments to {@code defaultAction}'s
@@ -68,7 +68,7 @@
* @see SimpleAnnotationValueVisitor8
* @since 9
*/
-@SupportedSourceVersion(RELEASE_13)
+@SupportedSourceVersion(RELEASE_14)
public class SimpleAnnotationValueVisitor9 extends SimpleAnnotationValueVisitor8 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * RELEASE_9} through {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
* 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_13)
+@SupportedSourceVersion(RELEASE_14)
public class SimpleElementVisitor9 extends SimpleElementVisitor8 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * {@link SourceVersion#RELEASE_14 RELEASE_14}.
*
* 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_13)
+@SupportedSourceVersion(RELEASE_14)
public class SimpleTypeVisitor9 extends SimpleTypeVisitor8 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
diff -r 28c968e64173 src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java Wed Feb 20 16:58:51 2019 -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_13 RELEASE_13}.
+ * SourceVersion#RELEASE_14 RELEASE_14}.
*
* For {@linkplain
* TypeMirror types} Xyz that may have more than one
@@ -77,7 +77,7 @@
* @see TypeKindVisitor8
* @since 9
*/
-@SupportedSourceVersion(RELEASE_13)
+@SupportedSourceVersion(RELEASE_14)
public class TypeKindVisitor9 extends TypeKindVisitor8 {
/**
* Constructor for concrete subclasses to call; uses {@code null}
diff -r 28c968e64173 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java Wed Feb 20 16:58:51 2019 -0800
@@ -88,7 +88,10 @@
JDK12("12"),
/** 13 covers the to be determined language features that will be added in JDK 13. */
- JDK13("13");
+ JDK13("13"),
+
+ /** 14 covers the to be determined language features that will be added in JDK 14. */
+ JDK14("14");
private static final Context.Key sourceKey = new Context.Key<>();
@@ -139,6 +142,7 @@
}
public Target requiredTarget() {
+ if (this.compareTo(JDK14) >= 0) return Target.JDK1_14;
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;
@@ -186,9 +190,9 @@
LOCAL_VARIABLE_TYPE_INFERENCE(JDK10),
VAR_SYNTAX_IMPLICIT_LAMBDAS(JDK11, Fragments.FeatureVarSyntaxInImplicitLambda, DiagKind.PLURAL),
IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES(JDK1_2, JDK8),
- SWITCH_MULTIPLE_CASE_LABELS(JDK13, Fragments.FeatureMultipleCaseLabels, DiagKind.PLURAL),
- SWITCH_RULE(JDK13, Fragments.FeatureSwitchRules, DiagKind.PLURAL),
- SWITCH_EXPRESSION(JDK13, Fragments.FeatureSwitchExpressions, DiagKind.PLURAL);
+ SWITCH_MULTIPLE_CASE_LABELS(JDK14, Fragments.FeatureMultipleCaseLabels, DiagKind.PLURAL),
+ SWITCH_RULE(JDK14, Fragments.FeatureSwitchRules, DiagKind.PLURAL),
+ SWITCH_EXPRESSION(JDK14, Fragments.FeatureSwitchExpressions, DiagKind.PLURAL);
enum DiagKind {
NORMAL,
@@ -275,6 +279,8 @@
return RELEASE_12;
case JDK13:
return RELEASE_13;
+ case JDK14:
+ return RELEASE_14;
default:
return null;
}
diff -r 28c968e64173 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java Wed Feb 20 16:58:51 2019 -0800
@@ -117,7 +117,8 @@
V54(54, 0), // JDK 10
V55(55, 0), // JDK 11: constant dynamic, nest mates
V56(56, 0), // JDK 12
- V57(57, 0); // JDK 13
+ V57(57, 0), // JDK 13
+ V58(58, 0); // JDK 14
Version(int major, int minor) {
this.major = major;
this.minor = minor;
diff -r 28c968e64173 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java Wed Feb 20 16:58:51 2019 -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, 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),
+ COMPACT1("compact1", 1, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12, Target.JDK1_13, Target.JDK1_14),
+ COMPACT2("compact2", 2, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12, Target.JDK1_13, Target.JDK1_14),
+ COMPACT3("compact3", 3, Target.JDK1_8, Target.JDK1_9, Target.JDK1_10, Target.JDK1_11, Target.JDK1_12, Target.JDK1_13, Target.JDK1_14),
DEFAULT {
@Override
diff -r 28c968e64173 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java Wed Feb 20 16:58:51 2019 -0800
@@ -73,7 +73,10 @@
JDK1_12("12", 56, 0),
/** JDK 13. */
- JDK1_13("13", 57, 0);
+ JDK1_13("13", 57, 0),
+
+ /** JDK 14. */
+ JDK1_14("14", 58, 0);
private static final Context.Key targetKey = new Context.Key<>();
diff -r 28c968e64173 src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java Wed Feb 20 16:58:51 2019 -0800
@@ -55,7 +55,7 @@
* deletion without notice.
*/
@SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_13)
+@SupportedSourceVersion(SourceVersion.RELEASE_14)
public class PrintingProcessor extends AbstractProcessor {
PrintWriter writer;
diff -r 28c968e64173 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java Wed Feb 20 16:58:51 2019 -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 = 57; // JDK13
+ private static final int MAJOR_VERSION_JAVA_MAX = 58; // JDK14
private static final int MAGIC = 0xCAFEBABE;
/**
diff -r 28c968e64173 src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java Wed Feb 20 16:58:51 2019 -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", "13");
+ final Set releasesWithForRemoval = Set.of("9", "10", "11", "12", "13", "14");
final Set validReleases;
{
diff -r 28c968e64173 src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java
--- a/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java Wed Feb 20 13:20:12 2019 -0800
+++ b/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java Wed Feb 20 16:58:51 2019 -0800
@@ -67,7 +67,7 @@
/* Class File Constants */
int JAVA_MAGIC = 0xcafebabe;
int JAVA_MIN_SUPPORTED_VERSION = 45;
- int JAVA_MAX_SUPPORTED_VERSION = 57;
+ int JAVA_MAX_SUPPORTED_VERSION = 58;
int JAVA_MAX_SUPPORTED_MINOR_VERSION = 0;
/* Generate class file version for 1.1 by default */
diff -r 28c968e64173 test/langtools/tools/javac/api/T6395981.java
--- a/test/langtools/tools/javac/api/T6395981.java Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/api/T6395981.java Wed Feb 20 16:58:51 2019 -0800
@@ -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 RELEASE_13
+ * @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 RELEASE_14
*/
import java.util.EnumSet;
diff -r 28c968e64173 test/langtools/tools/javac/classfiles/ClassVersionChecker.java
--- a/test/langtools/tools/javac/classfiles/ClassVersionChecker.java Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/classfiles/ClassVersionChecker.java Wed Feb 20 16:58:51 2019 -0800
@@ -48,7 +48,8 @@
TEN("10", 54),
ELEVEN("11", 55),
TWELVE("12", 56),
- THIRTEEN("13", 57);
+ THIRTEEN("13", 57),
+ FOURTEEN("14", 58);
private Version(String release, int classFileVer) {
this.release = release;
diff -r 28c968e64173 test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java
--- a/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java Wed Feb 20 16:58:51 2019 -0800
@@ -110,7 +110,7 @@
* corresponding platform visitor type.
*/
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static abstract class AbstractAnnotationValueVisitor extends AbstractAnnotationValueVisitor9 {
/**
@@ -121,7 +121,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static abstract class AbstractElementVisitor extends AbstractElementVisitor9 {
/**
* Constructor for concrete subclasses to call.
@@ -131,7 +131,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static abstract class AbstractTypeVisitor extends AbstractTypeVisitor9 {
/**
* Constructor for concrete subclasses to call.
@@ -141,7 +141,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static class ElementKindVisitor extends ElementKindVisitor9 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
@@ -162,7 +162,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static class ElementScanner extends ElementScanner9 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
@@ -181,7 +181,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static class SimpleAnnotationValueVisitor extends SimpleAnnotationValueVisitor9 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
@@ -202,7 +202,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static class SimpleElementVisitor extends SimpleElementVisitor9 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
@@ -223,7 +223,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static class SimpleTypeVisitor extends SimpleTypeVisitor9 {
/**
* Constructor for concrete subclasses; uses {@code null} for the
@@ -244,7 +244,7 @@
}
}
- @SupportedSourceVersion(RELEASE_13)
+ @SupportedSourceVersion(RELEASE_14)
public static class TypeKindVisitor extends TypeKindVisitor9 {
/**
* Constructor for concrete subclasses to call; uses {@code null}
diff -r 28c968e64173 test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
--- a/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out Wed Feb 20 16:58:51 2019 -0800
@@ -1,2 +1,2 @@
-- compiler.err.preview.feature.disabled.classfile: Bar.class, 13
+- compiler.err.preview.feature.disabled.classfile: Bar.class, 14
1 error
diff -r 28c968e64173 test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
--- a/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out Wed Feb 20 16:58:51 2019 -0800
@@ -1,4 +1,4 @@
-- compiler.warn.preview.feature.use.classfile: Bar.class, 13
+- compiler.warn.preview.feature.use.classfile: Bar.class, 14
- compiler.err.warnings.and.werror
1 error
1 warning
diff -r 28c968e64173 test/langtools/tools/javac/profiles/ProfileOptionTest.java
--- a/test/langtools/tools/javac/profiles/ProfileOptionTest.java Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/profiles/ProfileOptionTest.java Wed Feb 20 16:58:51 2019 -0800
@@ -152,6 +152,7 @@
case JDK1_11:
case JDK1_12:
case JDK1_13:
+ case JDK1_14:
if (p == Profile.DEFAULT)
break;
if (ise == null)
diff -r 28c968e64173 test/langtools/tools/javac/versions/Versions.java
--- a/test/langtools/tools/javac/versions/Versions.java Wed Feb 20 13:20:12 2019 -0800
+++ b/test/langtools/tools/javac/versions/Versions.java Wed Feb 20 16:58:51 2019 -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", "13");
+ Set.of("1.7", "1.8", "1.9", "1.10", "11", "12", "13", "14");
- public static final String LATEST_MAJOR_VERSION = "57.0";
+ public static final String LATEST_MAJOR_VERSION = "58.0";
static enum SourceTarget {
SEVEN(true, "51.0", "7", Versions::checksrc17),
@@ -80,7 +80,8 @@
TEN(true, "54.0", "10", Versions::checksrc110),
ELEVEN(false, "55.0", "11", Versions::checksrc111),
TWELVE(false, "56.0", "12", Versions::checksrc112),
- THIRTEEN(false, "57.0", "13", Versions::checksrc113);
+ THIRTEEN(false, "57.0", "13", Versions::checksrc113),
+ FOURTEEN(false, "58.0", "14", Versions::checksrc114);
private final boolean dotOne;
private final String classFileVer;
@@ -299,6 +300,11 @@
checksrc111(args);
}
+ protected void checksrc114(String... args) {
+ printargs("checksrc114", args);
+ checksrc111(args);
+ }
+
protected void pass(String... args) {
printargs("pass", args);