.jcheck/conf

@@ -1,6 +1,30 @@
+;
+; 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.
+;
+; 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.
+;
+
 [general]
-project=jdk
-jbs=JDK
+project=amber
+repository=amber
+jbs=jdk
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
@@ -29,5 +53,6 @@ role=committer
 [checks "issues"]
 pattern=^([124-8][0-9]{6}): (\S.*)$
 
+
 [checks "problemlists"]
 dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp

src/java.base/share/classes/java/lang/Class.java

@@ -4424,17 +4424,22 @@ public ClassDesc[] permittedSubclasses() {
     }
 
     /**
-     * * {@preview Associated with sealed classes, a preview feature of the Java language.
+     * {@preview Associated with sealed classes, a preview feature of the Java language.
      *
      *           This method is associated with <i>sealed classes</i>, a preview
      *           feature of the Java language. Preview features
      *           may be removed in a future release, or upgraded to permanent
      *           features of the Java language.}
      *
-     * Returns {@code true} if and only if this {@code Class} object represents a sealed class or interface.
-     * If this {@code Class} object represents a primitive type, {@code void}, or an array type, this method returns
+     * Returns {@code true} if and only if this {@code Class} object represents
+     * a sealed class or interface. If this {@code Class} object represents a
+     * primitive type, {@code void}, or an array type, this method returns
      * {@code false}.
      *
+     * @apiNote
+     * This method reports on a distinct concept of sealing from
+     * {@link Package#isSealed() Package::isSealed}.
+     *
      * @return {@code true} if and only if this {@code Class} object represents a sealed class or interface.
      *
      * @jls 8.1 Class Declarations

src/java.base/share/classes/java/lang/Package.java

@@ -223,6 +223,10 @@ public String getImplementationVendor() {
     /**
      * Returns true if this package is sealed.
      *
+     * @apiNote
+     * This method reports on a distinct concept of sealing from
+     * {@link Class#isSealed() Class::isSealed}.
+     *
      * @return true if the package is sealed, false otherwise
      */
     public boolean isSealed() {

src/jdk.compiler/share/classes/com/sun/source/tree/DeconstructionPatternTree.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+/**
+ * {@preview Associated with pattern matching for instanceof, a preview feature of
+ *           the Java language.
+ *
+ *           This interface is associated with <i>pattern matching for instanceof</i>, a preview
+ *           feature of the Java language. Preview features
+ *           may be removed in a future release, or upgraded to permanent
+ *           features of the Java language.}
+ *
+ * A deconstruction pattern tree
+ *
+ * @since 15
+ */
+public interface DeconstructionPatternTree extends PatternTree {
+
+    /**
+     * Returns the deconstructed type.
+     * @return the deconstructed type
+     */
+    Tree getDeconstructor();
+
+    /**
+     * Returns the nested patterns.
+     * @return the nested patterns.
+     */
+    List<? extends PatternTree> getNestedPatterns();
+
+}
+

src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java

@@ -234,6 +234,21 @@ public enum Kind {
          */
         BINDING_PATTERN(BindingPatternTree.class),
 
+        /**
+         * {@preview Associated with pattern matching for instanceof, a preview feature of
+         *           the Java language.
+         *
+         *           This enum constant is associated with <i>pattern matching for instanceof</i>, a preview
+         *           feature of the Java language. Preview features
+         *           may be removed in a future release, or upgraded to permanent
+         *           features of the Java language.}
+         *
+         * Used for instances of {@link DeconstructionPatternTree}.
+         *
+         * @since 15
+         */
+        DECONSTRUCTION_PATTERN(DeconstructionPatternTree.class),
+
         /**
          * Used for instances of {@link PrimitiveTypeTree}.
          */

src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java

@@ -274,6 +274,23 @@ public interface TreeVisitor<R,P> {
      */
     R visitBindingPattern(BindingPatternTree node, P p);
 
+    /**
+     * {@preview Associated with pattern matching for instanceof, a preview feature of
+     *           the Java language.
+     *
+     *           This method is associated with <i>pattern matching for instanceof</i>, a preview
+     *           feature of the Java language. Preview features
+     *           may be removed in a future release, or upgraded to permanent
+     *           features of the Java language.}
+     *
+     * Visits an DeconstructionPatternTree node.
+     * @param node the node being visited
+     * @param p a parameter value
+     * @return a result value
+     * @since 15
+     */
+    R visitDeconstructionPattern(DeconstructionPatternTree node, P p);
+
     /**
      * Visits a MethodTree node.
      * @param node the node being visited

src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java

@@ -564,6 +564,19 @@ public R visitBindingPattern(BindingPatternTree node, P p) {
         return defaultAction(node, p);
     }
 
+    /**
+     * {@inheritDoc} This implementation calls {@code defaultAction}.
+     *
+     * @param node {@inheritDoc}
+     * @param p {@inheritDoc}
+     * @return  the result of {@code defaultAction}
+     * @since 15
+     */
+    @Override
+    public R visitDeconstructionPattern(DeconstructionPatternTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     /**
      * {@inheritDoc} This implementation calls {@code defaultAction}.
      *

src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java

@@ -694,6 +694,20 @@ public R visitBindingPattern(BindingPatternTree node, P p) {
         return scan(node.getType(), p);
     }
 
+    /**
+     * {@inheritDoc} This implementation scans the children in left to right order.
+     *
+     * @param node  {@inheritDoc}
+     * @param p  {@inheritDoc}
+     * @return the result of scanning
+     * @since 15
+     */
+    @Override
+    public R visitDeconstructionPattern(DeconstructionPatternTree node, P p) {
+        R r = scan(node.getDeconstructor(), p);
+        return scanAndReduce(node.getNestedPatterns(), p, r);
+    }
+
     /**
      * {@inheritDoc} This implementation scans the children in left to right order.
      *

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java

@@ -166,6 +166,7 @@ public boolean isEnabled() {
      */
     public boolean isPreview(Feature feature) {
         if (feature == Feature.PATTERN_MATCHING_IN_INSTANCEOF ||
+            feature == Feature.DECONSTRUCTION_PATTERNS ||
             feature == Feature.REIFIABLE_TYPES_INSTANCEOF ||
             feature == Feature.RECORDS ||
             feature == Feature.SEALED_CLASSES)

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

@@ -218,6 +218,9 @@ public enum Feature {
         REIFIABLE_TYPES_INSTANCEOF(JDK16, Fragments.FeatureReifiableTypesInstanceof, DiagKind.PLURAL),
         RECORDS(JDK16, Fragments.FeatureRecords, DiagKind.PLURAL),
         SEALED_CLASSES(JDK16, Fragments.FeatureSealedClasses, DiagKind.PLURAL),
+        LAMBDA_PARAMETER_SHADOWING(JDK16),
+        UNDERSCORE_AS_PARAM_NAME(JDK16),
+        DECONSTRUCTION_PATTERNS(JDK16, Fragments.FeatureDeconstructionPatterns, DiagKind.PLURAL),
         ;
 
         enum DiagKind {

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java

@@ -155,6 +155,14 @@ public static Symtab instance(Context context) {
     /** The builtin type of all methods. */
     public final ClassSymbol methodClass;
 
+    /** A common method type for all those method symbols owning a lambda scope.
+     */
+    public final MethodType lambdaScopeMethodType;
+
+    /** A common method type for all those method symbols owning a block scope.
+     */
+    public final MethodType blockScopeMethodType;
+
     /** A symbol for the java.base module.
      */
     public final ModuleSymbol java_base;
@@ -479,6 +487,9 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {
         methodClass = new ClassSymbol(PUBLIC|ACYCLIC, names.Method, noSymbol);
         methodClass.members_field = new Scope.ErrorScope(boundClass);
 
+        lambdaScopeMethodType = new MethodType(List.nil(), voidType, List.nil(), methodClass);
+        blockScopeMethodType = new MethodType(List.nil(), voidType, List.nil(), methodClass);
+
         // Create class to hold all predefined constants and operations.
         predefClass = new ClassSymbol(PUBLIC|ACYCLIC, names.empty, rootPackage);
         WriteableScope scope = WriteableScope.create(predefClass);