infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-28 03:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8350344: Cross-build failure: _vptr name conflict

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Boris Ulasevich 2025-02-19 21:02:27 +00:00
parent 4fb70c79c1
commit 92efab90db
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hotspot/share/code/codeBlob.cpp
View File

@ -73,29 +73,29 @@ static_assert(!std::is_polymorphic<UncommonTrapBlob>::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];

10
src/hotspot/share/code/codeBlob.hpp
View File

@ -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

2
src/hotspot/share/code/nmethod.hpp
View File

@ -996,7 +996,7 @@ public:
}
};
static const Vptr _vptr;
static const Vptr _vpntr;
};
#endif // SHARE_CODE_NMETHOD_HPP