From e3e1fe1c16f464108082fbd48ffed279e879bd41 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 28 Mar 2018 20:15:27 +0200 Subject: [PATCH] [corlib] Moves DynamicMethod to mscorlib to work better with wasm (#7875) * [corlib] Moves DynamicMethod to mscorlib to work better with wasm * Bump API snapshot submodule --- external/api-snapshot | 2 +- .../System.Reflection.Emit.Lightweight.dll.sources | 1 - mcs/class/Facades/System.Reflection.Emit.Lightweight/TypeForwarders.cs | 2 -- .../System.Reflection.Emit/DynamicMethod.notsupported.cs} | 0 mcs/class/corlib/corlib.dll.sources | 1 + 5 files changed, 2 insertions(+), 4 deletions(-) rename mcs/class/{Facades/System.Reflection.Emit.Lightweight/DynamicMethod.cs => corlib/System.Reflection.Emit/DynamicMethod.notsupported.cs} (100%) diff --git a/external/api-snapshot b/external/api-snapshot index a5f7aa8c249..008072b87c5 160000 --- a/external/api-snapshot +++ b/external/api-snapshot @@ -1 +1 @@ -Subproject commit a5f7aa8c2494bb965aa9407b9cdca16e4cb0ef5e +Subproject commit 008072b87c5deeac853ed8f783aa348c8e9ae7ee diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.dll.sources b/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.dll.sources index 5d40b81fbf2..719628dc7c6 100644 --- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.dll.sources +++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.dll.sources @@ -1,3 +1,2 @@ TypeForwarders.cs AssemblyInfo.cs -DynamicMethod.cs diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/TypeForwarders.cs b/mcs/class/Facades/System.Reflection.Emit.Lightweight/TypeForwarders.cs index 9fca03abafc..8cb053efa59 100644 --- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/TypeForwarders.cs +++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/TypeForwarders.cs @@ -20,6 +20,4 @@ // THE SOFTWARE. // -#if !FULL_AOT_RUNTIME [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Emit.DynamicMethod))] -#endif diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/DynamicMethod.cs b/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.notsupported.cs similarity index 100% rename from mcs/class/Facades/System.Reflection.Emit.Lightweight/DynamicMethod.cs rename to mcs/class/corlib/System.Reflection.Emit/DynamicMethod.notsupported.cs diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 51d8ee362ac..510b6ee7b2a 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -267,6 +267,7 @@ System.Reflection.Emit/CustomAttributeBuilder.cs System.Reflection.Emit/DerivedTypes.cs System.Reflection.Emit/DynamicILInfo.cs System.Reflection.Emit/DynamicMethod.cs +System.Reflection.Emit/DynamicMethod.notsupported.cs System.Reflection.Emit/EnumBuilder.cs System.Reflection.Emit/EventBuilder.cs System.Reflection.Emit/EventOnTypeBuilderInst.cs -- 2.11.4.GIT