8301580: Error recovery does not clear returnResult #12361

lahodaj · 2023-02-01T12:00:58Z

Considering code like:

class C {
    void m
    {
        return;
    }
}

void m is wrapped in an erroneous tree (which is good), and if/when Attr is processing it in visitErroneous, it will create a new Env to attribute the erroneous part.

But, Attr will set a returnResult into the Env's info - and that info is shared with the outter Env, so there will be a returnResult set after visitErroneous. { return ; } is interpreted as an initializer, and there should be an error for the return there, but this error is missing, due to the set returnResult. This will then fail later in Flow with an exception:

$ javac -XDshould-stop.at=FLOW -XDdev /tmp/C.java
/tmp/C.java:3: error: '(' expected
    {
    ^
1 error
An exception has occurred in the compiler (19.0.1-internal). Please file a bug against the Java compiler via the Java bug reporting page (http://bugreport.java.com/) after checking the Bug Database (http://bugs.java.com/) for duplicates. Include your program, the following diagnostic, and the parameters passed to the Java compiler in your report. Thank you.
java.lang.AssertionError
        at jdk.compiler/com.sun.tools.javac.util.Assert.error(Assert.java:155)
        at jdk.compiler/com.sun.tools.javac.util.Assert.check(Assert.java:46)
        at jdk.compiler/com.sun.tools.javac.comp.Flow$AliveAnalyzer.clearPendingExits(Flow.java:589)
        at jdk.compiler/com.sun.tools.javac.comp.Flow$AliveAnalyzer.visitClassDef(Flow.java:544)
        ...

The proposal is to clear the returnResult from the Env's info.

This exception may affect JShell.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8301580: Error recovery does not clear returnResult

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12361/head:pull/12361
$ git checkout pull/12361

Update a local copy of the PR:
$ git checkout pull/12361
$ git pull https://git.openjdk.org/jdk pull/12361/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12361

View PR using the GUI difftool:
$ git pr show -t 12361

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12361.diff

bridgekeeper · 2023-02-01T12:02:08Z

👋 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 · 2023-02-01T12:04:21Z

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

compiler
kulla

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

mlbridge · 2023-02-01T12:07:37Z

Webrevs

01: Full - Incremental (06a70c81)
00: Full (4acb0d43)

vicente-romero-oracle · 2023-02-03T12:26:16Z

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java

@@ -5220,9 +5220,14 @@ public void visitAnnotatedType(JCAnnotatedType tree) {
    public void visitErroneous(JCErroneous tree) {
        if (tree.errs != null) {
            Env<AttrContext> errEnv = env.dup(env.tree);


question: shouldn't we do: env.dup(node, env.info.dup()); instead, that way both env's won't share the info?

I was a little bit on the fence on this, as some code, like Attr.attribClass stores and re-sets the result, while other dupes the info. Let's dupe the info then. Thanks!

I see, I didn't realize of the other pattern, not duping the info, we should probably standardize what we do at some point

vicente-romero-oracle

looks good

openjdk · 2023-02-03T20:18:54Z

@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:

8301580: Error recovery does not clear returnResult

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 107 new commits pushed to the master branch:

e7247b1: 8298872: Update CheckStatus.java for changes to TLS implementation
20579e4: 8299994: java/security/Policy/Root/Root.java fails when home directory is read-only
5962226: 8300891: Deprecate for removal javax.swing.plaf.synth.SynthLookAndFeel.load(URL url)
8b70256: 8301787: java/net/httpclient/SpecialHeadersTest failing after JDK-8301306
bccd55b: 8300295: [AIX] TestDaemonDestroy fails due to !is_primordial_thread assertion
7435b27: 8301744: Remove unused includes of genOopClosures.hpp
6f9106e: 8301306: java/net/httpclient/* fail with -Xcomp
ac9e046: 8301479: Replace NULL with nullptr in os/linux
cf68d9f: 8299155: C2: SubTypeCheckNode::verify() should not produce dependencies / oop pool entries
11804b2: 8301050: Detect Xen Virtualization on Linux aarch64
... and 97 more: https://git.openjdk.org/jdk/compare/c2ebd179388cac5d6e10f98aab9a7ea909f8bc6b...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 · 2023-02-06T12:22:58Z

/integrate

openjdk · 2023-02-06T12:25:19Z

Going to push as commit 522fa13.
Since your change was applied there have been 122 commits pushed to the master branch:

7ac2079: 8301025: ClassCastException in switch with generic record
371a0c4: 8301465: Remove unnecessary nmethod arming in Full GC of Serial/Parallel
716f1df: 8301478: Replace NULL with nullptr in os/bsd
ab528ce: 4934362: see also refers to self
8f195ff: 8298952: All nodes should have type(n) == Value(n) after IGVN
e88fd8c: 8301768: G1: Remove unimplemented HeapRegionRemSet::split_card
96c50a3: 8301752: [IR Framework] Add more IR framework examples
3646c4e: 8301171: Rename sanitizers/address.h to sanitizers/address.hpp
3f3356b: 8301760: Fix possible leak in SpNegoContext dispose
b4cb6c8: 8301743: RISC-V: Add InlineSkippedInstructionsCounter to post-call nops
... and 112 more: https://git.openjdk.org/jdk/compare/c2ebd179388cac5d6e10f98aab9a7ea909f8bc6b...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-02-06T12:25:37Z

@lahodaj Pushed as commit 522fa13.

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

8301580: Error recovery does not clear returnResult

4acb0d4

openjdk bot added the rfr Pull request is ready for review label Feb 1, 2023

openjdk bot added compiler compiler-dev@openjdk.org kulla kulla-dev@openjdk.org labels Feb 1, 2023

vicente-romero-oracle reviewed Feb 3, 2023

View reviewed changes

Using info.dup(), as suggested.

06a70c8

vicente-romero-oracle approved these changes Feb 3, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 3, 2023

openjdk bot added the integrated Pull request has been integrated label Feb 6, 2023

openjdk bot closed this Feb 6, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8301580: Error recovery does not clear returnResult #12361

8301580: Error recovery does not clear returnResult #12361

lahodaj commented Feb 1, 2023 •

edited by openjdk bot

bridgekeeper bot commented Feb 1, 2023

openjdk bot commented Feb 1, 2023

mlbridge bot commented Feb 1, 2023 •

edited

vicente-romero-oracle Feb 3, 2023

lahodaj Feb 3, 2023

vicente-romero-oracle Feb 3, 2023

vicente-romero-oracle left a comment

openjdk bot commented Feb 3, 2023

lahodaj commented Feb 6, 2023

openjdk bot commented Feb 6, 2023

openjdk bot commented Feb 6, 2023

8301580: Error recovery does not clear returnResult #12361

8301580: Error recovery does not clear returnResult #12361

Conversation

lahodaj commented Feb 1, 2023 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Feb 1, 2023

openjdk bot commented Feb 1, 2023

mlbridge bot commented Feb 1, 2023 • edited

Webrevs

vicente-romero-oracle Feb 3, 2023

Choose a reason for hiding this comment

lahodaj Feb 3, 2023

Choose a reason for hiding this comment

vicente-romero-oracle Feb 3, 2023

Choose a reason for hiding this comment

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

openjdk bot commented Feb 3, 2023

lahodaj commented Feb 6, 2023

openjdk bot commented Feb 6, 2023

openjdk bot commented Feb 6, 2023

lahodaj commented Feb 1, 2023 •

edited by openjdk bot

mlbridge bot commented Feb 1, 2023 •

edited