[crac] RFR: Merge jdk:jdk-25+26 [v2]

[Timofei Pushkin]

On Fri, 25 Jul 2025 07:02:02 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

>> Since the merge for [JDK-8352675](https://bugs.openjdk.org/browse/JDK-8352675) is split into a separate PR (https://github.com/openjdk/crac/pull/247), I cherry-picked the current version and merging other changes on top of it. It will likely require rebase on top of the final version later.
>> 
>> Attaching output of `--diff-merges=remerge`
>> 
>> <details>
>> 
>> <summary>Conflicts</summary>
>> 
>> 
>> commit 5035f463900712ae47b7e1adfeff609bc1d66116 (HEAD -> merge-jdk, dmitry-crac/merge-jdk)
>> Merge: d61227fe01d c59e44a7aa2
>> Author: Dmitry Cherepanov <dcherepanov at azul.com>
>> Date:   Tue Jul 22 13:30:47 2025 +0400
>> 
>>     Merge with jdk-25+26
>> 
>> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
>> remerge CONFLICT (content): Merge conflict in .github/workflows/main.yml
>> index 8cf745c1cff..02c6f3d2668 100644
>> --- a/.github/workflows/main.yml
>> +++ b/.github/workflows/main.yml
>> @@ -310,11 +310,7 @@ jobs:
>>      uses: ./.github/workflows/build-windows.yml
>>      with:
>>        platform: windows-x64
>> -<<<<<<< d61227fe01d (8352675: Support Intel AVX10 converged vector ISA feature detection)
>>        msvc-toolset-version: '14.44'
>> -=======
>> -      msvc-toolset-version: '14.43'
>> ->>>>>>> c59e44a7aa2 (8357914: TestEmptyBootstrapMethodsAttr.java fails when run with TEST_THREAD_FACTORY=Virtual)
>>        msvc-toolset-architecture: 'x86.x64'
>>        configure-arguments: ${{ github.event.inputs.configure-arguments }}
>>        make-arguments: ${{ github.event.inputs.make-arguments }}
>> @@ -326,11 +322,7 @@ jobs:
>>      uses: ./.github/workflows/build-windows.yml
>>      with:
>>        platform: windows-aarch64
>> -<<<<<<< d61227fe01d (8352675: Support Intel AVX10 converged vector ISA feature detection)
>>        msvc-toolset-version: '14.44'
>> -=======
>> -      msvc-toolset-version: '14.43'
>> ->>>>>>> c59e44a7aa2 (8357914: TestEmptyBootstrapMethodsAttr.java fails when run with TEST_THREAD_FACTORY=Virtual)
>>        msvc-toolset-architecture: 'arm64'
>>        make-target: 'hotspot'
>>        extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
>> @@ -369,17 +361,17 @@ jobs:
>>        runs-on: ubuntu-22.04
>>        debug-suffix: -debug
>>  
>> -  test-linux-x64-static:
>> -    name: linux-x64-static
>> -    needs:
>> -      - build-linux-x64
>> -      - build-linux-x64-static
>> -    uses: ./.github/workflows/test.yml
>> -    with:
>> -      platform: linux-x64
>> -      bootjdk-platform: linux-x64
>> -      runs-on: ubuntu-22.04
>> -      static-suffix: "-st...
>
> Dmitry Cherepanov has updated the pull request incrementally with one additional commit since the last revision:
> 
>   zgc part cleanup

src/hotspot/share/jfr/jfr.cpp line 47:

> 45: #include "oops/klass.hpp"
> 46: #include "runtime/java.hpp"
> 47: #include "runtime/javaThread.hpp"

>From the conflicts resolution:

 #include "jfr/support/jfrKlassExtension.hpp"
 #include "jfr/support/jfrResolution.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
-<<<<<<< d61227fe01d (8352675: Support Intel AVX10 converged vector ISA feature detection)
 #include "memory/resourceArea.hpp"
 #include "runtime/flags/jvmFlag.hpp"
-=======
 #include "jfr/support/methodtracer/jfrMethodTracer.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "oops/klass.hpp"
->>>>>>> c59e44a7aa2 (8357914: TestEmptyBootstrapMethodsAttr.java fails when run with TEST_THREAD_FACTORY=Virtual)
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"

Could you please keep the list sorted?

src/hotspot/share/jfr/jni/jfrUpcalls.cpp line 81:

> 79:     publish_method_timers_for_klass_sym = SymbolTable::new_permanent_symbol("publishMethodTimersForClass");
> 80:     publish_method_timers_for_klass_sig_sym = SymbolTable::new_permanent_symbol("(J)V");
> 81:     initialized = publish_method_timers_for_klass_sig_sym != nullptr;

`initialized` is now set twice

test/hotspot/jtreg/ProblemList.txt line 1:

> 1: #

>From the conflict resolution:

-<<<<<<< d61227fe01d (8352675: Support Intel AVX10 converged vector ISA feature detection)
 runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 # JDK-8310862 was closed but we're still seeing errors with the updated test
 runtime/ClassInitErrors/TestStackOverflowDuringInit.java 8310862 generic-all
-=======
->>>>>>> c59e44a7aa2 (8357914: TestEmptyBootstrapMethodsAttr.java fails when run with TEST_THREAD_FACTORY=Virtual)

JDK-8357924 removed `CreateCoredumpOnCrash.java` from the list, can't we remove it too?

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

PR Review Comment: https://git.openjdk.org/crac/pull/248#discussion_r2230285572
PR Review Comment: https://git.openjdk.org/crac/pull/248#discussion_r2230292373
PR Review Comment: https://git.openjdk.org/crac/pull/248#discussion_r2230312546