8266252: Streamline AbstractInterpreter::method_kind

Reviewed-by: iklam, coleenp

src/hotspot/share/compiler/compilerOracle.cpp

@@ -32,7 +32,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/klass.hpp"
-#include "oops/method.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"

src/hotspot/share/interpreter/abstractInterpreter.cpp

@@ -39,7 +39,7 @@
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/methodData.hpp"
-#include "oops/method.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/forte.hpp"
 #include "prims/jvmtiExport.hpp"
@@ -110,36 +110,61 @@ AbstractInterpreter::MethodKind AbstractInterpreter::method_kind(const methodHan
   if (m->is_abstract()) return abstract;
 
   // Method handle primitive?
+  vmIntrinsics::ID iid = m->intrinsic_id();
+  if (iid != vmIntrinsics::_none) {
     if (m->is_method_handle_intrinsic()) {
-    vmIntrinsics::ID id = m->intrinsic_id();
+      assert(MethodHandles::is_signature_polymorphic(iid), "must match an intrinsic");
-    assert(MethodHandles::is_signature_polymorphic(id), "must match an intrinsic");
       MethodKind kind = (MethodKind)(method_handle_invoke_FIRST +
-                                   vmIntrinsics::as_int(id) -
+                                    vmIntrinsics::as_int(iid) -
                                     static_cast<int>(vmIntrinsics::FIRST_MH_SIG_POLY));
       assert(kind <= method_handle_invoke_LAST, "parallel enum ranges");
       return kind;
     }
 
+    switch (iid) {
 #ifndef ZERO
-  switch (m->intrinsic_id()) {
       // Use optimized stub code for CRC32 native methods.
-    case vmIntrinsics::_updateCRC32            : return java_util_zip_CRC32_update;
+      case vmIntrinsics::_updateCRC32:       return java_util_zip_CRC32_update;
-    case vmIntrinsics::_updateBytesCRC32       : return java_util_zip_CRC32_updateBytes;
+      case vmIntrinsics::_updateBytesCRC32:  return java_util_zip_CRC32_updateBytes;
-    case vmIntrinsics::_updateByteBufferCRC32  : return java_util_zip_CRC32_updateByteBuffer;
+      case vmIntrinsics::_updateByteBufferCRC32: return java_util_zip_CRC32_updateByteBuffer;
       // Use optimized stub code for CRC32C methods.
-    case vmIntrinsics::_updateBytesCRC32C             : return java_util_zip_CRC32C_updateBytes;
+      case vmIntrinsics::_updateBytesCRC32C: return java_util_zip_CRC32C_updateBytes;
-    case vmIntrinsics::_updateDirectByteBufferCRC32C  : return java_util_zip_CRC32C_updateDirectByteBuffer;
+      case vmIntrinsics::_updateDirectByteBufferCRC32C: return java_util_zip_CRC32C_updateDirectByteBuffer;
       case vmIntrinsics::_intBitsToFloat:    return java_lang_Float_intBitsToFloat;
       case vmIntrinsics::_floatToRawIntBits: return java_lang_Float_floatToRawIntBits;
       case vmIntrinsics::_longBitsToDouble:  return java_lang_Double_longBitsToDouble;
       case vmIntrinsics::_doubleToRawLongBits: return java_lang_Double_doubleToRawLongBits;
+#endif // ZERO
+      case vmIntrinsics::_dsin:              return java_lang_math_sin;
+      case vmIntrinsics::_dcos:              return java_lang_math_cos;
+      case vmIntrinsics::_dtan:              return java_lang_math_tan;
+      case vmIntrinsics::_dabs:              return java_lang_math_abs;
+      case vmIntrinsics::_dlog:              return java_lang_math_log;
+      case vmIntrinsics::_dlog10:            return java_lang_math_log10;
+      case vmIntrinsics::_dpow:              return java_lang_math_pow;
+      case vmIntrinsics::_dexp:              return java_lang_math_exp;
+      case vmIntrinsics::_fmaD:              return java_lang_math_fmaD;
+      case vmIntrinsics::_fmaF:              return java_lang_math_fmaF;
+      case vmIntrinsics::_Reference_get:     return java_lang_ref_reference_get;
+      case vmIntrinsics::_dsqrt:
+        // _dsqrt will be selected for both Math::sqrt and StrictMath::sqrt, but the latter
+        // is native. Keep treating it like a native method in the interpreter
+        assert(m->name() == vmSymbols::sqrt_name() &&
+               (m->klass_name() == vmSymbols::java_lang_Math() ||
+                m->klass_name() == vmSymbols::java_lang_StrictMath()), "must be");
+        return m->is_native() ? native : java_lang_math_sqrt;
+      case vmIntrinsics::_Object_init:
+        if (RegisterFinalizersAtInit && m->code_size() == 1) {
+          // We need to execute the special return bytecode to check for
+          // finalizer registration so create a normal frame.
+          return zerolocals;
+        }
+        break;
       default: break;
     }
-#endif // ZERO
+  }
 
   // Native method?
-  // Note: This test must come _before_ the test for intrinsic
-  //       methods. See also comments below.
   if (m->is_native()) {
     assert(!m->is_method_handle_intrinsic(), "overlapping bits here, watch out");
     return m->is_synchronized() ? native_synchronized : native;
@@ -150,41 +175,11 @@ AbstractInterpreter::MethodKind AbstractInterpreter::method_kind(const methodHan
     return zerolocals_synchronized;
   }
 
-  if (RegisterFinalizersAtInit && m->code_size() == 1 &&
-      m->intrinsic_id() == vmIntrinsics::_Object_init) {
-    // We need to execute the special return bytecode to check for
-    // finalizer registration so create a normal frame.
-    return zerolocals;
-  }
-
   // Empty method?
   if (m->is_empty_method()) {
     return empty;
   }
 
-  // Special intrinsic method?
-  // Note: This test must come _after_ the test for native methods,
-  //       otherwise we will run into problems with JDK 1.2, see also
-  //       TemplateInterpreterGenerator::generate_method_entry() for
-  //       for details.
-  switch (m->intrinsic_id()) {
-    case vmIntrinsics::_dsin  : return java_lang_math_sin  ;
-    case vmIntrinsics::_dcos  : return java_lang_math_cos  ;
-    case vmIntrinsics::_dtan  : return java_lang_math_tan  ;
-    case vmIntrinsics::_dabs  : return java_lang_math_abs  ;
-    case vmIntrinsics::_dsqrt : return java_lang_math_sqrt ;
-    case vmIntrinsics::_dlog  : return java_lang_math_log  ;
-    case vmIntrinsics::_dlog10: return java_lang_math_log10;
-    case vmIntrinsics::_dpow  : return java_lang_math_pow  ;
-    case vmIntrinsics::_dexp  : return java_lang_math_exp  ;
-    case vmIntrinsics::_fmaD  : return java_lang_math_fmaD ;
-    case vmIntrinsics::_fmaF  : return java_lang_math_fmaF ;
-
-    case vmIntrinsics::_Reference_get
-                              : return java_lang_ref_reference_get;
-    default                   : break;
-  }
-
   // Getter method?
   if (m->is_getter()) {
     return getter;

src/hotspot/share/oops/method.cpp

@@ -620,11 +620,6 @@ void Method::compute_from_signature(Symbol* sig) {
   constMethod()->set_fingerprint(fp.fingerprint());
 }
 
-bool Method::is_empty_method() const {
-  return  code_size() == 1
-      && *code_base() == Bytecodes::_return;
-}
-
 bool Method::is_vanilla_constructor() const {
   // Returns true if this method is a vanilla constructor, i.e. an "<init>" "()V" method
   // which only calls the superclass vanilla constructor and possibly does stores of

src/hotspot/share/oops/method.inline.hpp

@@ -83,4 +83,9 @@ inline void CompressedLineNumberWriteStream::write_pair(int bci, int line) {
 
 inline bool Method::has_compiled_code() const { return code() != NULL; }
 
+inline bool Method::is_empty_method() const {
+  return  code_size() == 1
+      && *code_base() == Bytecodes::_return;
+}
+
 #endif // SHARE_OOPS_METHOD_INLINE_HPP