[crac] Integrated: Merge jdk:jdk-25+10

[Dmitry Cherepanov]

On Mon, 26 May 2025 22:46:46 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> This PR includes merges for tags between `jdk-25+5` and `jdk-25+10`, attaching output of  `--diff-merges=remerge` for each merge
> 
> <details>
> 
> <summary>jdk-25+5</summary>
> 
> 
> commit 5ae68607f0b679587a60a1aab8b2aadb4105bbb7
> Merge: ed3997056b6 2e00816ac30
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Mon May 19 22:35:02 2025 +0400
> 
>     Merge with jdk-25+5
> 
> 
> </details>
> 
> <details>
> 
> <summary>jdk-25+6</summary>
> 
> 
> commit cc975a31216702e48256ad35e96957c978190027
> Merge: 5ae68607f0b 9c430c92257
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Mon May 26 20:44:57 2025 +0400
> 
>     Merge with jdk-25+6
> 
> diff --git a/src/hotspot/share/compiler/compileLog.cpp b/src/hotspot/share/compiler/compileLog.cpp
> index 4c8165fc7bd..f183d628d45 100644
> --- a/src/hotspot/share/compiler/compileLog.cpp
> +++ b/src/hotspot/share/compiler/compileLog.cpp
> @@ -340,7 +340,7 @@ void CompileLog::finish_log_on_checkpoint(outputStream* file) {
>        // print/print_cr may need to allocate large stack buffer to format
>        // strings, here we use snprintf() and print_raw() instead.
>        file->print_raw("<compilation_log thread='");
> -      jio_snprintf(buf, buflen, UINTX_FORMAT, log->thread_id());
> +      jio_snprintf(buf, buflen, "%zu", log->thread_id());
>        file->print_raw(buf);
>        file->print_raw_cr("'>");
>  
> diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
> remerge CONFLICT (content): Merge conflict in src/hotspot/share/gc/parallel/psParallelCompact.cpp
> index 00bb365dffd..438b6b90740 100644
> --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
> +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
> @@ -1,10 +1,6 @@
>  /*
> -<<<<<<< 5ae68607f0b (Merge with jdk-25+5)
> - * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
> - * Copyright (c) 2019, 2021, Azul Systems, Inc. All rights reserved.
> -=======
>   * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
> ->>>>>>> 9c430c92257 (8336920: ArithmeticException in javax.sound.sampled.AudioInputStream)
> + * Copyright (c) 2019, 2021, Azul Systems, Inc. All rights reserved.
>   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>   *
>   * This code is free software; you can redistribute it and/or modify it
> diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
> remerge CONFLICT (content): Merge conflict in src/hotspot/share/gc/serial/defNewGeneration.cpp...

This pull request has now been integrated.

Changeset: 9279f066
Author:    Dmitry Cherepanov <dcherepanov at openjdk.org>
Committer: Radim Vansa <rvansa at openjdk.org>
URL:       https://git.openjdk.org/crac/commit/9279f066049c38935bd65c52e114dd1ba5308403
Stats:     205176 lines in 4867 files changed: 97022 ins; 87259 del; 20895 mod

Merge jdk:jdk-25+10

Reviewed-by: rvansa

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

PR: https://git.openjdk.org/crac/pull/231