Skip to content

Commit 3eb06e5

Browse files
authored
Disable PerfMap generation for Apple mobile platforms (#121237)
## Description After #121187 Crossgen2 determines cross-compilation targets by reading Crossgen2Tool.GetMetadata(MetadataKeys.TargetOS). This code path triggers PerfMapWriter, which currentl doesn't support iOS targets. This PR disables PerfMap generation for Apple mobile platforms.
1 parent 3650ff3 commit 3eb06e5

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2424
<PublishReadyToRunComposite Condition="'$(PublishReadyToRunUseCrossgen2)' != 'true' or '$(SelfContained)' != 'true'">false</PublishReadyToRunComposite>
2525
<PublishReadyToRunUseRuntimePackOptimizationData Condition="'$(PublishReadyToRunUseRuntimePackOptimizationData)' == ''">true</PublishReadyToRunUseRuntimePackOptimizationData>
2626
<PublishReadyToRunPerfmapFormatVersion Condition="'$(PublishReadyToRunPerfmapFormatVersion)' == ''">1</PublishReadyToRunPerfmapFormatVersion>
27+
<PublishReadyToRunEmitSymbols Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst'">false</PublishReadyToRunEmitSymbols>
2728
</PropertyGroup>
2829

2930
<!--

src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ private void ProcessInputFileList(
210210
// an input to the ReadyToRunCompiler task
211211
TaskItem r2rCompilationEntry = new(file);
212212
r2rCompilationEntry.SetMetadata(MetadataKeys.OutputR2RImage, outputR2RImage);
213-
if (outputPDBImage != null && ReadyToRunUseCrossgen2 && !_crossgen2IsVersion5)
213+
if (outputPDBImage != null && ReadyToRunUseCrossgen2 && !_crossgen2IsVersion5 && EmitSymbols)
214214
{
215215
r2rCompilationEntry.SetMetadata(MetadataKeys.EmitSymbols, "true");
216216
r2rCompilationEntry.SetMetadata(MetadataKeys.OutputPDBImage, outputPDBImage);

src/tests/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@
547547
<CrossgenCmd>$(CrossgenCmd) -m "$(CORE_ROOT)\StandardOptimizationData.mibc"</CrossgenCmd>
548548

549549
<CrossgenCmd Condition="'$(__CreatePdb)' != ''">$(CrossgenCmd) --pdb</CrossgenCmd>
550-
<CrossgenCmd Condition="'$(__CreatePerfmap)' != ''">$(CrossgenCmd) --perfmap --perfmap-format-version 1</CrossgenCmd>
550+
<CrossgenCmd Condition="'$(__CreatePerfmap)' != '' and '$(TargetsAppleMobile)' != 'true'">$(CrossgenCmd) --perfmap --perfmap-format-version 1</CrossgenCmd>
551551
<CrossgenCmd Condition="'$(__CompositeBuildMode)' != ''">$(CrossgenCmd) --composite</CrossgenCmd>
552552
<CrossgenCmd Condition="'$(__CompositeBuildMode)' == ''">$(CrossgenCmd) --crossgen2-parallelism 1</CrossgenCmd>
553553

0 commit comments

Comments
 (0)