--- 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