Merge master

[openjdk-bot]

Hi all,

this is an automatically generated pull request to notify you that there are 105 commits from the branch masterthat can not be merged into the branch records-2:

The following file contains merge conflicts:

• src/hotspot/share/classfile/classFileParser.cpp

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/amber repository.

# Ensure target branch is up to date
$ git checkout records-2
$ git pull https://github.com/openjdk/amber.git records-2

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +65:openjdk-bot-65
$ git checkout openjdk-bot-65

# Merge the target branch
$ git merge records-2

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge master'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/amber.git openjdk-bot-65:65

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke

---

Progress

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

Error

 ⚠️ Merge commit message is not Merge, but: Merge master

Testing

	Linux x64	Windows x64	macOS x64
Build	✔️ (5/5 passed)	✔️ (2/2 passed)	✔️ (2/2 passed)
Test (tier1)	✔️ (9/9 passed)	✔️ (9/9 passed)	✔️ (9/9 passed)

Download

$ git fetch https://git.openjdk.java.net/amber pull/62/head:pull/62
$ git checkout pull/62

[bridgekeeper]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (c2d065a)
• 00: Merge conflicts (records-2) (96bb6e7)