RFR: Merge jdk:master [v2]
J. Duke
duke at openjdk.org
Sat Apr 27 19:30:22 UTC 2024
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 352 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
>
> The following files contains merge conflicts:
>
> - make/autoconf/flags-cflags.m4
> - make/autoconf/toolchain.m4
> - make/common/JdkNativeCompilation.gmk
>
> All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bots/mobile) 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.org/display/skara#Skara-Personalforks) of the [openjdk/mobile](https://github.com/openjdk/mobile) repository.
>
>
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/mobile.git master
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bots/mobile.git +4:openjdk-bot-4
> $ git checkout openjdk-bot-4
>
> # Merge the target branch
> $ git merge master
>
>
> 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 jdk: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-bots/mobile.git openjdk-bot-4:4
>
>
> _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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 353 commits:
- Merge jdk:master
- 8327247: C2 uses up to 2GB of RAM to compile complex string concat in extreme cases
Reviewed-by: mchung, shade
- 8330625: Compilation memory statistic: prevent tearing of the final report
Reviewed-by: kvn, thartmann
- 8331063: Some HttpClient tests don't report leaks
Reviewed-by: dfuchs, vtewari, michaelm
- 8329850: [AIX] Allow loading of different members of same shared library archive
Reviewed-by: mdoerr, mbaesken, stuefe
- 8309881: Qualified name of a type element depends on its origin (source vs class)
Reviewed-by: darcy, jlahoda
- 8329862: libjli GetApplicationHome cleanups and enhance jli tracing
Reviewed-by: clanger, stuefe
- 8331150: RISC-V: Fix "bad AD file" bug
Reviewed-by: fyang
- 8327512: JShell does not work correctly when a class named Object or Throwable is defined
Reviewed-by: asotona
- 8322847: java.lang.classfile.BufWriter should specify @throws for its writeXXX methods
Reviewed-by: psandoz
- ... and 343 more: https://git.openjdk.org/mobile/compare/a4ce2160...7f86db2f
-------------
Changes: https://git.openjdk.org/mobile/pull/24/files
Webrev: https://webrevs.openjdk.org/?repo=mobile&pr=24&range=01
Stats: 97201 lines in 2569 files changed: 44478 ins; 40867 del; 11856 mod
Patch: https://git.openjdk.org/mobile/pull/24.diff
Fetch: git fetch https://git.openjdk.org/mobile.git pull/24/head:pull/24
PR: https://git.openjdk.org/mobile/pull/24
More information about the mobile-dev
mailing list