Skip to content

[release/11.0] Fix CoreLib trimming substitutions for interpreter-only CoreCLR #133664

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

Open
github-actions wants to merge 1 commit into
base: release/11.0
Choose a base branch
from
+3 −5
Open

[release/11.0] Fix CoreLib trimming substitutions for interpreter-only CoreCLR #133664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup>
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.DynamicCodeCompiled.xml" Condition="'$(FeatureDynamicCodeCompiled)' == 'true'" />
</ItemGroup>

<!-- Note that various places in SPCL depend on this resource name i.e. TplEventSource -->
Expand Down
0 ...reLib/src/ILLink/ILLink.Substitutions.xml → ...ink.Substitutions.DynamicCodeCompiled.xml
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions ...Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeFeatureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public static void PortablePdb()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124344", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile), nameof(PlatformDetection.IsCoreCLR))]
public static void DynamicCode()
{
Assert.Equal(RuntimeFeature.IsDynamicCodeSupported, RuntimeFeature.IsSupported("IsDynamicCodeSupported"));
Expand All @@ -33,9 +32,8 @@ public static void DynamicCode()

[Fact]
[SkipOnMono("IsDynamicCodeCompiled returns false in cases where mono doesn't support these features")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/124344", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile), nameof(PlatformDetection.IsCoreCLR))]
// The CoreCLR interpreter is not a JIT, so RuntimeFeature.IsDynamicCodeCompiled is false.
[ActiveIssue("https://github.com/dotnet/runtime/issues/123011", typeof(PlatformDetection), nameof(PlatformDetection.IsCoreClrInterpreter))]
// Apple mobile has interpreter-specific expectations below.
[ActiveIssue("https://github.com/dotnet/runtime/issues/123011", typeof(PlatformDetection), nameof(PlatformDetection.IsCoreClrInterpreter), nameof(PlatformDetection.IsNotAppleMobile))]
public static void DynamicCode_Jit()
{
if (PlatformDetection.IsNativeAot)
Expand Down
Loading