Skip to content

Commit caeea8a

Browse files
committed
Use maybe_unused to simplify suppression. Move clang LTO file to a smaller project to try and avoid memory exhaustion during link
1 parent 26321c9 commit caeea8a

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

strings/base_activation.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,7 @@ namespace winrt::impl
257257
}
258258

259259
private:
260-
#ifdef __clang__
261-
#pragma clang diagnostic push
262-
#pragma clang diagnostic ignored "-Wunused-private-field"
263-
#endif
264-
size_t& m_count; // Field is unused when WINRT_NO_MODULE_LOCK is defined.
265-
#ifdef __clang__
266-
#pragma clang diagnostic pop
267-
#endif
260+
[[maybe_unused]] size_t& m_count; // Field is unused when WINRT_NO_MODULE_LOCK is defined.
268261
};
269262

270263
struct factory_cache_entry_base

test/test/test.vcxproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
9595
<WarningLevel>Level4</WarningLevel>
9696
<TreatWarningAsError>true</TreatWarningAsError>
97-
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
9897
</ClCompile>
9998
<Link>
10099
<SubSystem>Console</SubSystem>
@@ -117,7 +116,6 @@
117116
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
118117
<WarningLevel>Level4</WarningLevel>
119118
<TreatWarningAsError>true</TreatWarningAsError>
120-
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
121119
</ClCompile>
122120
<Link>
123121
<SubSystem>Console</SubSystem>
@@ -138,7 +136,6 @@
138136
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
139137
<WarningLevel>Level4</WarningLevel>
140138
<TreatWarningAsError>true</TreatWarningAsError>
141-
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
142139
</ClCompile>
143140
<Link>
144141
<SubSystem>Console</SubSystem>
@@ -159,7 +156,6 @@
159156
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
160157
<WarningLevel>Level4</WarningLevel>
161158
<TreatWarningAsError>true</TreatWarningAsError>
162-
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
163159
</ClCompile>
164160
<Link>
165161
<SubSystem>Console</SubSystem>
@@ -182,7 +178,6 @@
182178
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
183179
<WarningLevel>Level4</WarningLevel>
184180
<TreatWarningAsError>true</TreatWarningAsError>
185-
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
186181
</ClCompile>
187182
<Link>
188183
<SubSystem>Console</SubSystem>
@@ -207,7 +202,6 @@
207202
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
208203
<WarningLevel>Level4</WarningLevel>
209204
<TreatWarningAsError>true</TreatWarningAsError>
210-
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
211205
</ClCompile>
212206
<Link>
213207
<SubSystem>Console</SubSystem>
@@ -240,7 +234,6 @@
240234
<ClCompile Include="box_delegate.cpp" />
241235
<ClCompile Include="box_guid.cpp" />
242236
<ClCompile Include="capture.cpp" />
243-
<ClCompile Include="clang_only.cpp" />
244237
<ClCompile Include="coro_foundation.cpp">
245238
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
246239
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

test/test_cpp20/test_cpp20.vcxproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
9696
<WarningLevel>Level4</WarningLevel>
9797
<TreatWarningAsError>true</TreatWarningAsError>
98+
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
9899
</ClCompile>
99100
<Link>
100101
<SubSystem>Console</SubSystem>
@@ -118,6 +119,7 @@
118119
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
119120
<WarningLevel>Level4</WarningLevel>
120121
<TreatWarningAsError>true</TreatWarningAsError>
122+
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
121123
</ClCompile>
122124
<Link>
123125
<SubSystem>Console</SubSystem>
@@ -139,6 +141,7 @@
139141
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
140142
<WarningLevel>Level4</WarningLevel>
141143
<TreatWarningAsError>true</TreatWarningAsError>
144+
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
142145
</ClCompile>
143146
<Link>
144147
<SubSystem>Console</SubSystem>
@@ -160,6 +163,7 @@
160163
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
161164
<WarningLevel>Level4</WarningLevel>
162165
<TreatWarningAsError>true</TreatWarningAsError>
166+
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -flto -fwhole-program-vtables</AdditionalOptions>
163167
</ClCompile>
164168
<Link>
165169
<SubSystem>Console</SubSystem>
@@ -183,6 +187,7 @@
183187
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
184188
<WarningLevel>Level4</WarningLevel>
185189
<TreatWarningAsError>true</TreatWarningAsError>
190+
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
186191
</ClCompile>
187192
<Link>
188193
<SubSystem>Console</SubSystem>
@@ -208,6 +213,7 @@
208213
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
209214
<WarningLevel>Level4</WarningLevel>
210215
<TreatWarningAsError>true</TreatWarningAsError>
216+
<AdditionalOptions Condition="'$(Clang)'=='1'">%(AdditionalOptions) -O3 -flto -fwhole-program-vtables</AdditionalOptions>
211217
</ClCompile>
212218
<Link>
213219
<SubSystem>Console</SubSystem>
@@ -229,6 +235,7 @@
229235
<ItemGroup>
230236
<ClCompile Include="array_span.cpp" />
231237
<ClCompile Include="await_completed.cpp" />
238+
<ClCompile Include="clang_only.cpp" />
232239
<ClCompile Include="custom_error.cpp" />
233240
<ClCompile Include="format.cpp" />
234241
<ClCompile Include="hstring.cpp" />

0 commit comments

Comments
 (0)