infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-17 19:33:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8296012: jshell crashes on mismatched record pattern

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Aggelos Biboudis 2022-11-29 19:33:18 +00:00 committed by Vicente Romero
parent ae5b1f7656
commit 7af6b4b54c
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
View File

@ -778,7 +778,10 @@ public class Flow {
}
}
for (Entry<Symbol, List<JCRecordPattern>> e : deconstructionPatternsBySymbol.entrySet()) {
if (coversDeconstructionFromComponent(pos, targetType, e.getValue(), 0)) {
if (e.getValue().stream().anyMatch(r -> r.nested.size() != r.record.getRecordComponents().size())) {
coveredSymbols.add(syms.errSymbol);
}
else if (coversDeconstructionFromComponent(pos, targetType, e.getValue(), 0)) {
coveredSymbols.add(e.getKey());
}
}

47
test/langtools/jdk/jshell/Test8296012.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (c) 2022, 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 8296012
* @summary jshell crashes on mismatched record pattern
* @build KullaTesting TestingInputStream
* @run testng Test8296012
*/
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;
@Test
public class Test8296012 extends KullaTesting {
public void test() {
assertEval("record Foo(int x, int y) {}");
assertEvalFail("switch (new Foo(1, 2)) { case Foo(int z) -> z; }");
}
@org.testng.annotations.BeforeMethod
public void setUp() {
super.setUp(bc -> bc.compilerOptions("--source", System.getProperty("java.specification.version"), "--enable-preview").remoteVMOptions("--enable-preview"));
}
}