8250625: Compiler implementation of Pattern Matching for instanceof (Final)

Reviewed-by: vromero

Author: lahodaj

src/java.base/share/classes/jdk/internal/PreviewFeature.java

@@ -54,7 +54,6 @@
     public boolean essentialAPI() default false;
 
     public enum Feature {
-        PATTERN_MATCHING_IN_INSTANCEOF,
         // 8242284:
         // The TEXT_BLOCKS enum constant is not used in the JDK 15 codebase, but
         // exists to support the bootcycle build of JDK 15. The bootcycle build

src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java

@@ -121,20 +121,9 @@ public enum ElementKind {
     RECORD_COMPONENT,
 
     /**
-     * {@preview Associated with pattern matching for {@code
-     * instanceof}, a preview feature of the Java language.
-     *
-     *           This enum constant is associated with <i>pattern
-     *           matching for {@code 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 binding variable in a pattern .
-     * @since 14
+     * A binding variable in a pattern.
+     * @since 16
      */
-    @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.PATTERN_MATCHING_IN_INSTANCEOF,
-                                 essentialAPI=false)
     BINDING_VARIABLE;
 
     /**

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

@@ -25,34 +25,17 @@
 
 package com.sun.source.tree;
 
-import javax.lang.model.element.Name;
-
 /**
- * {@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 binding pattern tree
  *
- * @since 14
+ * @since 16
  */
 public interface BindingPatternTree extends PatternTree {
 
     /**
-     * Returns the type of the bind variable.
-     * @return the type
+     * Returns the binding variable.
+     * @return the binding variable
      */
-    Tree getType();
-
-    /**
-     * A binding variable name.
-     * @return the name of the binding variable
-     */
-    Name getBinding();
+    VariableTree getVariable();
 
 }
-

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

@@ -49,18 +49,11 @@ public interface InstanceOfTree extends ExpressionTree {
     /**
      * Returns the type for which to check.
      * @return the type
+     * @see #getPattern()
      */
     Tree getType();
 
     /**
-     * {@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.}
-     *
      * Returns the tested pattern, or null if this instanceof does not use
      * a pattern.
      *
@@ -77,7 +70,7 @@ public interface InstanceOfTree extends ExpressionTree {
      * returns null.
      *
      * @return the tested pattern, or null if this instanceof does not use a pattern
-     * @since 14
+     * @since 16
      */
     PatternTree getPattern();
 }

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

@@ -26,17 +26,9 @@
 package com.sun.source.tree;
 
 /**
- * {@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 tree node used as the base class for the different kinds of
- * statements.
+ * patterns.
  *
- * @since 14
+ * @since 16
  */
 public interface PatternTree extends Tree {}

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

@@ -220,17 +220,9 @@ public enum Kind {
         PARENTHESIZED(ParenthesizedTree.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 BindingPatternTree}.
          *
-         * @since 14
+         * @since 16
          */
         BINDING_PATTERN(BindingPatternTree.class),
 

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

@@ -258,19 +258,11 @@ public interface TreeVisitor<R,P> {
     R visitLiteral(LiteralTree 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 BindingPattern node.
      * @param node the node being visited
      * @param p a parameter value
      * @return a result value
-     * @since 14
+     * @since 16
      */
     R visitBindingPattern(BindingPatternTree node, P p);
 

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

@@ -691,7 +691,7 @@ public R visitInstanceOf(InstanceOfTree node, P p) {
      */
     @Override
     public R visitBindingPattern(BindingPatternTree node, P p) {
-        return scan(node.getType(), p);
+        return scan(node.getVariable(), p);
     }
 
     /**

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

@@ -165,9 +165,7 @@ public boolean isEnabled() {
      * @return true, if given feature is a preview feature.
      */
     public boolean isPreview(Feature feature) {
-        if (feature == Feature.PATTERN_MATCHING_IN_INSTANCEOF ||
-            feature == Feature.REIFIABLE_TYPES_INSTANCEOF ||
-            feature == Feature.SEALED_CLASSES)
+        if (feature == Feature.SEALED_CLASSES)
             return true;
         //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
         //When real preview features will be added, this method can be implemented to return 'true'

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

@@ -1855,7 +1855,7 @@ public Name getSimpleName() {
     public static class BindingSymbol extends VarSymbol {
 
         public BindingSymbol(Name name, Type type, Symbol owner) {
-            super(Flags.FINAL | Flags.HASINIT | Flags.MATCH_BINDING, name, type, owner);
+            super(Flags.HASINIT | Flags.MATCH_BINDING, name, type, owner);
         }
 
         public boolean isAliasFor(BindingSymbol b) {