Merge master

[openjdk-bot]

Hi all,

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

The following files contains merge conflicts:

• src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
• src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
• src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
• src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java

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 patterns-stage-2
$ git pull https://github.com/openjdk/amber.git patterns-stage-2

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

# Merge the target branch
$ git merge patterns-stage-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-73:73

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

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 70

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/amber/pull/70.diff

[bridgekeeper[bot]]

:wave: Welcome back duke! A progress list of the required criteria for merging this PR into patterns-stage-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[bot]]

Webrevs

• 00: Merge conflicts (patterns-stage-2) (e66fd6f0aa43356ab4b4361d6d332e5e3bcabeb6)

[bridgekeeper[bot]]

@openjdk-bot This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[bridgekeeper[bot]]

@openjdk-bot This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.