[local-methods] Integrated: Merge master

[J.Duke]

On Thu, 11 Jun 2020 22:04:30 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 152 commits from the branch `master`that
> can **not** be merged into the branch `local-methods`:
> The following file contains merge conflicts:
> 
> - src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[amber]) have access to my [personal
> fork](https://github.com/openjdk-bot/amber) 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](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
> [openjdk/amber](https://github.com/openjdk/amber) repository.  # Ensure target branch is up to date $ git checkout
> local-methods $ git pull https://github.com/openjdk/amber local-methods
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +54:openjdk-bot-54
> $ git checkout openjdk-bot-54
> 
> # Merge the target branch
> $ git merge local-methods
> 
> 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 openjdk-bot-54:54
> 
> _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

This pull request has now been integrated.

Changeset: 9e301902
Author:    Vicente Romero <vicente.romero at oracle.com>
URL:       https://git.openjdk.java.net/amber/commit/9e301902
Stats:     1980 lines in 59 files changed: 204 ins; 1660 del; 116 mod

manual merge

-------------

PR: https://git.openjdk.java.net/amber/pull/32