Integrated: Fix recent merge errors

[Aleksey Shipilev]

On Mon, 2 Jun 2025 20:12:18 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`

This pull request has now been integrated.

Changeset: dd845008
Author:    Aleksey Shipilev <shade at openjdk.org>
URL:       https://git.openjdk.org/leyden/commit/dd845008ac031c070cd2b282572eeeac4ef978f1
Stats:     3 lines in 1 file changed: 0 ins; 3 del; 0 mod

Fix recent merge errors

Reviewed-by: iveresov, kvn

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

PR: https://git.openjdk.org/leyden/pull/72