RFR: 8256254: Convert vmIntrinsics::ID to enum class

[Claes Redestad]

On Mon, 16 Nov 2020 20:46:46 GMT, Ioi Lam <iklam at openjdk.org> wrote:

> This PR is follows the same style as https://github.com/openjdk/jdk/pull/276, except this time I am converting `vmIntrinsics::ID` to `vmIntrinsicID`:
> 
> * Convert `vmIntrinsics::SID` to `enum class` to provide better type safety.
> * Also, put this enum class in the top level, so it can be forward-declared. I.e., `enum class vmIntrinsicID : int;`. This avoids excessive inclusion of vmIntrinsics.hpp and vmSymbols.hpp (which were included indirectly by almost every hotspot source files).
>   * vmIntrinsics.hpp: was included 805 times, now included 414 times
>   * vmSymbols.hpp:  was included 805 times, now include 394 times
>   * Note: more #include reduction will be done in [JDK-8256424](https://bugs.openjdk.java.net/browse/JDK-8256424)
> 
> Many files are changed, but most of them are minor
> * Added missing dependencies of vmSymbols.hpp and/or vmIntrinsics.hpp
> * safe conversion between vmIntrinsicID and integer types (see comments around `vmIntrinsics::as_int()`)
> 
> Since we have a lot of references like `vmIntrinsics::_invokeGeneric`, I added aliases like
> 
> static const vmIntrinsicID vmIntrinsics::_invokeGeneric = vmIntrinsicID::_invokeGeneric
> 
> so we don't need to change over a thousand `vmIntrinsics::XXX` to `vmIntrinsicID::XXX`.

Looks ok.

src/hotspot/share/interpreter/abstractInterpreter.cpp line 117:

> 115:     vmIntrinsics::ID id = m->intrinsic_id();
> 116:     assert(MethodHandles::is_signature_polymorphic(id), "must match an intrinsic");
> 117:     MethodKind kind = (MethodKind)( method_handle_invoke_FIRST +

pre-existing extraneous whitespace

src/hotspot/share/interpreter/abstractInterpreter.hpp line 98:

> 96:   static vmIntrinsics::ID method_handle_intrinsic(MethodKind kind) {
> 97:     if (kind >= method_handle_invoke_FIRST && kind <= method_handle_invoke_LAST)
> 98:       return vmIntrinsics::ID_from(static_cast<int>(vmIntrinsics::FIRST_MH_SIG_POLY) + (kind - method_handle_invoke_FIRST) );

pre-existing extra whitespace

src/hotspot/share/classfile/vmIntrinsics.hpp line 1085:

> 1083:   }
> 1084: 
> 1085:   static constexpr size_t number_of_intrinsics() {

Could this be returning int?

src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp line 164:

> 162: 
> 163: JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
> 164:   int len = static_cast<int>(vmIntrinsics::ID_LIMIT) - 1;

vmIntrinsics::number_of_intrinsics?

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

Marked as reviewed by redestad (Reviewer).

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