Merge branch 'master' of github.com:dotnet/runtime into type-isassignedfrom

# Conflicts:
#	src/coreclr/tests/src/JIT/Intrinsics/TypeIntrinsics.cs
#	src/libraries/System.Private.CoreLib/src/System/Type.Helpers.cs

diff --cc src/coreclr/src/jit/importer.cpp
index eaaabb1,2679a81..2ad2892
--- 1/src/coreclr/src/jit/importer.cpp
--- 2/src/coreclr/src/jit/importer.cpp
+++ b/src/coreclr/src/jit/importer.cpp
@@@ -4385,13 -4341,9 +4384,13 @@@ NamedIntrinsic Compiler::lookupNamedInt
              {
                  result = NI_System_Type_get_IsValueType;
              }
 +            else if (strcmp(methodName, "IsAssignableFrom") == 0)
 +            {
 +                result = NI_System_Type_IsAssignableFrom;
 +            }
          }
      }
- #if defined(_TARGET_XARCH_) // We currently only support BSWAP on x86
+ #if defined(TARGET_XARCH) // We currently only support BSWAP on x86
      else if (strcmp(namespaceName, "System.Buffers.Binary") == 0)
      {
          if ((strcmp(className, "BinaryPrimitives") == 0) && (strcmp(methodName, "ReverseEndianness") == 0))

diff --cc src/coreclr/src/jit/namedintrinsiclist.h
Simple merge

diff --cc src/coreclr/tests/src/JIT/Intrinsics/TypeIntrinsics.cs
Simple merge

diff --cc src/libraries/System.Private.CoreLib/src/System/Type.Helpers.cs
index 700f3b7,f512b94..a1308fe
--- 1/src/libraries/System.Private.CoreLib/src/System/Type.Helpers.cs
--- 2/src/libraries/System.Private.CoreLib/src/System/Type.Helpers.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Type.Helpers.cs
@@@ -2,8 -2,8 +2,9 @@@
  // The .NET Foundation licenses this file to you under the MIT license.
  // See the LICENSE file in the project root for more information.
  
+ using System.Diagnostics.CodeAnalysis;
  using System.Reflection;
 +using System.Runtime.CompilerServices;
  
  namespace System
  {
@@@ -331,8 -331,7 +332,8 @@@
              return false;
          }
  
-         public virtual bool IsAssignableFrom(Type? c)
 +        [Intrinsic]
+         public virtual bool IsAssignableFrom([NotNullWhen(true)] Type? c)
          {
              if (c == null)
                  return false;