8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570) #1221

lahodaj · 2020-11-16T10:32:00Z

Based on Bernard's code from:
http://mail.openjdk.java.net/pipermail/compiler-dev/2020-October/015225.html

Capturing anonymous classes inside lambdas may fail to compile, because:
-the captured variables are not detected correctly, because LambdaToMethod...captureLocalClassDefs needs to find the AST node for the given ClassSymbol, but it has not yet been added into the localClassDefs. The proposed solution is to re-order the tasks done for JCNewClass, and call the super implementation sooner. This will enter the ClassSymbol and corresponding AST node into localClassDefs before the capture variables detection.
-inside the anonymous class definition, some references to the captured variables are replaced using a map that maps captured variables for lambdas (lambdaTranslationMap) - but inside the anonymous class, there the captured variables should be mapped using the anonymous class' map/proxies (to fields). The proposed solution is to clear lambdaTranslationMap before processing the anonymous class body.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570)

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer) ⚠️ Review applies to 288dac2

Contributors

Bernard Blaser <bsrbnd@openjdk.org>

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1221/head:pull/1221
$ git checkout pull/1221

…e.java:570)

lahodaj · 2020-11-16T10:32:40Z

/contributor bsrbnd

bridgekeeper · 2020-11-16T10:32:48Z

👋 Welcome back jlahoda! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2020-11-16T10:33:50Z

@lahodaj Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

/contributor add @openjdk-bot
/contributor add duke
/contributor add J. Duke <duke@openjdk.org>

openjdk · 2020-11-16T10:34:17Z

@lahodaj The following label will be automatically applied to this pull request:

compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2020-11-16T10:38:02Z

Webrevs

01: Full - Incremental (0f8415e)
00: Full (288dac2)

lahodaj · 2020-11-16T10:48:16Z

/contributor add bsrbnd

openjdk · 2020-11-16T10:48:26Z

@lahodaj
Contributor Bernard Blaser <bsrbnd@openjdk.org> successfully added.

hltj · 2020-11-27T13:17:19Z

Great! This fix the issue I have met when I trying to fix another issue (#1479).

My minimal reproducing code is:

class Main {
    static Runnable runnable = () -> {
        String s0 = "hello";

        class Local {
            int i = s0.length();
        }

        Runnable dummy = () -> new Local() {
        };
    };
}

vicente-romero-oracle

looks sensible, accepted with minor comment

vicente-romero-oracle · 2020-12-07T19:44:42Z

test/langtools/tools/javac/lambda/LambdaConv30.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.


nit: the copy year should be 2020 only

openjdk · 2020-12-07T19:45:19Z

@lahodaj This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570)

Co-authored-by: Bernard Blaser <bsrbnd@openjdk.org>
Reviewed-by: vromero

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 431 new commits pushed to the master branch:

0201a33: 8255959: Timeouts in VectorConversion tests
d3dddb6: 8256657: Add cross-compiled build for Windows+Arm64 to submit workflow
616b1f1: 8257516: define test group for manual tests
5bdce9b: 8257639: Update usage of "type" terminology in java.lang.Enum & java.lang.Record
b4615c6: 8256580: Fault in new grid display
df55ecd: 8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
fae7961: 8257884: Re-enable sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java as automatic test
79f1dfb: 8255987: JDI tests fail with com.sun.jdi.ObjectCollectedException
9ce3d80: 8257887: java/foreign/TestSegments.java test fails on 32-bit after JDK-8257186
10da767: 8257847: Tiered should publish MDO data pointer for interpreter after profile start
... and 421 more: https://git.openjdk.java.net/jdk/compare/ac3948930ef2b188401d67f20f730fefe7d15e1e...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

lahodaj · 2020-12-09T16:49:20Z

/integrate

openjdk · 2020-12-09T16:50:17Z

@lahodaj Since your change was applied there have been 435 commits pushed to the master branch:

cf62b0a: 8257518: LogCompilation: java.lang.InternalError with JFR turned on
6c69eca: 8257973: UTIL_LOOKUP_PROGS should only find executable files
6eff931: 8256950: Add record attribute support to symbol generator CreateSymbols
f148915: 8245107: Use Unified Logging in trace_method_handle_stub()
0201a33: 8255959: Timeouts in VectorConversion tests
d3dddb6: 8256657: Add cross-compiled build for Windows+Arm64 to submit workflow
616b1f1: 8257516: define test group for manual tests
5bdce9b: 8257639: Update usage of "type" terminology in java.lang.Enum & java.lang.Record
b4615c6: 8256580: Fault in new grid display
df55ecd: 8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
... and 425 more: https://git.openjdk.java.net/jdk/compare/ac3948930ef2b188401d67f20f730fefe7d15e1e...master

Your commit was automatically rebased without conflicts.

Pushed as commit bd22aa5.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Cod…

288dac2

…e.java:570)

openjdk bot added the rfr label Nov 16, 2020

openjdk bot added the compiler label Nov 16, 2020

hltj mentioned this pull request Nov 27, 2020

8258897: wrong translation of capturing local classes inside nested lambdas #1479

Closed

3 tasks

vicente-romero-oracle approved these changes Dec 7, 2020

View changes

openjdk bot added the ready label Dec 7, 2020

Correcting copyright year.

0f8415e

openjdk bot closed this Dec 9, 2020

openjdk bot added integrated and removed ready rfr labels Dec 9, 2020

openjdk / jdk Public

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570) #1221

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570) #1221

lahodaj commented Nov 16, 2020 •

edited by openjdk[bot] bot

lahodaj commented Nov 16, 2020

bridgekeeper bot commented Nov 16, 2020

openjdk bot commented Nov 16, 2020

openjdk bot commented Nov 16, 2020

mlbridge bot commented Nov 16, 2020 •

edited

lahodaj commented Nov 16, 2020

openjdk bot commented Nov 16, 2020

hltj commented Nov 27, 2020 •

edited

vicente-romero-oracle left a comment

vicente-romero-oracle Dec 7, 2020

openjdk bot commented Dec 7, 2020 •

edited

lahodaj commented Dec 9, 2020

openjdk bot commented Dec 9, 2020

		@@ -0,0 +1,54 @@
		/*
		* Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.

openjdk / jdk Public

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570) #1221

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570) #1221

Conversation

lahodaj commented Nov 16, 2020 • edited by openjdk[bot] bot

Progress

Issue

Reviewers

Contributors

Download

lahodaj commented Nov 16, 2020

bridgekeeper bot commented Nov 16, 2020

openjdk bot commented Nov 16, 2020

openjdk bot commented Nov 16, 2020

mlbridge bot commented Nov 16, 2020 • edited

Webrevs

lahodaj commented Nov 16, 2020

openjdk bot commented Nov 16, 2020

hltj commented Nov 27, 2020 • edited

vicente-romero-oracle left a comment

vicente-romero-oracle Dec 7, 2020

Choose a reason for hiding this comment

openjdk bot commented Dec 7, 2020 • edited

lahodaj commented Dec 9, 2020

openjdk bot commented Dec 9, 2020

lahodaj commented Nov 16, 2020 •

edited by openjdk[bot] bot

mlbridge bot commented Nov 16, 2020 •

edited

hltj commented Nov 27, 2020 •

edited

openjdk bot commented Dec 7, 2020 •

edited