Fix remaining breaks, add a test case for LTO visibility

Author: dmachaj

strings/base_activation.h

@@ -257,8 +257,14 @@ namespace winrt::impl
         }
 
     private:
-
-        size_t& m_count;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
+#endif
+        size_t& m_count; // Field is unused when WINRT_NO_MODULE_LOCK is defined.
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
     };
 
     struct factory_cache_entry_base

test/test/clang_only.cpp

@@ -0,0 +1,28 @@
+#include "pch.h"
+#include <winrt/Windows.Storage.Pickers.h>
+
+#ifdef __clang__
+
+using namespace winrt;
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Pickers;
+
+// winrt::fire_and_forget PickImage()
+// {
+//     FileOpenPicker picker{};
+//     picker.ViewMode(PickerViewMode::Thumbnail);
+//     picker.FileTypeFilter().Append(L".png"); // <--- crash occurred here
+// }
+
+TEST_CASE("clang_library")
+{
+    // PickImage();
+
+    FileOpenPicker picker{};
+    picker.ViewMode(PickerViewMode::Thumbnail);
+    picker.FileTypeFilter().Append(L".png"); // <--- crash occurred here
+
+    REQUIRE(true);
+}
+
+#endif // __clang__

test/test/test.vcxproj

@@ -94,6 +94,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -116,6 +117,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -136,6 +138,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -156,6 +159,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -178,6 +182,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -202,6 +207,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -234,6 +240,7 @@
     <ClCompile Include="box_delegate.cpp" />
     <ClCompile Include="box_guid.cpp" />
     <ClCompile Include="capture.cpp" />
+    <ClCompile Include="clang_only.cpp" />
     <ClCompile Include="coro_foundation.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

test/test_component_base/HierarchyA.cpp

@@ -3,11 +3,11 @@
 
 namespace winrt::test_component_base::implementation
 {
-    HierarchyA::HierarchyA(hstring const& name)
+    HierarchyA::HierarchyA(hstring const& /*name*/)
     {
         throw hresult_not_implemented();
     }
-    HierarchyA::HierarchyA(int32_t dummy, hstring const& name)
+    HierarchyA::HierarchyA(int32_t /*dummy*/, hstring const& /*name*/)
     {
         throw hresult_not_implemented();
     }

test/test_component_base/HierarchyB.cpp

@@ -5,7 +5,7 @@
 
 namespace winrt::test_component_base::implementation
 {
-    HierarchyB::HierarchyB(hstring const& name)
+    HierarchyB::HierarchyB(hstring const& /*name*/)
     {
         throw hresult_not_implemented();
     }

test/test_component_derived/Nested.HierarchyD.cpp

@@ -3,7 +3,7 @@
 
 namespace winrt::test_component_derived::Nested::implementation
 {
-    HierarchyD::HierarchyD(hstring const& name)
+    HierarchyD::HierarchyD(hstring const& /*name*/)
     {
         throw hresult_not_implemented();
     }

test/test_cpp20_no_sourcelocation/custom_error.cpp

@@ -53,7 +53,7 @@ TEST_CASE("custom_error_logger")
     REQUIRE(s_loggerArgs.functionName == nullptr);
 
     REQUIRE(s_loggerArgs.returnAddress);
-    REQUIRE(s_loggerArgs.result == 0x80000018); // E_ILLEGAL_DELEGATE_ASSIGNMENT)
+    REQUIRE(s_loggerArgs.result == static_cast<int32_t>(0x80000018)); // E_ILLEGAL_DELEGATE_ASSIGNMENT)
 
     // Remove global handler
     winrt_throw_hresult_handler = nullptr;

test/test_module_lock_none/main.cpp

@@ -57,11 +57,18 @@ TEST_CASE("module_lock_none")
 
     // Validates that test_component_base is pinned by virtue of it defining WINRT_NO_MODULE_LOCK.
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
+#endif
     auto can_unload = reinterpret_cast<HRESULT(__stdcall*)()>(GetProcAddress(LoadLibraryA("test_component_base.dll"), "DllCanUnloadNow"));
     REQUIRE(can_unload() == S_FALSE);
 
     auto cannot_unload = reinterpret_cast<HRESULT(__stdcall*)()>(GetProcAddress(LoadLibraryA("test_component_derived.dll"), "DllCanUnloadNow"));
     REQUIRE(cannot_unload() == S_OK);
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 }
 
 int main(int const argc, char** argv)