Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2859,6 +2859,7 @@ public void visitNewClass(JCNewClass tree) {
@Override
public void visitLambda(JCLambda tree) {
final Bits prevUninits = new Bits(uninits);
final Bits prevUninitsTry = new Bits(uninitsTry);
final Bits prevInits = new Bits(inits);
int returnadrPrev = returnadr;
int nextadrPrev = nextadr;
Expand Down Expand Up @@ -2886,6 +2887,7 @@ public void visitLambda(JCLambda tree) {
finally {
returnadr = returnadrPrev;
uninits.assign(prevUninits);
uninitsTry.assign(prevUninitsTry);
inits.assign(prevInits);
pendingExits = prevPending;
nextadr = nextadrPrev;
Expand Down
47 changes: 47 additions & 0 deletions test/langtools/tools/javac/lambda/TryWithLambdaFinal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2023, 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 8305672
* @summary DA/DU tracking gets confused by lambda/try combination
* @compile TryWithLambdaFinal.java
*/
class TryWithLambdaFinal {

private final int x;

public TryWithLambdaFinal() {
try {
Runnable r = () -> {
try {
return;
} catch (Exception e) {
throw new AssertionError(e);
}
};
} catch (Exception e) {
}
x = 42; // this should be allowed
}
}