RFR: 8240695: Build is broken when cds is disabled after JDK-8232081

[Ioi Lam]

Hi Jie, this looks like the correct fix.

Thanks
- Ioi

On 3/6/20 4:40 PM, jiefu(傅杰) wrote:
> Hi all,
>
>
>
> JBS: https://bugs.openjdk.java.net/browse/JDK-8240695
>
>
>
> Build is broken when cds is disabled.
>
>
>
> It might be fixed by
>
> ------------------------------------
>
> diff -r ba031902229b src/hotspot/share/memory/metaspaceShared.hpp
>
> --- a/src/hotspot/share/memory/metaspaceShared.hpp      Fri Mar 06 18:42:13 2020 -0500
>
> +++ b/src/hotspot/share/memory/metaspaceShared.hpp      Sat Mar 07 08:25:01 2020 +0800
>
> @@ -296,7 +296,7 @@
>
>     }
>
>
>
>     static bool try_link_class(InstanceKlass* ik, TRAPS);
>
> -  static void link_and_cleanup_shared_classes(TRAPS);
>
> +  static void link_and_cleanup_shared_classes(TRAPS) NOT_CDS_RETURN;
>
>
>
>   #if INCLUDE_CDS
>
>     static ReservedSpace reserve_shared_space(size_t size, char* requested_address = NULL);
>
> ------------------------------------
>
>
>
> Could you please review it and give me some advice?
>
>
>
> Thanks a lot.
>
> Best regards,
>
> Jie
>