RFR [XS] of VM portions of JDK-8214546: Start of release updates for JDK 14
Joseph D. Darcy
joe.darcy at oracle.com
Thu Jun 6 01:31:11 UTC 2019
Hello,
The time for the fork of JDK 13 approaches and therefore preparations
for transitioning jdk/jdk to be JDK 14 are underway.
Please review the VM portions of the in-progress start of release
updates for 14:
http://cr.openjdk.java.net/~darcy/jdk14-fork.2/
Patches for the few VM-related changes are listed as diffs below. Builds
and langtools aspects of this change are being reviewed separately on
the appropriate mailing lists. Before this change is eventually pushed,
I'll regenerate the javac --release symbol information from the latest
JDK 13 promoted build and redo a build + test cycle to make sure no
additional tests need to be updated, etc.
Thanks,
-Joe
--- old/src/hotspot/share/classfile/classFileParser.cpp 2019-05-17
09:42:36.328000000 -0700
+++ new/src/hotspot/share/classfile/classFileParser.cpp 2019-05-17
09:42:35.944000000 -0700
@@ -125,6 +125,8 @@
#define JAVA_13_VERSION 57
+#define JAVA_14_VERSION 58
+
void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
assert((bad_constant == JVM_CONSTANT_Module ||
bad_constant == JVM_CONSTANT_Package) && _major_version >=
JAVA_9_VERSION,
---
old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java
2019-05-17 09:42:59.588000000 -0700
+++
new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java
2019-05-17 09:42:59.188000000 -0700
@@ -49,7 +49,7 @@
private final List<ClassfileBytecode> 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;
/**
--- old/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
2019-05-17 09:43:02.244000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
2019-05-17 09:43:01.844000000 -0700
@@ -45,8 +45,6 @@
{"MinRAMFraction", "2"},
{"InitialRAMFraction", "64"},
{"TLABStats", "false"},
- {"ThreadLocalHandshakes", "true"},
- {"AllowJNIEnvProxy", "true"},
{"AllowRedefinitionToAddDeleteMethods", "true"},
// deprecated alias flags (see also aliased_jvm_flags):
More information about the hotspot-dev
mailing list