From 6be9f2da6a044fe724f4dbe8c1f4120c5b6aa8cb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 12:12:17 +0000
Subject: [PATCH 1/5] Update dependencies from https://github.com/mono/linker
 build 20210427.1

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21226.1 -> To Version 6.0.100-preview.5.21227.1
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 858f5ce7d2e813..af348f1e83eca0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -194,9 +194,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21226.1">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21227.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>1dfcf3077aca1ea77850f409d95c3192f03507b3</Sha>
+      <Sha>bf37b2909bbfb2942173e7b383642c9b32ae0e79</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21226.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f459c77cfe5e56..662c4a14722603 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.2.21226.1</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21227.1</MicrosoftNETILLinkTasksVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21223.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- Mono LLVM -->

From 2576a5f248c81334aee84a7c38c9d88e3b8357f1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 12:11:15 +0000
Subject: [PATCH 2/5] Update dependencies from https://github.com/mono/linker
 build 20210428.1

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21226.1 -> To Version 6.0.100-preview.5.21228.1
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index af348f1e83eca0..24fa82f7638b87 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -194,9 +194,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21227.1">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21228.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>bf37b2909bbfb2942173e7b383642c9b32ae0e79</Sha>
+      <Sha>cfd2a7d4396547be832ee198f16a3c4ecac7ad97</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21226.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 662c4a14722603..24aaa2c0a33b73 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21227.1</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21228.1</MicrosoftNETILLinkTasksVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21223.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- Mono LLVM -->

From 983a453ca99ea8a1b60caaa7104cfe5312dfe128 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 08:32:54 +0000
Subject: [PATCH 3/5] Update dependencies from https://github.com/mono/linker
 build 20210428.2

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21226.1 -> To Version 6.0.100-preview.5.21228.2
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 24fa82f7638b87..cc1b89ed8bef7d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -194,9 +194,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21228.1">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21228.2">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>cfd2a7d4396547be832ee198f16a3c4ecac7ad97</Sha>
+      <Sha>e48f540b753d2aa5f5d4c22f4bbc41aba130345b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21226.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 24aaa2c0a33b73..dad4bf3c09b159 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21228.1</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21228.2</MicrosoftNETILLinkTasksVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21223.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- Mono LLVM -->

From 36deba52d4d0844eb82d4e1421dcc4a2cc8f0ecd Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 30 Apr 2021 12:15:56 +0000
Subject: [PATCH 4/5] Update dependencies from https://github.com/mono/linker
 build 20210429.1

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.2.21226.1 -> To Version 6.0.100-preview.5.21229.1
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cc1b89ed8bef7d..d8839ec1544f14 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -194,9 +194,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21228.2">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21229.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>e48f540b753d2aa5f5d4c22f4bbc41aba130345b</Sha>
+      <Sha>307f6b0afd2fea639fffa97e67155bafe6aa8461</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21226.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index dad4bf3c09b159..a08730c477a729 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21228.2</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21229.1</MicrosoftNETILLinkTasksVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21223.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- Mono LLVM -->

From e9b33e091343c055776ee00fac3b1b9f497ff4ca Mon Sep 17 00:00:00 2001
From: vitek-karas <vitek.karas@microsoft.com>
Date: Mon, 3 May 2021 07:14:28 -0700
Subject: [PATCH 5/5] Fixes necessary for the improved processing of ILLink
 descriptor for corelib.

Basically a port of https://github.com/dotnet/runtime/pull/51562 including changes as per PR feedback.
---
 .../CreateRuntimeRootILLinkDescriptorFile.targets              | 1 +
 src/coreclr/clr.featuredefines.props                           | 3 ++-
 src/coreclr/vm/corelib.h                                       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index aa50f44411c9f3..845e8fccfd8d3c 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -37,6 +37,7 @@
                                            CortypeFilePath="$(_CortypeFilePath)"
                                            RexcepFilePath="$(_RexcepFilePath)"
                                            ILLinkTrimXmlFilePath="$(_ILLinkDescriptorsIntermediatePath)"
+                                           DefineConstants="$(DefineConstants);FOR_ILLINK"
                                            RuntimeRootDescriptorFilePath="$(_ILLinkRuntimeRootDescriptorFilePath)" />
   </Target>
 
diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props
index 00dbb98bf02d55..dcd11139bfa9e2 100644
--- a/src/coreclr/clr.featuredefines.props
+++ b/src/coreclr/clr.featuredefines.props
@@ -52,7 +52,8 @@
         <DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
         <DefineConstants Condition="'$(FeatureBasicFreeze)' == 'true'">$(DefineConstants);FEATURE_BASICFREEZE</DefineConstants>
         <DefineConstants Condition="'$(FeaturePortableShuffleThunks)' == 'true'">$(DefineConstants);FEATURE_PORTABLE_SHUFFLE_THUNKS</DefineConstants>
-
+        <DefineConstants Condition="'$(FeatureICastable)' == 'true'">$(DefineConstants);FEATURE_ICASTABLE</DefineConstants>
+        
         <DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants>
         <DefineConstants Condition="'$(FeatureProfAttach)' == 'true'">$(DefineConstants);FEATURE_PROFAPI_ATTACH_DETACH</DefineConstants>
     </PropertyGroup>
diff --git a/src/coreclr/vm/corelib.h b/src/coreclr/vm/corelib.h
index c9bc96ccb4e7c4..1821750337f4b9 100644
--- a/src/coreclr/vm/corelib.h
+++ b/src/coreclr/vm/corelib.h
@@ -869,7 +869,7 @@ DEFINE_FIELD_U(_requireWaitNotification, SynchronizationContextObject, _requireW
 DEFINE_CLASS(SYNCHRONIZATION_CONTEXT,    Threading,              SynchronizationContext)
 DEFINE_METHOD(SYNCHRONIZATION_CONTEXT,  INVOKE_WAIT_METHOD_HELPER, InvokeWaitMethodHelper, SM_SyncCtx_ArrIntPtr_Bool_Int_RetInt)
 
-#ifdef _DEBUG
+#ifdef DEBUG
 DEFINE_CLASS(STACKCRAWMARK,         Threading,       StackCrawlMark)
 #endif