Skip to content

Commit

Permalink
8312229: Crash involving yield, switch and anonymous classes
Browse files Browse the repository at this point in the history
Reviewed-by: vromero
  • Loading branch information
lahodaj committed Jul 26, 2023
1 parent e9daf4a commit 1f81e5b
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1569,8 +1569,15 @@ public void visitSelect(JCFieldAccess tree) {
public void visitVarDef(JCVariableDecl tree) {
TranslationContext<?> context = context();
if (context != null && context instanceof LambdaTranslationContext lambdaContext) {
if (frameStack.head.tree.hasTag(LAMBDA)) {
lambdaContext.addSymbol(tree.sym, LOCAL_VAR);
for (Frame frame : frameStack) {
if (frame.tree.hasTag(VARDEF)) {
//skip variable frames inside a lambda:
continue;
} else if (frame.tree.hasTag(LAMBDA)) {
lambdaContext.addSymbol(tree.sym, LOCAL_VAR);
} else {
break;
}
}
// Check for type variables (including as type arguments).
// If they occur within class nested in a lambda, mark for erasure
Expand Down
44 changes: 44 additions & 0 deletions test/langtools/tools/javac/patterns/T8312229.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* 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 8312229
* @summary Ensure javac does not crash when a variable is used from an anonymous class
* @compile T8312229.java
*/
public class T8312229 {
void test(Object o) {
Runnable r = () -> {
var l = switch (o) {
default -> {
Integer i = 42;
yield new Runnable() {
public void run() {
i.toString(); // should not crash here
}
};
}
};
};
}
}

5 comments on commit 1f81e5b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheRealMDoerr
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1f81e5b May 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheRealMDoerr the backport was successfully created on the branch backport-TheRealMDoerr-1f81e5b1 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1f81e5b1 from the openjdk/jdk repository.

The commit being backported was authored by Jan Lahoda on 26 Jul 2023 and was reviewed by Vicente Romero.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-TheRealMDoerr-1f81e5b1:backport-TheRealMDoerr-1f81e5b1
$ git checkout backport-TheRealMDoerr-1f81e5b1
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-TheRealMDoerr-1f81e5b1

@TheRealMDoerr
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1f81e5b May 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheRealMDoerr the backport was successfully created on the branch backport-TheRealMDoerr-1f81e5b1 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1f81e5b1 from the openjdk/jdk repository.

The commit being backported was authored by Jan Lahoda on 26 Jul 2023 and was reviewed by Vicente Romero.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-TheRealMDoerr-1f81e5b1:backport-TheRealMDoerr-1f81e5b1
$ git checkout backport-TheRealMDoerr-1f81e5b1
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-TheRealMDoerr-1f81e5b1

Please sign in to comment.