diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp index 3ed00a08e40f2..9b61d9e665090 100644 --- a/src/hotspot/share/code/codeBlob.cpp +++ b/src/hotspot/share/code/codeBlob.cpp @@ -73,29 +73,29 @@ static_assert(!std::is_polymorphic::value, "no virtual metho // Add proxy vtables. // We need only few for now - they are used only from prints. -const nmethod::Vptr nmethod::_vptr; -const BufferBlob::Vptr BufferBlob::_vptr; -const RuntimeStub::Vptr RuntimeStub::_vptr; -const SingletonBlob::Vptr SingletonBlob::_vptr; -const DeoptimizationBlob::Vptr DeoptimizationBlob::_vptr; -const UpcallStub::Vptr UpcallStub::_vptr; +const nmethod::Vptr nmethod::_vpntr; +const BufferBlob::Vptr BufferBlob::_vpntr; +const RuntimeStub::Vptr RuntimeStub::_vpntr; +const SingletonBlob::Vptr SingletonBlob::_vpntr; +const DeoptimizationBlob::Vptr DeoptimizationBlob::_vpntr; +const UpcallStub::Vptr UpcallStub::_vpntr; const CodeBlob::Vptr* CodeBlob::vptr() const { constexpr const CodeBlob::Vptr* array[(size_t)CodeBlobKind::Number_Of_Kinds] = { nullptr/* None */, - &nmethod::_vptr, - &BufferBlob::_vptr, - &AdapterBlob::_vptr, - &VtableBlob::_vptr, - &MethodHandlesAdapterBlob::_vptr, - &RuntimeStub::_vptr, - &DeoptimizationBlob::_vptr, - &SafepointBlob::_vptr, + &nmethod::_vpntr, + &BufferBlob::_vpntr, + &AdapterBlob::_vpntr, + &VtableBlob::_vpntr, + &MethodHandlesAdapterBlob::_vpntr, + &RuntimeStub::_vpntr, + &DeoptimizationBlob::_vpntr, + &SafepointBlob::_vpntr, #ifdef COMPILER2 - &ExceptionBlob::_vptr, - &UncommonTrapBlob::_vptr, + &ExceptionBlob::_vpntr, + &UncommonTrapBlob::_vpntr, #endif - &UpcallStub::_vptr + &UpcallStub::_vpntr }; return array[(size_t)_kind]; diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp index fd9a96a2a6b45..d0ac2bf1b5fa6 100644 --- a/src/hotspot/share/code/codeBlob.hpp +++ b/src/hotspot/share/code/codeBlob.hpp @@ -346,7 +346,7 @@ class BufferBlob: public RuntimeBlob { } }; - static const Vptr _vptr; + static const Vptr _vpntr; }; @@ -434,7 +434,7 @@ class RuntimeStub: public RuntimeBlob { } }; - static const Vptr _vptr; + static const Vptr _vpntr; }; @@ -474,7 +474,7 @@ class SingletonBlob: public RuntimeBlob { } }; - static const Vptr _vptr; + static const Vptr _vpntr; }; @@ -557,7 +557,7 @@ class DeoptimizationBlob: public SingletonBlob { } }; - static const Vptr _vptr; + static const Vptr _vpntr; }; @@ -685,7 +685,7 @@ class UpcallStub: public RuntimeBlob { } }; - static const Vptr _vptr; + static const Vptr _vpntr; }; #endif // SHARE_CODE_CODEBLOB_HPP diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp index 39bf18547d8dd..ac9b1a7098f8d 100644 --- a/src/hotspot/share/code/nmethod.hpp +++ b/src/hotspot/share/code/nmethod.hpp @@ -996,7 +996,7 @@ class nmethod : public CodeBlob { } }; - static const Vptr _vptr; + static const Vptr _vpntr; }; #endif // SHARE_CODE_NMETHOD_HPP