8268670: yield statements doesn't allow ~ or ! unary operators in expression

lgxbslgx · Vicente Romero · commit bca914b29e4c · 2021-06-14T19:02:23.000Z
Reviewed-by: vromero, jlahoda
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -2668,6 +2668,9 @@ List<JCStatement> blockStatement() {
                     case PLUSPLUS: case SUBSUB:
                         isYieldStatement = S.token(2).kind != SEMI;
                         break;
+                    case BANG: case TILDE:
+                        isYieldStatement = S.token(1).kind != SEMI;
+                        break;
                     case LPAREN:
                         int lookahead = 2;
                         int balance = 1;
diff --git a/test/langtools/tools/javac/switchexpr/ExpressionSwitch.java b/test/langtools/tools/javac/switchexpr/ExpressionSwitch.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8206986 8222169 8224031 8240964 8267119
+ * @bug 8206986 8222169 8224031 8240964 8267119 8268670
  * @summary Check expression switch works.
  * @compile/fail/ref=ExpressionSwitch-old.out -source 9 -Xlint:-options -XDrawDiagnostics ExpressionSwitch.java
  * @compile ExpressionSwitch.java
@@ -120,6 +120,26 @@ private Object yieldDisambiguationLiterals(String s) {
         };
     }
 
+    private int yieldUnaryNumberOperator(String s, int a) {
+        return switch (s) {
+            case "a": yield +a;
+            case "b": yield -a;
+            case "c": yield ~a; // intentionally repeated ~a, test the case clause
+            case "d": yield ++a;
+            case "e": yield --a;
+            case "f": yield a++;
+            case "g": yield a--;
+            default: yield ~a; // intentionally repeated ~a, test the default clause
+        };
+    }
+
+    private boolean yieldUnaryNotOperator(String s, boolean b) {
+        return switch (s) {
+            case "a": yield !b; // intentionally repeated !b, test the case clause
+            default: yield !b; // intentionally repeated !b, test the default clause
+        };
+    }
+
     private void localClass(T t) {
         String good = "good";
         class L {
