From 008a0fb04a144f4ab7e8780b39924deae627d094 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Sun, 12 May 2019 17:09:08 -0700
Subject: [PATCH] [corlib] Avoid preserving all fields of AppDomain. Don't
 preserve fields of Marshal, the runtime doesn't need them.

---
 mcs/class/corlib/LinkerDescriptor/mscorlib.xml | 5 +++--
 mcs/class/corlib/System/AppDomain.cs           | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mcs/class/corlib/LinkerDescriptor/mscorlib.xml b/mcs/class/corlib/LinkerDescriptor/mscorlib.xml
index 579535acc50..c5b53a8b976 100644
--- a/mcs/class/corlib/LinkerDescriptor/mscorlib.xml
+++ b/mcs/class/corlib/LinkerDescriptor/mscorlib.xml
@@ -3,7 +3,8 @@
 	<assembly fullname="mscorlib">
 	
 		<!-- domain.c: mono_defaults.appdomain_class -->
-		<type fullname="System.AppDomain" preserve="fields">
+		<type fullname="System.AppDomain">
+		  <field name="_mono_app_domain" />
 			<!-- appdomain.c: mono_domain_try_type_resolve -->
 			<method name="DoTypeResolve" />
 			<!-- appdomain.c: mono_try_assembly_resolve -->
@@ -675,7 +676,7 @@
 		<type fullname="System.Runtime.InteropServices.ICustomMarshaler" />
 
 		<!-- domain.c: mono_defaults.marshal_class -->
-		<type fullname="System.Runtime.InteropServices.Marshal" preserve="fields" >
+		<type fullname="System.Runtime.InteropServices.Marshal">
 			<!-- marshal.c (mono_marshal_get_struct_to_ptr) -->
 			<method name="StructureToPtr" />
 		</type>
diff --git a/mcs/class/corlib/System/AppDomain.cs b/mcs/class/corlib/System/AppDomain.cs
index 677cd5be942..f384ae29960 100644
--- a/mcs/class/corlib/System/AppDomain.cs
+++ b/mcs/class/corlib/System/AppDomain.cs
@@ -72,8 +72,10 @@ namespace System {
 #endif
         #pragma warning disable 169
         #region Sync with object-internals.h
+		#region Sync with LinkerDescriptor/mscorlib.xml
 		IntPtr _mono_app_domain;
 		#endregion
+		#endregion
         #pragma warning restore 169
 		static string _process_guid;
 
-- 
2.11.4.GIT