8236490: Compiler bug relating to @NonNull annotation

[lgxbslgx]

Hi all,

If the exception class index in constant pool exceeds 256, the exception_index in TypeAnnotationPosition will not work as expected. Please see the following code:

    public void setCatchInfo(final int catchType, final int startPos) {
        Assert.check(!hasExceptionIndex(),
                     "exception_index is already set");
        Assert.check(catchType >= 0, "Expected a valid catch type");
        this.exception_index = -((catchType | startPos << 8) + 1);  // <------------------------------
    }

If catchType > 256, which means the 8-15 bits is useful, the -((catchType | startPos << 8) + 1); would override these bits.

This patch separates the startPos into a new field exceptionStartPos to solve the bug. And a test case is added.

Thank you for taking the time to review.

Best Regards.

---

Progress

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

Issue

• JDK-8236490: Compiler bug relating to @nonnull annotation

Reviewers

• Vicente Romero (@vicente-romero-oracle - Reviewer)
• Joel Borggrén-Franck (@jbf - Reviewer)

Download

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

[bridgekeeper]

👋 Welcome back lgxbslgx! 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]

@lgxbslgx 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]

Webrevs

• 00: Full (cadf27c)

[vicente-romero-oracle]

looks sensible

[openjdk]

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

8236490: Compiler bug relating to @NonNull annotation

Reviewed-by: vromero, jfranck

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

• abd9310: 8260222: remove unused _thread member SymbolTableLookup
• c538cd8: 8165276: Spec states to invoke the premain method in an agent class if it's public but implementation differs
• 9ea9323: 8254246: SymbolHashMapEntry wastes space
• 982e42b: 8259726: Use of HashSet leads to undefined order in test output
• d6fb9d7: 8255464: Cannot access ModuleTree in a CompilationUnitTree
• 12ccd21: 8260289: Unable to customize module lists after change JDK-8258411
• 73c78c8: 8260329: Update references to TAOCP to latest edition
• 5b0b24b: 8260381: ProblemList com/sun/management/DiagnosticCommandMBean/DcmdMBeanTestCheckJni.java on Win with ZGC
• 47c7dc7: 8258833: Cancel multi-part cipher operations in SunPKCS11 after failures
• ef247ab: 8260308: Update LogCompilation junit to 4.13.1
• ... and 197 more: https://git.openjdk.java.net/jdk/compare/c338f1167f2ab0c1a35876419db914dce844d5e8...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vicente-romero-oracle, @jbf) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[lgxbslgx]

/integrate

[openjdk]

@lgxbslgx
Your change (at version cadf27c) is now ready to be sponsored by a Committer.

[lgxbslgx]

@vicente-romero-oracle Could I get your help to sponsor this patch? Thanks a lot.

[jbf]

@lgxbslgx can you rebase on a fresh upstream and I'll sponsor this for you

[jbf]

I think is still trying to be way to clever with compressing the different states into previously 1 int and now 2 ints. However this is an improvement and fixes an issue we have.

[lgxbslgx]

@jbf Thank you. The patch can be integrated directly because the robot doesn't remind of conflict.

[jbf]

/sponsor

[openjdk]

@jbf @lgxbslgx Since your change was applied there have been 207 commits pushed to the master branch:

• abd9310: 8260222: remove unused _thread member SymbolTableLookup
• c538cd8: 8165276: Spec states to invoke the premain method in an agent class if it's public but implementation differs
• 9ea9323: 8254246: SymbolHashMapEntry wastes space
• 982e42b: 8259726: Use of HashSet leads to undefined order in test output
• d6fb9d7: 8255464: Cannot access ModuleTree in a CompilationUnitTree
• 12ccd21: 8260289: Unable to customize module lists after change JDK-8258411
• 73c78c8: 8260329: Update references to TAOCP to latest edition
• 5b0b24b: 8260381: ProblemList com/sun/management/DiagnosticCommandMBean/DcmdMBeanTestCheckJni.java on Win with ZGC
• 47c7dc7: 8258833: Cancel multi-part cipher operations in SunPKCS11 after failures
• ef247ab: 8260308: Update LogCompilation junit to 4.13.1
• ... and 197 more: https://git.openjdk.java.net/jdk/compare/c338f1167f2ab0c1a35876419db914dce844d5e8...master

Your commit was automatically rebased without conflicts.

Pushed as commit 23edb6f.

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