[crac] RFR: Merge jdk:jdk-25+26 [v2]
Timofei Pushkin
tpushkin at openjdk.org
Fri Jul 25 07:08:03 UTC 2025
On Fri, 25 Jul 2025 06:43:20 GMT, Timofei Pushkin <tpushkin at openjdk.org> wrote:
>> 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?
`#include "jfr/periodic/jfrOSInterface.hpp"`, which was also [added by us](https://github.com/openjdk/crac/pull/203/files#diff-5653173eea6fc7894f64ff537c902702a34482e0422146a9e890ebabccbc40f5), can also be repositioned properly while we are at it
-------------
PR Review Comment: https://git.openjdk.org/crac/pull/248#discussion_r2230288026
More information about the crac-dev
mailing list