Skip to content

Use --opt-cross-module only for assemblies within the servicing bubble #77900

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
merged 3 commits into from
Mar 28, 2025
Merged

Use --opt-cross-module only for assemblies within the servicing bubble #77900

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26c5763
Use --opt-cross-module only for assemblies within the servicing bubble
JoeRobich Mar 28, 2025
2c274aa
Fix up comment
JoeRobich Mar 28, 2025
0a74369
Remove condition
JoeRobich Mar 28, 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
20 changes: 20 additions & 0 deletions ...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,26 @@
</PropertyGroup>
</Target>

<Target Name="AddCrossAssemblyOptimizationSwitch"
DependsOnTargets="ResolveProjectReferences"
AfterTargets="ResolveProjectReferences">
<!-- We used to use - -opt-cross-module:* as a switch, but inlining code
from the runtime led to exposing bugs in crossgen/runtime in not rejecting
native code when the inlined code was stale.
To avoid customer facing bugs in C# extension, we are now taking the more
conservative approach of only inlining code from assemblies in the same
"servicing bubble", which we can most closely approximate here by just
inlining code in assemblies that come from project references. -->
<ItemGroup>
<_OptCrossModuleSwitch
Condition="'%(_ResolvedProjectReferencePaths.ReferenceOutputAssembly)'=='true'"
Include="@(_ResolvedProjectReferencePaths->'--opt-cross-module:%(FileName)')" />
</ItemGroup>
<PropertyGroup>
<PublishReadyToRunCrossgen2ExtraArgs>$(PublishReadyToRunCrossgen2ExtraArgs);@(_OptCrossModuleSwitch)</PublishReadyToRunCrossgen2ExtraArgs>
</PropertyGroup>
</Target>

<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
<ProjectReference Include="..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
Expand Down
Loading