diff options
author | Martin Baulig <mabaul@microsoft.com> | 2019-05-30 19:19:56 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2019-05-30 19:19:55 +0300 |
commit | 19358243eddb0b199925f205b5e0045d4304d306 (patch) | |
tree | 66213d9cf8111ab29ce82a5d7a565b0b3b903aa9 /mcs/class/referencesource | |
parent | b04d31702ec7db2c6f0e46d6c3bdd6885f0d699b (diff) |
[corlib]: Move sre dependency into their own method in `System.RuntimeType`. (#14698)
* [corlib]: Move sre dependency into their own method in `System.RuntimeType`.
Move call to `TypeBuilderInstantiation.MakeGenericType` into a new
`System.RuntimeType.MakeTypeBuilderInstantiation` method to allow the
linker to remove it.
Requires linker PR https://github.com/mono/linker/pull/590.
* Bump linker.
* Bump cecil as well.
* Fix the build.
* Really fix the build.
* Bump API snapshot submodule
* [csproj] Update project files
Diffstat (limited to 'mcs/class/referencesource')
-rw-r--r-- | mcs/class/referencesource/mscorlib/system/rttype.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mcs/class/referencesource/mscorlib/system/rttype.cs b/mcs/class/referencesource/mscorlib/system/rttype.cs index c5d4a4a7e9e..a7122e56661 100644 --- a/mcs/class/referencesource/mscorlib/system/rttype.cs +++ b/mcs/class/referencesource/mscorlib/system/rttype.cs @@ -4306,7 +4306,7 @@ namespace System #pragma warning disable 162 if (!RuntimeFeature.IsDynamicCodeSupported) throw new PlatformNotSupportedException(); - return System.Reflection.Emit.TypeBuilderInstantiation.MakeGenericType(this, instantiation); + return MakeTypeBuilderInstantiation(instantiation); #pragma warning restore 162 #endif } @@ -4337,6 +4337,13 @@ namespace System return ret; } +#if !NETCORE + Type MakeTypeBuilderInstantiation(Type[] instantiation) + { + return System.Reflection.Emit.TypeBuilderInstantiation.MakeGenericType(this, instantiation); + } +#endif + public override bool IsGenericTypeDefinition { get { return RuntimeTypeHandle.IsGenericTypeDefinition(this); } |