From 65030514a35642df5c0f0fedf0da763ae8fe27f4 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Mon, 13 Jul 2020 18:31:10 -0500
Subject: [PATCH 1/2] Remove debug only attributes when Debugger.IsSupported is
 false.

Contributes to https://github.com/mono/linker/issues/1093
---
 .../src/ILLink/ILLink.LinkAttributes.wasm.xml | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml b/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml
index 78fc3756bf0e41..872c2ae2e035f6 100644
--- a/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml
+++ b/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml
@@ -83,12 +83,6 @@
     <type fullname="System.Runtime.CompilerServices.CallerMemberNameAttribute">
       <attribute internal="RemoveAttributeInstances" />
     </type>
-    <type fullname="System.Runtime.CompilerServices.CompilerGeneratedAttribute" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false">
-      <!--
-        The attribute is used during pretty stack trace printing
-        -->          
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
     <type fullname="System.Runtime.CompilerServices.CompilerGlobalScopeAttribute">
       <attribute internal="RemoveAttributeInstances" />
     </type>
@@ -116,12 +110,52 @@
       <attribute internal="RemoveAttributeInstances" />
     </type>
 
-    <!-- Microsoft.ComponentModel -->
+    <!-- System.ComponentModel -->
     <type fullname="System.ComponentModel.EditorBrowsableAttribute">
       <attribute internal="RemoveAttributeInstances" />
     </type>
   </assembly>
 
+  <!-- The following attributes are only necessary when debugging is supported -->
+  <assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false">
+    <!-- Debugger specific attributes -->
+    <type fullname="System.Diagnostics.DebuggableAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerBrowsableAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerDisplayAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerHiddenAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerNonUserCodeAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerStepperBoundaryAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerStepThroughAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerTypeProxyAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerVisualizerAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+
+    <!-- Attributes used during pretty stack trace printing -->
+    <type fullname="System.Diagnostics.StackTraceHiddenAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Runtime.CompilerServices.CompilerGeneratedAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+  </assembly>
+  
   <!-- The following attributes are generated by the compiler, so they could be in any assembly -->
   <assembly fullname="*">
     <!-- System.Runtime.CompilerServices -->

From 0ed1588a0994494c44fa52d62915ddcc0dced753 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 14 Jul 2020 09:25:36 -0500
Subject: [PATCH 2/2] Move debug only attributes to shared CoreLib.

---
 .../ILLink/ILLink.LinkAttributes.Shared.xml   | 41 +++++++++++++++++++
 .../System.Private.CoreLib.Shared.projitems   |  2 +
 .../System.Private.CoreLib.csproj             |  2 +-
 .../src/ILLink/ILLink.LinkAttributes.wasm.xml | 40 ------------------
 4 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 src/libraries/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.Shared.xml

diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.Shared.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.Shared.xml
new file mode 100644
index 00000000000000..d864e916300538
--- /dev/null
+++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.Shared.xml
@@ -0,0 +1,41 @@
+<linker>
+  <!-- The following attributes are only necessary when debugging is supported -->
+  <assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false">
+    <!-- Debugger specific attributes -->
+    <type fullname="System.Diagnostics.DebuggableAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerBrowsableAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerDisplayAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerHiddenAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerNonUserCodeAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerStepperBoundaryAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerStepThroughAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerTypeProxyAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Diagnostics.DebuggerVisualizerAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+
+    <!-- Attributes used during pretty stack trace printing -->
+    <type fullname="System.Diagnostics.StackTraceHiddenAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+    <type fullname="System.Runtime.CompilerServices.CompilerGeneratedAttribute">
+      <attribute internal="RemoveAttributeInstances" />
+    </type>
+  </assembly>
+</linker>
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
index fd27062f4c0098..1e144187eaa276 100644
--- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
+++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -28,6 +28,8 @@
                              Condition="'$(Platform)' == 'wasm'" />
     <ILLinkSubstitutionsXmls Include="$(ILLinkSharedDirectory)ILLink.Substitutions.NoX86Intrinsics.xml"
                              Condition="'$(Platform)' == 'wasm'" />
+
+    <ILLinkLinkAttributesXmls Include="$(ILLinkSharedDirectory)ILLink.LinkAttributes.Shared.xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Internal\IO\File.cs" />
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index 8b2acf2ac74f45..2f32d971670ee1 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -153,7 +153,7 @@
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml"
                              Condition="Exists('$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml')" />
 
-    <ILLinkLinkAttributesXmls Include="$(ILLinkDirectory)/ILLink.LinkAttributes.$(Platform).xml"
+    <ILLinkLinkAttributesXmls Include="$(ILLinkDirectory)ILLink.LinkAttributes.$(Platform).xml"
                               Condition="Exists('$(ILLinkDirectory)ILLink.LinkAttributes.$(Platform).xml')" />
   </ItemGroup>
 
diff --git a/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml b/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml
index 872c2ae2e035f6..9e409ddc89e2b1 100644
--- a/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml
+++ b/src/mono/netcore/System.Private.CoreLib/src/ILLink/ILLink.LinkAttributes.wasm.xml
@@ -115,46 +115,6 @@
       <attribute internal="RemoveAttributeInstances" />
     </type>
   </assembly>
-
-  <!-- The following attributes are only necessary when debugging is supported -->
-  <assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false">
-    <!-- Debugger specific attributes -->
-    <type fullname="System.Diagnostics.DebuggableAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerBrowsableAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerDisplayAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerHiddenAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerNonUserCodeAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerStepperBoundaryAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerStepThroughAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerTypeProxyAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Diagnostics.DebuggerVisualizerAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-
-    <!-- Attributes used during pretty stack trace printing -->
-    <type fullname="System.Diagnostics.StackTraceHiddenAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-    <type fullname="System.Runtime.CompilerServices.CompilerGeneratedAttribute">
-      <attribute internal="RemoveAttributeInstances" />
-    </type>
-  </assembly>
   
   <!-- The following attributes are generated by the compiler, so they could be in any assembly -->
   <assembly fullname="*">