Skip to content
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

Jump to bottom

[mono] Add conditional substitution for IsDynamicCodeSupported when targeting ios-like platforms #86971

Merged
merged 3 commits into from
Jun 19, 2023
Merged

[mono] Add conditional substitution for IsDynamicCodeSupported when targeting ios-like platforms #86971

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbdc984
Add conditional substitution for IsDynamicCodeSupported on ios-like p…
ivanpovazan May 31, 2023
682a3c0
Adding a test case
ivanpovazan Jun 8, 2023
b8a2b03
Revert "Adding a test case"
ivanpovazan Jun 16, 2023
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
3 changes: 3 additions & 0 deletions src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.iOS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
<type fullname="System.Runtime.CompilerServices.RuntimeFeature">
<method signature="System.Boolean get_IsDynamicCodeCompiled()" body="stub" value="false" />
</type>
<type fullname="System.Runtime.CompilerServices.RuntimeFeature" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false">
eerhardt marked this conversation as resolved.
Show resolved Hide resolved
<method signature="System.Boolean get_IsDynamicCodeSupported()" body="stub" value="false" />
ivanpovazan marked this conversation as resolved.
Show resolved Hide resolved
</type>
</assembly>
</linker>
1 change: 1 addition & 0 deletions src/tests/FunctionalTests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<InvariantGlobalization Condition="'$(TargetOS)' == 'maccatalyst' and '$(InvariantGlobalization)' == ''">true</InvariantGlobalization>
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
<UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">false</UseNativeHttpHandler>
<DynamicCodeSupport Condition="'$(DynamicCodeSupport)' == '' and '$(MonoForceInterpreter)' != 'true'">false</DynamicCodeSupport>
</PropertyGroup>

<Import Project="..\..\libraries\Directory.Build.props" />
Expand Down
26 changes: 26 additions & 0 deletions src/tests/FunctionalTests/iOS/Device/IsDynamicCodeSupported/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Threading;
using System.Threading.Tasks;
using System.Runtime.InteropServices;

public static class Program
{
[DllImport("__Internal")]
public static extern void mono_ios_set_summary (string value);

public static async Task<int> Main(string[] args)
{
mono_ios_set_summary($"Starting functional test");
Console.WriteLine("Done!");
await Task.Delay(5000);

var runtimeFeatureType = typeof(object).Assembly.GetType("System.Runtime.CompilerServices.RuntimeFeature");
var isDynamicCodeSupportedGetter = runtimeFeatureType?.GetMethod("get_IsDynamicCodeSupported");

// get_IsDynamicCodeSupported should have been trimmed-out (substituted by false)
return isDynamicCodeSupportedGetter is null ? 42 : -1;
ivanpovazan marked this conversation as resolved.
Show resolved Hide resolved
}
}
20 changes: 20 additions & 0 deletions ...onalTests/iOS/Device/IsDynamicCodeSupported/iOS.Device.IsDynamicCodeSupported.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk" TreatAsLocalProperty="MonoForceInterpreter">

<PropertyGroup>
<OutputType>Exe</OutputType>
<MonoForceInterpreter>false</MonoForceInterpreter>
<RunAOTCompilation>true</RunAOTCompilation>
<TestRuntime>true</TestRuntime>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<TargetOS Condition="'$(TargetOS)' == ''">ios</TargetOS>
<MainLibraryFileName>iOS.Device.IsDynamicCodeSupported.Test.dll</MainLibraryFileName>
<IncludesTestRunner>false</IncludesTestRunner>
<ExpectedExitCode>42</ExpectedExitCode>
<EnableAggressiveTrimming Condition="'$(EnableAggressiveTrimming)' == ''">true</EnableAggressiveTrimming>
<MonoEnableLLVM>true</MonoEnableLLVM>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.cs" />
</ItemGroup>
</Project>