Skip to content

Declare public LTO visibility for ABI type declarations #1482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmachaj merged 2 commits into from
Apr 4, 2025
Merged

Declare public LTO visibility for ABI type declarations #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c631e8
Public LTO visibility for ABI type declarations
ZeroMemes Mar 10, 2025
78d1047
Merge branch 'master' into fix/clang-lto-visibility
dmachaj Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ namespace cppwinrt
{
auto format = R"( template <> struct abi<%>
{
struct WINRT_IMPL_NOVTABLE type : inspectable_abi
struct WINRT_IMPL_ABI_DECL type : inspectable_abi
{
)";

Expand All @@ -773,7 +773,7 @@ namespace cppwinrt
{
auto format = R"( template <%> struct abi<%>
{
struct WINRT_IMPL_NOVTABLE type : inspectable_abi
struct WINRT_IMPL_ABI_DECL type : inspectable_abi
{
)";

Expand Down Expand Up @@ -814,7 +814,7 @@ namespace cppwinrt
{
auto format = R"( template <%> struct abi<%>
{
struct WINRT_IMPL_NOVTABLE type : unknown_abi
struct WINRT_IMPL_ABI_DECL type : unknown_abi
{
virtual int32_t __stdcall Invoke(%) noexcept = 0;
};
Expand Down
36 changes: 18 additions & 18 deletions strings/base_abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace winrt::impl
{
template <> struct abi<Windows::Foundation::IUnknown>
{
struct WINRT_IMPL_NOVTABLE type
struct WINRT_IMPL_ABI_DECL type
{
virtual int32_t __stdcall QueryInterface(guid const& id, void** object) noexcept = 0;
virtual uint32_t __stdcall AddRef() noexcept = 0;
Expand All @@ -15,7 +15,7 @@ namespace winrt::impl

template <> struct abi<Windows::Foundation::IInspectable>
{
struct WINRT_IMPL_NOVTABLE type : unknown_abi
struct WINRT_IMPL_ABI_DECL type : unknown_abi
{
virtual int32_t __stdcall GetIids(uint32_t* count, guid** ids) noexcept = 0;
virtual int32_t __stdcall GetRuntimeClassName(void** name) noexcept = 0;
Expand All @@ -27,20 +27,20 @@ namespace winrt::impl

template <> struct abi<Windows::Foundation::IActivationFactory>
{
struct WINRT_IMPL_NOVTABLE type : inspectable_abi
struct WINRT_IMPL_ABI_DECL type : inspectable_abi
{
virtual int32_t __stdcall ActivateInstance(void** instance) noexcept = 0;
};
};

struct WINRT_IMPL_NOVTABLE IAgileObject : unknown_abi {};
struct WINRT_IMPL_ABI_DECL IAgileObject : unknown_abi {};

struct WINRT_IMPL_NOVTABLE IAgileReference : unknown_abi
struct WINRT_IMPL_ABI_DECL IAgileReference : unknown_abi
{
virtual int32_t __stdcall Resolve(guid const& id, void** object) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IMarshal : unknown_abi
struct WINRT_IMPL_ABI_DECL IMarshal : unknown_abi
{
virtual int32_t __stdcall GetUnmarshalClass(guid const& riid, void* pv, uint32_t dwDestContext, void* pvDestContext, uint32_t mshlflags, guid* pCid) noexcept = 0;
virtual int32_t __stdcall GetMarshalSizeMax(guid const& riid, void* pv, uint32_t dwDestContext, void* pvDestContext, uint32_t mshlflags, uint32_t* pSize) noexcept = 0;
Expand All @@ -50,20 +50,20 @@ namespace winrt::impl
virtual int32_t __stdcall DisconnectObject(uint32_t dwReserved) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IGlobalInterfaceTable : unknown_abi
struct WINRT_IMPL_ABI_DECL IGlobalInterfaceTable : unknown_abi
{
virtual int32_t __stdcall RegisterInterfaceInGlobal(void* object, guid const& iid, uint32_t* cookie) noexcept = 0;
virtual int32_t __stdcall RevokeInterfaceFromGlobal(uint32_t cookie) noexcept = 0;
virtual int32_t __stdcall GetInterfaceFromGlobal(uint32_t cookie, guid const& iid, void** object) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IStaticLifetime : inspectable_abi
struct WINRT_IMPL_ABI_DECL IStaticLifetime : inspectable_abi
{
virtual int32_t __stdcall unused() noexcept = 0;
virtual int32_t __stdcall GetCollection(void** value) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IStaticLifetimeCollection : inspectable_abi
struct WINRT_IMPL_ABI_DECL IStaticLifetimeCollection : inspectable_abi
{
virtual int32_t __stdcall Lookup(void*, void**) noexcept = 0;
virtual int32_t __stdcall unused() noexcept = 0;
Expand All @@ -74,23 +74,23 @@ namespace winrt::impl
virtual int32_t __stdcall unused4() noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IWeakReference : unknown_abi
struct WINRT_IMPL_ABI_DECL IWeakReference : unknown_abi
{
virtual int32_t __stdcall Resolve(guid const& iid, void** objectReference) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IWeakReferenceSource : unknown_abi
struct WINRT_IMPL_ABI_DECL IWeakReferenceSource : unknown_abi
{
virtual int32_t __stdcall GetWeakReference(IWeakReference** weakReference) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IRestrictedErrorInfo : unknown_abi
struct WINRT_IMPL_ABI_DECL IRestrictedErrorInfo : unknown_abi
{
virtual int32_t __stdcall GetErrorDetails(bstr* description, int32_t* error, bstr* restrictedDescription, bstr* capabilitySid) noexcept = 0;
virtual int32_t __stdcall GetReference(bstr* reference) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IErrorInfo : unknown_abi
struct WINRT_IMPL_ABI_DECL IErrorInfo : unknown_abi
{
virtual int32_t __stdcall GetGUID(guid* value) noexcept = 0;
virtual int32_t __stdcall GetSource(bstr* value) noexcept = 0;
Expand All @@ -99,7 +99,7 @@ namespace winrt::impl
virtual int32_t __stdcall GetHelpContext(uint32_t* value) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE ILanguageExceptionErrorInfo2 : unknown_abi
struct WINRT_IMPL_ABI_DECL ILanguageExceptionErrorInfo2 : unknown_abi
{
virtual int32_t __stdcall GetLanguageException(void** exception) noexcept = 0;
virtual int32_t __stdcall GetPreviousLanguageExceptionErrorInfo(ILanguageExceptionErrorInfo2** previous) noexcept = 0;
Expand All @@ -109,25 +109,25 @@ namespace winrt::impl

struct ICallbackWithNoReentrancyToApplicationSTA;

struct WINRT_IMPL_NOVTABLE IContextCallback : unknown_abi
struct WINRT_IMPL_ABI_DECL IContextCallback : unknown_abi
{
virtual int32_t __stdcall ContextCallback(int32_t(__stdcall* callback)(com_callback_args*), com_callback_args* args, guid const& iid, int method, void* reserved) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IServerSecurity : unknown_abi
struct WINRT_IMPL_ABI_DECL IServerSecurity : unknown_abi
{
virtual int32_t __stdcall QueryBlanket(uint32_t*, uint32_t*, wchar_t**, uint32_t*, uint32_t*, void**, uint32_t*) noexcept = 0;
virtual int32_t __stdcall ImpersonateClient() noexcept = 0;
virtual int32_t __stdcall RevertToSelf() noexcept = 0;
virtual int32_t __stdcall IsImpersonating() noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IBufferByteAccess : unknown_abi
struct WINRT_IMPL_ABI_DECL IBufferByteAccess : unknown_abi
{
virtual int32_t __stdcall Buffer(uint8_t** value) noexcept = 0;
};

struct WINRT_IMPL_NOVTABLE IMemoryBufferByteAccess : unknown_abi
struct WINRT_IMPL_ABI_DECL IMemoryBufferByteAccess : unknown_abi
{
virtual int32_t __stdcall GetBuffer(uint8_t** value, uint32_t* capacity) noexcept = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion strings/base_delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ namespace winrt::impl
}

template <typename R, typename... Args>
struct WINRT_IMPL_NOVTABLE variadic_delegate_abi : unknown_abi
struct WINRT_IMPL_ABI_DECL variadic_delegate_abi : unknown_abi
{
virtual R invoke(Args const& ...) = 0;
};
Expand Down
9 changes: 8 additions & 1 deletion strings/base_fast_forward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
#define WINRT_IMPL_FF_NOVTABLE
#endif

#if defined(__clang__) && __has_attribute(__lto_visibility_public__)
#define WINRT_IMPL_FF_PUBLIC __attribute__((lto_visibility_public))
#else
#define WINRT_IMPL_FF_PUBLIC
#endif

#if !defined(WINRT_FAST_ABI_SIZE)
#define WINRT_FAST_ABI_SIZE %
#endif
Expand All @@ -36,7 +42,7 @@ namespace winrt::impl
}
};

struct WINRT_IMPL_FF_NOVTABLE inspectable
struct WINRT_IMPL_FF_NOVTABLE WINRT_IMPL_FF_PUBLIC inspectable
{
virtual int32_t __stdcall QueryInterface(guid const& id, void** object) noexcept = 0;
virtual uint32_t __stdcall AddRef() noexcept = 0;
Expand Down Expand Up @@ -137,3 +143,4 @@ namespace winrt
#undef WINRT_IMPL_STRING
#undef WINRT_IMPL_STRING_1
#undef WINRT_IMPL_FF_NOVTABLE
#undef WINRT_IMPL_FF_PUBLIC
8 changes: 8 additions & 0 deletions strings/base_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@
#define WINRT_IMPL_NOVTABLE
#endif

#if defined(__clang__) && __has_attribute(__lto_visibility_public__)
#define WINRT_IMPL_PUBLIC __attribute__((lto_visibility_public))
#else
#define WINRT_IMPL_PUBLIC
#endif

#define WINRT_IMPL_ABI_DECL WINRT_IMPL_NOVTABLE WINRT_IMPL_PUBLIC

#if defined(__clang__)
#define WINRT_IMPL_HAS_DECLSPEC_UUID __has_declspec_attribute(uuid)
#elif defined(_MSC_VER)
Expand Down