Use compiler-specific WINRT_IMPL_NOINLINE macro for noinline functions (#893)

oldnewthing · web-flow · commit d61cb159be7b · 2021-03-18T06:42:39.000-07:00
diff --git a/strings/base_activation.h b/strings/base_activation.h
@@ -26,7 +26,7 @@ namespace winrt::impl
 
 
     template <bool isSameInterfaceAsIActivationFactory>
-    __declspec(noinline) hresult get_runtime_activation_factory_impl(param::hstring const& name, winrt::guid const& guid, void** result) noexcept
+    WINRT_IMPL_NOINLINE hresult get_runtime_activation_factory_impl(param::hstring const& name, winrt::guid const& guid, void** result) noexcept
     {
         if (winrt_activation_handler)
         {
@@ -339,7 +339,7 @@ namespace winrt::impl
     struct factory_cache_entry : factory_cache_entry_base
     {
         template <typename F>
-        __declspec(noinline) auto call(F&& callback)
+        WINRT_IMPL_NOINLINE auto call(F&& callback)
         {
 #ifdef WINRT_DIAGNOSTICS
             get_diagnostics_info().add_factory<Class>();
diff --git a/strings/base_com_ptr.h b/strings/base_com_ptr.h
@@ -214,7 +214,7 @@ WINRT_EXPORT namespace winrt
             }
         }
 
-        __declspec(noinline) void unconditional_release_ref() noexcept
+        WINRT_IMPL_NOINLINE void unconditional_release_ref() noexcept
         {
             std::exchange(m_ptr, {})->Release();
         }
diff --git a/strings/base_error.h b/strings/base_error.h
@@ -433,7 +433,7 @@ WINRT_EXPORT namespace winrt
         hresult_canceled(take_ownership_from_abi_t) noexcept : hresult_error(impl::error_canceled, take_ownership_from_abi) {}
     };
 
-    [[noreturn]] inline __declspec(noinline) void throw_hresult(hresult const result)
+    [[noreturn]] inline WINRT_IMPL_NOINLINE void throw_hresult(hresult const result)
     {
         if (winrt_throw_hresult_handler)
         {
@@ -513,7 +513,7 @@ WINRT_EXPORT namespace winrt
         throw hresult_error(result, take_ownership_from_abi);
     }
 
-    inline __declspec(noinline) hresult to_hresult() noexcept
+    inline WINRT_IMPL_NOINLINE hresult to_hresult() noexcept
     {
         if (winrt_to_hresult_handler)
         {
@@ -546,7 +546,7 @@ WINRT_EXPORT namespace winrt
         }
     }
 
-    inline __declspec(noinline) hstring to_message()
+    inline WINRT_IMPL_NOINLINE hstring to_message()
     {
         if (winrt_to_message_handler)
         {
diff --git a/strings/base_macros.h b/strings/base_macros.h
@@ -45,6 +45,14 @@
 #undef _WINDOWS_NUMERICS_END_NAMESPACE_
 #endif
 
+#if defined(_MSC_VER)
+#define WINRT_IMPL_NOINLINE __declspec(noinline)
+#elif defined(__GNUC__)
+#define WINRT_IMPL_NOINLINE __attribute__((noinline))
+#else
+#define WINRT_IMPL_NOINLINE
+#endif
+
 #ifdef __IUnknown_INTERFACE_DEFINED__
 #define WINRT_IMPL_IUNKNOWN_DEFINED
 #endif
diff --git a/strings/base_windows.h b/strings/base_windows.h
@@ -257,7 +257,7 @@ WINRT_EXPORT namespace winrt::Windows::Foundation
             }
         }
 
-        __declspec(noinline) void unconditional_release_ref() noexcept
+        WINRT_IMPL_NOINLINE void unconditional_release_ref() noexcept
         {
             std::exchange(m_ptr, {})->Release();
         }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace winrt::impl`
`26`	`26`
`27`	`27`
`28`	`28`	`template <bool isSameInterfaceAsIActivationFactory>`
`29`		`- __declspec(noinline) hresult get_runtime_activation_factory_impl(param::hstring const& name, winrt::guid const& guid, void** result) noexcept`
	`29`	`+ WINRT_IMPL_NOINLINE hresult get_runtime_activation_factory_impl(param::hstring const& name, winrt::guid const& guid, void** result) noexcept`
`30`	`30`	`{`
`31`	`31`	`if (winrt_activation_handler)`
`32`	`32`	`{`
`@@ -339,7 +339,7 @@ namespace winrt::impl`
`339`	`339`	`struct factory_cache_entry : factory_cache_entry_base`
`340`	`340`	`{`
`341`	`341`	`template <typename F>`
`342`		`- __declspec(noinline) auto call(F&& callback)`
	`342`	`+ WINRT_IMPL_NOINLINE auto call(F&& callback)`
`343`	`343`	`{`
`344`	`344`	`#ifdef WINRT_DIAGNOSTICS`
`345`	`345`	`get_diagnostics_info().add_factory<Class>();`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ WINRT_EXPORT namespace winrt`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`217`		`- __declspec(noinline) void unconditional_release_ref() noexcept`
	`217`	`+ WINRT_IMPL_NOINLINE void unconditional_release_ref() noexcept`
`218`	`218`	`{`
`219`	`219`	`std::exchange(m_ptr, {})->Release();`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ WINRT_EXPORT namespace winrt`
`433`	`433`	`hresult_canceled(take_ownership_from_abi_t) noexcept : hresult_error(impl::error_canceled, take_ownership_from_abi) {}`
`434`	`434`	`};`
`435`	`435`
`436`		`- [[noreturn]] inline __declspec(noinline) void throw_hresult(hresult const result)`
	`436`	`+ [[noreturn]] inline WINRT_IMPL_NOINLINE void throw_hresult(hresult const result)`
`437`	`437`	`{`
`438`	`438`	`if (winrt_throw_hresult_handler)`
`439`	`439`	`{`
`@@ -513,7 +513,7 @@ WINRT_EXPORT namespace winrt`
`513`	`513`	`throw hresult_error(result, take_ownership_from_abi);`
`514`	`514`	`}`
`515`	`515`
`516`		`- inline __declspec(noinline) hresult to_hresult() noexcept`
	`516`	`+ inline WINRT_IMPL_NOINLINE hresult to_hresult() noexcept`
`517`	`517`	`{`
`518`	`518`	`if (winrt_to_hresult_handler)`
`519`	`519`	`{`
`@@ -546,7 +546,7 @@ WINRT_EXPORT namespace winrt`
`546`	`546`	`}`
`547`	`547`	`}`
`548`	`548`
`549`		`- inline __declspec(noinline) hstring to_message()`
	`549`	`+ inline WINRT_IMPL_NOINLINE hstring to_message()`
`550`	`550`	`{`
`551`	`551`	`if (winrt_to_message_handler)`
`552`	`552`	`{`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ WINRT_EXPORT namespace winrt::Windows::Foundation`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`
`260`		`- __declspec(noinline) void unconditional_release_ref() noexcept`
	`260`	`+ WINRT_IMPL_NOINLINE void unconditional_release_ref() noexcept`
`261`	`261`	`{`
`262`	`262`	`std::exchange(m_ptr, {})->Release();`
`263`	`263`	`}`