Skip to content

Commit 499e877

Browse files
authored
Merge pull request SAP#2132 from SAP/pr-jdk-27+1
Merge to tag jdk-27+1
2 parents 4f2f870 + c7aa103 commit 499e877

File tree

62 files changed

+1548
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1548
-226
lines changed

.jcheck/conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[general]
22
project=jdk
33
jbs=JDK
4-
version=26
4+
version=27
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright

make/conf/version-numbers.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
# Default version, product, and vendor information to use,
2727
# unless overridden by configure
2828

29-
DEFAULT_VERSION_FEATURE=26
29+
DEFAULT_VERSION_FEATURE=27
3030
DEFAULT_VERSION_INTERIM=0
3131
DEFAULT_VERSION_UPDATE=0
3232
DEFAULT_VERSION_PATCH=0
3333
DEFAULT_VERSION_EXTRA1=0
3434
DEFAULT_VERSION_EXTRA2=0
3535
DEFAULT_VERSION_EXTRA3=0
36-
DEFAULT_VERSION_DATE=2026-03-17
37-
DEFAULT_VERSION_CLASSFILE_MAJOR=70 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
36+
DEFAULT_VERSION_DATE=2026-09-15
37+
DEFAULT_VERSION_CLASSFILE_MAJOR=71 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
3838
DEFAULT_VERSION_CLASSFILE_MINOR=0
3939
DEFAULT_VERSION_DOCS_API_SINCE=11
40-
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="25 26"
41-
DEFAULT_JDK_SOURCE_TARGET_VERSION=26
40+
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="25 26 27"
41+
DEFAULT_JDK_SOURCE_TARGET_VERSION=27
4242
DEFAULT_PROMOTED_VERSION_PRE=ea

src/hotspot/share/classfile/classFileParser.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@
154154

155155
#define JAVA_26_VERSION 70
156156

157+
#define JAVA_27_VERSION 71
158+
157159
void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
158160
assert((bad_constant == JVM_CONSTANT_Module ||
159161
bad_constant == JVM_CONSTANT_Package) && _major_version >= JAVA_9_VERSION,

src/java.base/share/classes/java/lang/classfile/ClassFile.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,14 @@ default List<VerifyError> verify(Path path) throws IOException {
10381038
*/
10391039
int JAVA_26_VERSION = 70;
10401040

1041+
/**
1042+
* The class major version introduced by Java SE 27, {@value}.
1043+
*
1044+
* @see ClassFileFormatVersion#RELEASE_27
1045+
* @since 27
1046+
*/
1047+
int JAVA_27_VERSION = 71;
1048+
10411049
/**
10421050
* A minor version number {@value} indicating a class uses preview features
10431051
* of a Java SE release since 12, for major versions {@value
@@ -1049,7 +1057,7 @@ default List<VerifyError> verify(Path path) throws IOException {
10491057
* {@return the latest class major version supported by the current runtime}
10501058
*/
10511059
static int latestMajorVersion() {
1052-
return JAVA_26_VERSION;
1060+
return JAVA_27_VERSION;
10531061
}
10541062

10551063
/**

src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,18 @@ public enum ClassFileFormatVersion {
383383
* <cite>The Java Virtual Machine Specification, Java SE 26 Edition</cite></a>
384384
*/
385385
RELEASE_26(70),
386+
387+
/**
388+
* The version introduced by the Java Platform, Standard Edition
389+
* 27.
390+
*
391+
* @since 27
392+
*
393+
* @see <a
394+
* href="https://docs.oracle.com/en/java/javase/27/docs/specs/jvms/index.html">
395+
* <cite>The Java Virtual Machine Specification, Java SE 27 Edition</cite></a>
396+
*/
397+
RELEASE_27(71),
386398
; // Reduce code churn when appending new constants
387399

388400
// Note to maintainers: when adding constants for newer releases,
@@ -398,7 +410,7 @@ private ClassFileFormatVersion(int major) {
398410
* {@return the latest class file format version}
399411
*/
400412
public static ClassFileFormatVersion latest() {
401-
return RELEASE_26;
413+
return RELEASE_27;
402414
}
403415

404416
/**

src/java.compiler/share/classes/javax/lang/model/SourceVersion.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public enum SourceVersion {
8686
* (primitive Types in Patterns, instanceof, and switch in
8787
* third preview)
8888
* 26: no changes (primitive Types in Patterns, instanceof, and
89-
* switch in in fourth preview)
89+
* switch in fourth preview)
90+
* 27: tbd
9091
*/
9192

9293
/**
@@ -484,6 +485,18 @@ public enum SourceVersion {
484485
* <cite>The Java Language Specification, Java SE 26 Edition</cite></a>
485486
*/
486487
RELEASE_26,
488+
489+
/**
490+
* The version introduced by the Java Platform, Standard Edition
491+
* 27.
492+
*
493+
* @since 27
494+
*
495+
* @see <a
496+
* href="https://docs.oracle.com/en/java/javase/27/docs/specs/jls/index.html">
497+
* <cite>The Java Language Specification, Java SE 27 Edition</cite></a>
498+
*/
499+
RELEASE_27,
487500
; // Reduce code churn when appending new constants
488501

489502
// Note that when adding constants for newer releases, the
@@ -493,7 +506,7 @@ public enum SourceVersion {
493506
* {@return the latest source version that can be modeled}
494507
*/
495508
public static SourceVersion latest() {
496-
return RELEASE_26;
509+
return RELEASE_27;
497510
}
498511

499512
private static final SourceVersion latestSupported = getLatestSupported();
@@ -508,7 +521,7 @@ public static SourceVersion latest() {
508521
private static SourceVersion getLatestSupported() {
509522
int intVersion = Runtime.version().feature();
510523
return (intVersion >= 11) ?
511-
valueOf("RELEASE_" + Math.min(26, intVersion)):
524+
valueOf("RELEASE_" + Math.min(27, intVersion)):
512525
RELEASE_10;
513526
}
514527

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* @see AbstractAnnotationValueVisitor9
4545
* @since 14
4646
*/
47-
@SupportedSourceVersion(RELEASE_26)
47+
@SupportedSourceVersion(RELEASE_27)
4848
public abstract class AbstractAnnotationValueVisitor14<R, P> extends AbstractAnnotationValueVisitor9<R, P> {
4949

5050
/**

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* @see AbstractAnnotationValueVisitor14
5151
* @since 23
5252
*/
53-
@SupportedSourceVersion(RELEASE_26)
53+
@SupportedSourceVersion(RELEASE_27)
5454
@PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
5555
public abstract class AbstractAnnotationValueVisitorPreview<R, P> extends AbstractAnnotationValueVisitor14<R, P> {
5656

src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* @see AbstractElementVisitor9
5151
* @since 16
5252
*/
53-
@SupportedSourceVersion(RELEASE_26)
53+
@SupportedSourceVersion(RELEASE_27)
5454
public abstract class AbstractElementVisitor14<R, P> extends AbstractElementVisitor9<R, P> {
5555
/**
5656
* Constructor for concrete subclasses to call.

src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
* @see AbstractElementVisitor14
5454
* @since 23
5555
*/
56-
@SupportedSourceVersion(RELEASE_26)
56+
@SupportedSourceVersion(RELEASE_27)
5757
@PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
5858
public abstract class AbstractElementVisitorPreview<R, P> extends AbstractElementVisitor14<R, P> {
5959
/**

0 commit comments

Comments
 (0)