Skip to content

Commit

Permalink
[NativeAOT] Properly implement System.Linq.Expressions substitution…
Browse files Browse the repository at this point in the history
…s according to the recent refactoring (#89638)

Properly implement substitutions according to the recent refactoring #89308
  • Loading branch information
ivanpovazan committed Jul 31, 2023
1 parent 56ed3ce commit 8c96dd2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
Expand Up @@ -37,9 +37,8 @@
<ReproResponseLines Include="--feature:System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization=false" />
<ReproResponseLines Include="--feature:System.Diagnostics.Tracing.EventSource.IsSupported=false" />
<ReproResponseLines Include="--feature:System.Resources.ResourceManager.AllowCustomResourceTypes=false" />
<ReproResponseLines Include="--feature:System.Linq.Expressions.CanCompileToIL=false" />
<ReproResponseLines Include="--feature:System.Linq.Expressions.CanEmitObjectArrayDelegate=false" />
<ReproResponseLines Include="--feature:System.Linq.Expressions.CanCreateArbitraryDelegates=false" />
<ReproResponseLines Include="--feature:System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported=false" />
</ItemGroup>

<WriteLinesToFile File="$(OutputPath)\compile-with-$(LibrariesConfiguration)-libs.rsp"
Expand Down
Expand Up @@ -41,9 +41,8 @@ public ILCompilerOptionsBuilder (TestCaseMetadataProvider metadataProvider)

Options.FeatureSwitches.Add ("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization", false);
Options.FeatureSwitches.Add ("System.Resources.ResourceManager.AllowCustomResourceTypes", false);
Options.FeatureSwitches.Add ("System.Linq.Expressions.CanCompileToIL", false);
Options.FeatureSwitches.Add ("System.Linq.Expressions.CanEmitObjectArrayDelegate", false);
Options.FeatureSwitches.Add ("System.Linq.Expressions.CanCreateArbitraryDelegates", false);
Options.FeatureSwitches.Add ("System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported", false);
Options.FeatureSwitches.Add ("System.Diagnostics.Debugger.IsSupported", false);
Options.FeatureSwitches.Add ("System.Text.Encoding.EnableUnsafeUTF7Encoding", false);
Options.FeatureSwitches.Add ("System.Diagnostics.Tracing.EventSource.IsSupported", false);
Expand Down
@@ -1,7 +1,13 @@
<linker>
<assembly fullname="System.Linq.Expressions">
<type fullname="System.Linq.Expressions.LambdaExpression">
<method signature="System.Boolean get_CanCompileToIL()" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false" body="stub" value="false" />
</type>
<type fullname="System.Dynamic.Utils.DelegateHelpers">
<method signature="System.Boolean get_CanEmitObjectArrayDelegate()" feature="System.Linq.Expressions.CanEmitObjectArrayDelegate" featurevalue="false" body="stub" value="false" />
</type>
<type fullname="System.Linq.Expressions.Interpreter.CallInstruction">
<method signature="System.Boolean get_CanCreateArbitraryDelegates()" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported" featurevalue="false" body="stub" value="false" />
</type>
</assembly>
</linker>

0 comments on commit 8c96dd2

Please sign in to comment.