RFR: Fix recent merge errors [v2]
Aleksey Shipilev
shade at openjdk.org
Tue Jun 3 07:03:19 UTC 2025
On Mon, 2 Jun 2025 21:20:23 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:
>> I skipped through current premain-vs-mainline webrev, and noticed a few merge errors.
>>
>> `metaspaceShared.cpp` hunks are obvious duplications. I removed the lines that are actually different from mainline.
>>
>> ~`compilationPolicy.hpp` hunk is a leftover from AOT Profiling. I remember pointing this out to @veresov during mainline review, and we went into mainline without that extra `notify_all`. We should ditch it in premain too.~ Actually, I see test timeouts when that `notify_all` is removed. Filed [JDK-8358343](https://bugs.openjdk.org/browse/JDK-8358343) to figure it out. Yanked the hunk from this PR.
>>
>> Additional testing:
>> - [x] Linux x86_64 server fastdebug, `runtime/cds`
>
> Aleksey Shipilev has updated the pull request incrementally with one additional commit since the last revision:
>
> Put notify_all back
Thanks!
-------------
PR Comment: https://git.openjdk.org/leyden/pull/72#issuecomment-2933784463
More information about the leyden-dev
mailing list