Integrated: 8259475: Fix bad merge in compilerOracle

[Aleksey Shipilev]

On Fri, 8 Jan 2021 10:41:53 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

> When reapplying JDK-8252505 to jdk/jdk, I stumbled upon the bad merge.
> 
> This was the original changeset:
>   https://github.com/openjdk/jdk16/commit/ad456787
> 
> This was the merge:
>  https://github.com/openjdk/jdk/commit/555641ede5e234c936fca98436ef6aeace2351fc
> 
> Note that not all blocks were removed from compilerOracle.
> 
> Attention @JesperIRL.
> 
> Additional testing:
>   - [x] Patch from JDK-8252505 applies now
>   - [x] No refrerences to "blackhole" or "Blackhole" in `src/hotspot` now

This pull request has now been integrated.

Changeset: 2806bf2e
Author:    Aleksey Shipilev <shade at openjdk.org>
URL:       https://git.openjdk.java.net/jdk/commit/2806bf2e
Stats:     17 lines in 2 files changed: 0 ins; 17 del; 0 mod

8259475: Fix bad merge in compilerOracle

Reviewed-by: redestad, thartmann

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

PR: https://git.openjdk.java.net/jdk/pull/2002