8292007: Do not include vmSymbol.hpp in method.hpp

Reviewed-by: coleenp

src/hotspot/cpu/aarch64/continuationEntry_aarch64.inline.hpp

@@ -28,6 +28,7 @@
 #include "runtime/continuationEntry.hpp"
 
 #include "code/codeCache.hpp"
+#include "oops/method.inline.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

@@ -41,6 +41,7 @@
 #include "nativeInst_aarch64.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"

src/hotspot/cpu/x86/continuationEntry_x86.inline.hpp

@@ -27,6 +27,7 @@
 
 #include "runtime/continuationEntry.hpp"
 
+#include "oops/method.inline.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 #include "utilities/macros.hpp"

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

@@ -44,6 +44,7 @@
 #include "memory/universe.hpp"
 #include "oops/compiledICHolder.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"

src/hotspot/share/gc/shared/barrierSetNMethod.cpp

@@ -31,7 +31,7 @@
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
 #include "oops/access.inline.hpp"
-#include "oops/method.hpp"
+#include "oops/method.inline.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/threadWXSetters.inline.hpp"

src/hotspot/share/oops/method.hpp

@@ -25,7 +25,6 @@
 #ifndef SHARE_OOPS_METHOD_HPP
 #define SHARE_OOPS_METHOD_HPP
 
-#include "classfile/vmSymbols.hpp"
 #include "code/compressedStream.hpp"
 #include "compiler/compilerDefinitions.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -736,9 +735,8 @@ public:
 
 
   // Continuation
-  bool is_continuation_enter_intrinsic() const { return intrinsic_id() == vmIntrinsics::_Continuation_enterSpecial; }
-
-  bool is_special_native_intrinsic() const { return is_method_handle_intrinsic() || is_continuation_enter_intrinsic(); }
+  inline bool is_continuation_enter_intrinsic() const;
+  inline bool is_special_native_intrinsic() const;
 
   static Klass* check_non_bcp_klass(Klass* klass);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "oops/method.hpp"
 
+#include "classfile/vmIntrinsics.hpp"
 #include "runtime/atomic.hpp"
 
 inline address Method::from_compiled_entry() const {
@@ -89,4 +90,11 @@ inline bool Method::is_empty_method() const {
       && *code_base() == Bytecodes::_return;
 }
 
+inline bool Method::is_continuation_enter_intrinsic() const {
+  return intrinsic_id() == vmIntrinsics::_Continuation_enterSpecial;
+}
+inline bool Method::is_special_native_intrinsic() const {
+  return is_method_handle_intrinsic() || is_continuation_enter_intrinsic();
+}
+
 #endif // SHARE_OOPS_METHOD_INLINE_HPP

src/hotspot/share/prims/stackwalk.cpp

@@ -31,6 +31,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/universe.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "prims/stackwalk.hpp"

src/hotspot/share/runtime/continuation.cpp

@@ -23,7 +23,9 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/vmSymbols.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
+#include "oops/method.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"

src/hotspot/share/runtime/continuationEntry.cpp

@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "code/compiledIC.hpp"
 #include "code/nmethod.hpp"
+#include "oops/method.inline.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"
 #include "runtime/frame.inline.hpp"

src/hotspot/share/runtime/continuationFreezeThaw.cpp

@@ -40,6 +40,7 @@
 #include "logging/logStream.hpp"
 #include "metaprogramming/conditional.hpp"
 #include "oops/access.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/stackChunkOop.inline.hpp"

src/hotspot/share/runtime/frame.cpp

@@ -37,7 +37,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/markWord.hpp"
-#include "oops/method.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/stackChunkOop.inline.hpp"

src/hotspot/share/runtime/vframe.cpp

@@ -36,6 +36,7 @@
 #include "interpreter/oopMapCache.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/stackChunkOop.hpp"
 #include "prims/jvmtiExport.hpp"