# HG changeset patch # Parent 736908fb53445c4da1adb4026034a1ba960ff8a0 diff -r 736908fb5344 src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu Sep 07 15:55:55 2017 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Tue Sep 12 19:09:25 2017 +0200 @@ -813,7 +813,7 @@ return toP(F.at(pos).VariablePattern(ident(), null)); } else { JCExpression e = term(EXPR | TYPE); - if (token.kind == IDENTIFIER) { + if (token.kind == IDENTIFIER || (lastmode & EXPR) == 0) { return toP(F.at(pos).VariablePattern(ident(), e)); } else { return toP(F.at(pos).ConstantPattern(e)); diff -r 736908fb5344 test/tools/javac/patterns/PatternTypeTest3.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/patterns/PatternTypeTest3.java Tue Sep 12 19:09:25 2017 +0200 @@ -0,0 +1,41 @@ +/* + * 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. + * + * 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. + */ + +/* + * @test + * @bug 8187427 + * @summary Check meaningful errors are produced for incomplete type test patterns. + * @compile/fail/ref=PatternTypeTest3.out -XDrawDiagnostics PatternTypeTest3.java + */ +public class PatternTypeTest3 { + + public static void main(String[] args) { + Object o = new String[0]; + + if (o __matches Object[]) { + System.err.println("It's an array"); + } else { + throw new AssertionError("Broken"); + } + } +} diff -r 736908fb5344 test/tools/javac/patterns/PatternTypeTest3.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/patterns/PatternTypeTest3.out Tue Sep 12 19:09:25 2017 +0200 @@ -0,0 +1,2 @@ +PatternTypeTest3.java:35:33: compiler.err.expected: token.identifier +1 error