Skip to content
Permalink
Browse files
8257450: Start of release updates for JDK 17
8257451: Add SourceVersion.RELEASE_17
8257453: Add source 17 and target 17 to javac

Reviewed-by: dholmes, erikj, iris, mikael, jjg, jlahoda, jwilhelm, mchung, ihse
  • Loading branch information
jddarcy committed Dec 10, 2020
1 parent d163c6f commit 6be1f5671eab355c835ca38761ca6e427927bc7f
Showing with 7,607 additions and 59 deletions.
  1. +5 −5 make/autoconf/version-numbers
  2. +1,034 −0 make/data/symbols/java.base-G.sym.txt
  3. +143 −0 make/data/symbols/java.compiler-G.sym.txt
  4. +36 −0 make/data/symbols/java.datatransfer-G.sym.txt
  5. +1,253 −0 make/data/symbols/java.desktop-G.sym.txt
  6. +31 −0 make/data/symbols/java.instrument-G.sym.txt
  7. +63 −0 make/data/symbols/java.logging-G.sym.txt
  8. +269 −0 make/data/symbols/java.management-G.sym.txt
  9. +39 −0 make/data/symbols/java.management.rmi-G.sym.txt
  10. +76 −0 make/data/symbols/java.naming-G.sym.txt
  11. +40 −0 make/data/symbols/java.net.http-G.sym.txt
  12. +52 −0 make/data/symbols/java.rmi-G.sym.txt
  13. +32 −0 make/data/symbols/java.scripting-G.sym.txt
  14. +69 −0 make/data/symbols/java.security.jgss-G.sym.txt
  15. +32 −0 make/data/symbols/java.security.sasl-G.sym.txt
  16. +62 −0 make/data/symbols/java.smartcardio-G.sym.txt
  17. +60 −0 make/data/symbols/java.sql-G.sym.txt
  18. +69 −0 make/data/symbols/java.sql.rowset-G.sym.txt
  19. +150 −0 make/data/symbols/java.xml-G.sym.txt
  20. +46 −0 make/data/symbols/java.xml.crypto-G.sym.txt
  21. +44 −0 make/data/symbols/jdk.accessibility-G.sym.txt
  22. +55 −0 make/data/symbols/jdk.attach-G.sym.txt
  23. +382 −0 make/data/symbols/jdk.compiler-G.sym.txt
  24. +136 −0 make/data/symbols/jdk.dynalink-G.sym.txt
  25. +68 −0 make/data/symbols/jdk.httpserver-G.sym.txt
  26. +318 −0 make/data/symbols/jdk.incubator.foreign-G.sym.txt
  27. +30 −0 make/data/symbols/jdk.incubator.jpackage-G.sym.txt
  28. +1,441 −0 make/data/symbols/jdk.incubator.vector-G.sym.txt
  29. +39 −0 make/data/symbols/jdk.jartool-G.sym.txt
  30. +39 −0 make/data/symbols/jdk.javadoc-G.sym.txt
  31. +31 −0 make/data/symbols/jdk.jconsole-G.sym.txt
  32. +397 −0 make/data/symbols/jdk.jdi-G.sym.txt
  33. +50 −0 make/data/symbols/jdk.jfr-G.sym.txt
  34. +31 −0 make/data/symbols/jdk.jpackage-G.sym.txt
  35. +108 −0 make/data/symbols/jdk.jshell-G.sym.txt
  36. +31 −0 make/data/symbols/jdk.jsobject-G.sym.txt
  37. +49 −0 make/data/symbols/jdk.management-G.sym.txt
  38. +58 −0 make/data/symbols/jdk.management.jfr-G.sym.txt
  39. +60 −0 make/data/symbols/jdk.net-G.sym.txt
  40. +73 −0 make/data/symbols/jdk.sctp-G.sym.txt
  41. +106 −0 make/data/symbols/jdk.security.auth-G.sym.txt
  42. +49 −0 make/data/symbols/jdk.security.jgss-G.sym.txt
  43. +52 −0 make/data/symbols/jdk.unsupported-G.sym.txt
  44. +295 −0 make/data/symbols/jdk.xml.dom-G.sym.txt
  45. +2 −1 make/data/symbols/symbols
  46. +2 −0 src/hotspot/share/classfile/classFileParser.cpp
  47. +1 −1 src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
  48. +1 −0 src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
  49. +11 −3 src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
  50. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java
  51. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java
  52. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java
  53. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
  54. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
  55. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java
  56. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java
  57. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java
  58. +1 −1 src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java
  59. +9 −2 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
  60. +2 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
  61. +4 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
  62. +1 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
  63. +1 −1 .../org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java
  64. +1 −1 test/hotspot/jtreg/runtime/modules/sealedP1/SuperClass.jcod
  65. +1 −1 test/hotspot/jtreg/runtime/modules/sealedP1/SuperInterface.jcod
  66. +6 −6 test/hotspot/jtreg/runtime/sealedClasses/GetPermittedSubclasses.jcod
  67. +1 −1 test/hotspot/jtreg/runtime/sealedClasses/Pkg/NotPermitted.jcod
  68. +1 −1 test/hotspot/jtreg/runtime/sealedClasses/Pkg/SealedInterface.jcod
  69. +1 −1 test/hotspot/jtreg/runtime/sealedClasses/planets/Mars.jcod
  70. +1 −1 test/hotspot/jtreg/runtime/sealedClasses/planets/OuterPlanets.jcod
  71. +6 −1 test/jdk/java/lang/module/ClassFileVersionsTest.java
  72. +2 −2 test/langtools/tools/javac/api/TestGetSourceVersions.java
  73. +3 −2 test/langtools/tools/javac/classfiles/ClassVersionChecker.java
  74. +9 −9 test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java
  75. +1 −1 test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
  76. +1 −1 test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
  77. +27 −6 test/langtools/tools/javac/versions/Versions.java
@@ -26,18 +26,18 @@
# Default version, product, and vendor information to use,
# unless overridden by configure

DEFAULT_VERSION_FEATURE=16
DEFAULT_VERSION_FEATURE=17
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=2021-03-16
DEFAULT_VERSION_CLASSFILE_MAJOR=60 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_DATE=2021-09-14
DEFAULT_VERSION_CLASSFILE_MAJOR=61 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="15 16"
DEFAULT_JDK_SOURCE_TARGET_VERSION=16
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="15 16 17"
DEFAULT_JDK_SOURCE_TARGET_VERSION=17
DEFAULT_PROMOTED_VERSION_PRE=ea

LAUNCHER_NAME=openjdk

Large diffs are not rendered by default.

@@ -0,0 +1,143 @@
#
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# ##########################################################
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
# ##########################################################
#
class name javax/annotation/processing/AbstractProcessor
header extends java/lang/Object implements javax/annotation/processing/Processor flags 421
innerclass innerClass javax/tools/Diagnostic$Kind outerClass javax/tools/Diagnostic innerClassName Kind flags 4019
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/annotation/processing/Generated
header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;PARAMETER;})

class name javax/lang/model/SourceVersion
field name RELEASE_16 descriptor Ljavax/lang/model/SourceVersion; flags 4019

class name javax/lang/model/element/ElementKind
-field name RECORD descriptor Ljavax/lang/model/element/ElementKind;
-field name RECORD_COMPONENT descriptor Ljavax/lang/model/element/ElementKind;
-field name BINDING_VARIABLE descriptor Ljavax/lang/model/element/ElementKind;
field name RECORD descriptor Ljavax/lang/model/element/ElementKind; flags 4019
field name RECORD_COMPONENT descriptor Ljavax/lang/model/element/ElementKind; flags 4019
field name BINDING_VARIABLE descriptor Ljavax/lang/model/element/ElementKind; flags 4019

class name javax/lang/model/element/ElementVisitor
-method name visitRecordComponent descriptor (Ljavax/lang/model/element/RecordComponentElement;Ljava/lang/Object;)Ljava/lang/Object;
method name visitRecordComponent descriptor (Ljavax/lang/model/element/RecordComponentElement;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljavax/lang/model/element/RecordComponentElement;TP;)TR;

class name javax/lang/model/element/RecordComponentElement
header extends java/lang/Object implements javax/lang/model/element/Element flags 601

class name javax/lang/model/element/TypeElement
-method name getRecordComponents descriptor ()Ljava/util/List;
method name getRecordComponents descriptor ()Ljava/util/List; flags 1 signature ()Ljava/util/List<+Ljavax/lang/model/element/RecordComponentElement;>;

class name javax/lang/model/element/UnknownAnnotationValueException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/element/UnknownDirectiveException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass javax/lang/model/element/ModuleElement$Directive outerClass javax/lang/model/element/ModuleElement innerClassName Directive flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/element/UnknownElementException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/type/MirroredTypeException
header extends javax/lang/model/type/MirroredTypesException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/type/MirroredTypesException
header extends java/lang/RuntimeException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/type/UnknownTypeException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/util/AbstractAnnotationValueVisitor14
header extends javax/lang/model/util/AbstractAnnotationValueVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/AbstractElementVisitor14
header extends javax/lang/model/util/AbstractElementVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/AbstractTypeVisitor14
header extends javax/lang/model/util/AbstractTypeVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/AbstractTypeVisitor6
header extends java/lang/Object implements javax/lang/model/type/TypeVisitor flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljava/lang/Object;Ljavax/lang/model/type/TypeVisitor<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_6;)

class name javax/lang/model/util/AbstractTypeVisitor7
header extends javax/lang/model/util/AbstractTypeVisitor6 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor6<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_7;)

class name javax/lang/model/util/AbstractTypeVisitor8
header extends javax/lang/model/util/AbstractTypeVisitor7 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor7<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_8;)

class name javax/lang/model/util/ElementFilter
-method name recordComponentsIn descriptor (Ljava/lang/Iterable;)Ljava/util/List;
-method name recordComponentsIn descriptor (Ljava/util/Set;)Ljava/util/Set;
method name recordComponentsIn descriptor (Ljava/lang/Iterable;)Ljava/util/List; flags 9 signature (Ljava/lang/Iterable<+Ljavax/lang/model/element/Element;>;)Ljava/util/List<Ljavax/lang/model/element/RecordComponentElement;>;
method name recordComponentsIn descriptor (Ljava/util/Set;)Ljava/util/Set; flags 9 signature (Ljava/util/Set<+Ljavax/lang/model/element/Element;>;)Ljava/util/Set<Ljavax/lang/model/element/RecordComponentElement;>;

class name javax/lang/model/util/ElementKindVisitor14
header extends javax/lang/model/util/ElementKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/ElementKindVisitor6
-method name visitTypeAsRecord descriptor (Ljavax/lang/model/element/TypeElement;Ljava/lang/Object;)Ljava/lang/Object;
method name visitTypeAsRecord descriptor (Ljavax/lang/model/element/TypeElement;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljavax/lang/model/element/TypeElement;TP;)TR;

class name javax/lang/model/util/ElementScanner14
header extends javax/lang/model/util/ElementScanner9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementScanner9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/Elements
-method name recordComponentFor descriptor (Ljavax/lang/model/element/ExecutableElement;)Ljavax/lang/model/element/RecordComponentElement;
method name recordComponentFor descriptor (Ljavax/lang/model/element/ExecutableElement;)Ljavax/lang/model/element/RecordComponentElement; flags 1

class name javax/lang/model/util/SimpleAnnotationValueVisitor14
header extends javax/lang/model/util/SimpleAnnotationValueVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/SimpleElementVisitor14
header extends javax/lang/model/util/SimpleElementVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/SimpleTypeVisitor14
header extends javax/lang/model/util/SimpleTypeVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/lang/model/util/TypeKindVisitor14
header extends javax/lang/model/util/TypeKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/TypeKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_16;)

class name javax/tools/SimpleJavaFileObject
header extends java/lang/Object implements javax/tools/JavaFileObject flags 21
innerclass innerClass javax/tools/JavaFileObject$Kind outerClass javax/tools/JavaFileObject innerClassName Kind flags 4019
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/tools/ToolProvider
header extends java/lang/Object flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name <init> descriptor ()V

@@ -0,0 +1,36 @@
#
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# ##########################################################
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
# ##########################################################
#
class name java/awt/datatransfer/Clipboard
header extends java/lang/Object flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name java/awt/datatransfer/DataFlavor
header extends java/lang/Object implements java/io/Externalizable,java/lang/Cloneable flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

1 comment on commit 6be1f56

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 6be1f56 Dec 10, 2020

Please sign in to comment.