stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8335817: javac AssertionError addLocalVar checkNull

Browse Source 
Reviewed-by: vromero, mcimadamore
This commit is contained in:
Jan Lahoda 2024-07-15 11:26:33 +00:00
parent a96de6d8d2
commit 2b0adfc2de
2 changed files with 157 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2024, 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
@ -78,6 +78,7 @@ import com.sun.tools.javac.code.Symbol.MethodSymbol;
import com.sun.tools.javac.code.Symbol.RecordComponent;
import com.sun.tools.javac.code.Type;
import static com.sun.tools.javac.code.TypeTag.BOT;
import static com.sun.tools.javac.code.TypeTag.VOID;
import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.tree.JCTree;
@ -1260,7 +1261,11 @@ public class TransPatterns extends TreeTranslator {
tree.body = translate(tree.body);
if (deconstructorCalls != null) {
if (tree.body instanceof JCExpression value) {
tree.body = make.Block(0, List.of(make.Return(value)));
if (value.type.hasTag(VOID)) {
tree.body = make.Block(0, List.of(make.Exec(value)));
} else {
tree.body = make.Block(0, List.of(make.Return(value)));
}
}
if (tree.body instanceof JCBlock block) {
preparePatternMatchingCatchIfNeeded(block);

150
test/langtools/tools/javac/patterns/MatchExceptionLambdaExpression.java Normal file
View File

@ -0,0 +1,150 @@
/*
* Copyright (c) 2024, 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 8335817
* @summary Verify synthetic catches for deconstruction patterns work properly in expression lambdas
* @compile MatchExceptionLambdaExpression.java
* @run main MatchExceptionLambdaExpression
*/
public class MatchExceptionLambdaExpression {
public static void main(String[] args) {
try {
doRunPrimitiveVoid(new A("", true), o -> checkPrimitiveVoid(o instanceof A(String s, _), true));
throw new AssertionError("Didn't gete the expected exception!");
} catch (MatchException ex) {
if (ex.getCause() instanceof RequestedException) {
//correct
} else {
throw ex;
}
}
try {
doRunPrimitiveVoid(new A("", true), o -> checkVoidBox(o instanceof A(String s, _), true));
throw new AssertionError("Didn't gete the expected exception!");
} catch (MatchException ex) {
if (ex.getCause() instanceof RequestedException) {
//correct
} else {
throw ex;
}
}
try {
doRunPrimitiveVoid(new A("", true), o -> checkNonVoid(o instanceof A(String s, _), true));
throw new AssertionError("Didn't gete the expected exception!");
} catch (MatchException ex) {
if (ex.getCause() instanceof RequestedException) {
//correct
} else {
throw ex;
}
}
try {
doRunVoidBox(new A("", true), o -> checkVoidBox(o instanceof A(String s, _), true));
throw new AssertionError("Didn't gete the expected exception!");
} catch (MatchException ex) {
if (ex.getCause() instanceof RequestedException) {
//correct
} else {
throw ex;
}
}
try {
doRunNonVoid(new A("", true), o -> checkVoidBox(o instanceof A(String s, _), true));
throw new AssertionError("Didn't gete the expected exception!");
} catch (MatchException ex) {
if (ex.getCause() instanceof RequestedException) {
//correct
} else {
throw ex;
}
}
try {
doRunNonVoid(new A("", true), o -> checkNonVoid(o instanceof A(String s, _), true));
throw new AssertionError("Didn't gete the expected exception!");
} catch (MatchException ex) {
if (ex.getCause() instanceof RequestedException) {
//correct
} else {
throw ex;
}
}
}
static void doRunPrimitiveVoid(Object inp, PrimitiveVoidFI toRun) {
toRun.run(inp);
}
static void doRunVoidBox(Object inp, VoidBoxFI toRun) {
toRun.run(inp);
}
static void doRunNonVoid(Object inp, NonVoidFI toRun) {
toRun.run(inp);
}
static void checkPrimitiveVoid(boolean a, boolean shouldNotBeCalled) {
if (shouldNotBeCalled) {
throw new AssertionError("Should not be called.");
}
}
static Void checkVoidBox(boolean a, boolean shouldNotBeCalled) {
if (shouldNotBeCalled) {
throw new AssertionError("Should not be called.");
}
return null;
}
static Object checkNonVoid(boolean a, boolean shouldNotBeCalled) {
if (shouldNotBeCalled) {
throw new AssertionError("Should not be called.");
}
return null;
}
interface PrimitiveVoidFI {
public void run(Object o);
}
interface VoidBoxFI {
public Void run(Object o);
}
interface NonVoidFI {
public Object run(Object o);
}
record A(String s, boolean fail) {
public String s() {
if (fail) {
throw new RequestedException();
}
return s;
}
}
static class RequestedException extends RuntimeException {}
}