8269354: javac crashes when processing parenthesized pattern in instanceof

lahodaj · lahodaj · commit a8385feb30bd · 2021-07-01T10:10:03.000Z
Reviewed-by: vromero
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -190,6 +190,7 @@ public void visitTypeTest(JCInstanceOf tree) {
                     syms.objectType
                     : tree.expr.type;
             VarSymbol prevCurrentValue = currentValue;
+            bindingContext = new BasicBindingContext();
             try {
                 JCExpression translatedExpr = translate(tree.expr);
                 Symbol exprSym = TreeInfo.symbol(translatedExpr);
@@ -206,16 +207,20 @@ public void visitTypeTest(JCInstanceOf tree) {
                 }
 
                 Type principalType = principalType((JCPattern) tree.pattern);
-                result = makeBinary(Tag.AND,
-                                    makeTypeTest(make.Ident(currentValue), make.Type(principalType)),
-                                    (JCExpression) this.<JCTree>translate(tree.pattern));
+                JCExpression resultExpression=
+                        makeBinary(Tag.AND,
+                                   makeTypeTest(make.Ident(currentValue), make.Type(principalType)),
+                                   (JCExpression) this.<JCTree>translate(tree.pattern));
                 if (currentValue != exprSym) {
-                    result = make.at(tree.pos).LetExpr(make.VarDef(currentValue, translatedExpr),
-                                                        (JCExpression)result).setType(syms.booleanType);
-                    ((LetExpr) result).needsCond = true;
+                    resultExpression =
+                            make.at(tree.pos).LetExpr(make.VarDef(currentValue, translatedExpr),
+                                                      resultExpression).setType(syms.booleanType);
+                    ((LetExpr) resultExpression).needsCond = true;
                 }
+                result = bindingContext.decorateExpression(resultExpression);
             } finally {
                 currentValue = prevCurrentValue;
+                bindingContext.pop();
             }
         } else {
             super.visitTypeTest(tree);
diff --git a/test/langtools/tools/javac/patterns/Parenthesized.java b/test/langtools/tools/javac/patterns/Parenthesized.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8262891
+ * @bug 8262891 8269354
  * @summary Test parenthesized pattern
  * @compile --enable-preview -source ${jdk.version} Parenthesized.java
  * @run main/othervm --enable-preview Parenthesized
@@ -46,6 +46,8 @@ void run() {
         if (o instanceof (String s && s.isEmpty())) {
             System.err.println("OK: " + s);
         }
+        boolean b1 = o instanceof (String s && s.isEmpty());
+        boolean b2 = o instanceof String s && s.isEmpty();
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`/*`
`25`	`25`	`* @test`
`26`		`- * @bug 8262891`
	`26`	`+ * @bug 8262891 8269354`
`27`	`27`	`* @summary Test parenthesized pattern`
`28`	`28`	`* @compile --enable-preview -source ${jdk.version} Parenthesized.java`
`29`	`29`	`* @run main/othervm --enable-preview Parenthesized`
`@@ -46,6 +46,8 @@ void run() {`
`46`	`46`	`if (o instanceof (String s && s.isEmpty())) {`
`47`	`47`	`System.err.println("OK: " + s);`
`48`	`48`	`}`
	`49`	`+ boolean b1 = o instanceof (String s && s.isEmpty());`
	`50`	`+ boolean b2 = o instanceof String s && s.isEmpty();`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`}`