Remove S.R.CS.Unsafe and Intrinsify Unsafe

eng/Version.Details.xml

@@ -230,10 +230,6 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>6e05d78deba320a54ef10a265c6025bbb686efe6</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22113.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>6e05d78deba320a54ef10a265c6025bbb686efe6</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22115.2">
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>6e11d057a88b3fb403bfbb90317518c94e3e84a7</Sha>

eng/Versions.props

@@ -125,7 +125,7 @@
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemServiceModelPrimitivesVersion>4.9.0</SystemServiceModelPrimitivesVersion>
     <SystemTextJsonVersion>7.0.0-preview.2.22113.2</SystemTextJsonVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-preview.2.22113.2</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>7.0.0-preview.2.22113.2</runtimenativeSystemIOPortsVersion>

eng/generators.targets

@@ -57,9 +57,6 @@
                           '$(MSBuildProjectName)' == 'System.Private.CoreLib'
                           or '$(EnableDllImportGenerator)' == 'true'
                           or ('@(Reference)' != ''
-                            and (@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.CompilerServices.Unsafe'))
-                              or ('@(ProjectReference)' != ''
-                                and @(ProjectReference->AnyHaveMetadataValue('Identity', $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'System.Runtime.CompilerServices.Unsafe', 'src', 'System.Runtime.CompilerServices.Unsafe.ilproj'))))))
                             and @(Reference->AnyHaveMetadataValue('Identity', 'System.Memory')))
                           or ('@(ProjectReference)' != ''
                             and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))))" Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\ArrayMarshaller.cs" />
@@ -77,13 +74,6 @@
     <PropertyGroup>
         <DllImportGenerator_UseMarshalType>true</DllImportGenerator_UseMarshalType>
     </PropertyGroup>
-    <!-- Projects that directly reference System.Private.CoreLib are typically low level enough that they don't reference
-         System.Runtime.CompilerServices.Unsafe, so we use the Unsafe type defined in CoreLib (Internal.Runtime.CompilerServices.Unsafe) for these projects. -->
-    <PropertyGroup Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib' or
-                              ('@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)')))">
-        <DllImportGenerator_UseInternalUnsafeType>true</DllImportGenerator_UseInternalUnsafeType>
-        <DefineConstants>$(DefineConstants);DLLIMPORTGENERATOR_INTERNALUNSAFE</DefineConstants>
-    </PropertyGroup>
   </Target>
 
   <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props" />

eng/slngen.targets

@@ -10,7 +10,4 @@
          Include the reference project in the solution file if it targets more than just NetCoreAppCurrent as other frameworks like .NETFramework, .NETStandard or older .NETCoreApp ones require it. -->
     <IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)' and '$(TargetFramework)' == '$(NetCoreAppCurrent)' and ('$(TargetFrameworks)' == '' or '$(TargetFrameworks)' == '$(NetCoreAppCurrent)')">false</IncludeInSolutionFile>
   </PropertyGroup>
-  <ItemGroup>
-    <SlnGenCustomProjectTypeGuid Include=".ilproj" ProjectTypeGuid="{9A19103F-16F7-4668-BE54-9A1E7A4F7556}" />
-  </ItemGroup>
 </Project>

src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs

@@ -7,7 +7,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Internal.Runtime.CompilerServices;
 
 namespace System
 {

src/coreclr/System.Private.CoreLib/src/System/Buffer.CoreCLR.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Internal.Runtime.CompilerServices;
 
 namespace System
 {

src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs

@@ -5,7 +5,6 @@
 using System.Diagnostics.Tracing;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Diagnostics.Tracing
 {

src/coreclr/System.Private.CoreLib/src/System/GC.cs

@@ -16,7 +16,6 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Internal.Runtime.CompilerServices;
 
 namespace System
 {

src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs

@@ -8,8 +8,6 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 
-using Internal.Runtime.CompilerServices;
-
 namespace System
 {
     [ClassInterface(ClassInterfaceType.None)]

src/coreclr/System.Private.CoreLib/src/System/Reflection/MethodBase.CoreCLR.cs

@@ -1,12 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Runtime.InteropServices;
 using System.Threading;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Reflection
 {

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs

@@ -6,9 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-
-using Internal.Runtime.CompilerServices;
 
 namespace System.Reflection
 {

src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs

@@ -6,8 +6,6 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-using Internal.Runtime.CompilerServices;
-
 namespace System.Runtime.CompilerServices
 {
     internal static unsafe class CastHelpers

src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs

@@ -7,7 +7,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime.CompilerServices
 {

src/coreclr/System.Private.CoreLib/src/System/Runtime/DependentHandle.cs

@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.CompilerServices;
-#if !DEBUG
-using Internal.Runtime.CompilerServices;
-#endif
 
 namespace System.Runtime
 {

src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs

@@ -6,7 +6,6 @@
 using System.Threading;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime.InteropServices
 {

src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.CoreCLR.cs

@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.CompilerServices;
-#if !DEBUG
-using Internal.Runtime.CompilerServices;
-#endif
 
 namespace System.Runtime.InteropServices
 {

src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.CoreCLR.cs

@@ -3,7 +3,6 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime.InteropServices
 {

src/coreclr/System.Private.CoreLib/src/System/Runtime/JitInfo.CoreCLR.cs

@@ -3,7 +3,6 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {

src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

@@ -10,7 +10,6 @@
 using System.Runtime.Serialization;
 using System.Runtime.Versioning;
 using System.Threading;
-using Internal.Runtime.CompilerServices;
 
 namespace System
 {

src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

@@ -11,7 +11,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
-using Internal.Runtime.CompilerServices;
+
 using DebuggerStepThroughAttribute = System.Diagnostics.DebuggerStepThroughAttribute;
 using MdToken = System.Reflection.MetadataToken;
 

src/coreclr/System.Private.CoreLib/src/System/String.CoreCLR.cs

@@ -3,7 +3,6 @@
 
 using System.Runtime.CompilerServices;
 using System.Text;
-using Internal.Runtime.CompilerServices;
 
 namespace System
 {

src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs

@@ -2,11 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
-using Internal.Runtime.CompilerServices;
 
 namespace System.StubHelpers
 {

src/coreclr/System.Private.CoreLib/src/System/Threading/Interlocked.CoreCLR.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Threading
 {

src/coreclr/System.Private.CoreLib/src/System/TypedReference.CoreCLR.cs

@@ -4,10 +4,6 @@
 // TypedReference is basically only ever seen on the call stack, and in param arrays.
 //  These are blob that must be dealt with by the compiler.
 
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Internal.Runtime.CompilerServices;
-
 namespace System
 {
     [System.Runtime.Versioning.NonVersionable] // This only applies to field layout

src/coreclr/nativeaot/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs

@@ -6,8 +6,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-using Internal.Runtime.CompilerServices;
-
 using Debug = Internal.Runtime.CompilerHelpers.StartupDebug;
 
 namespace Internal.Runtime.CompilerHelpers

src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 
 using Internal.NativeFormat;
-using Internal.Runtime.CompilerServices;
 
 using Debug = System.Diagnostics.Debug;
 

src/coreclr/nativeaot/Runtime.Base/src/System/Array.cs

@@ -1,10 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-using Internal.Runtime.CompilerServices;
-
 namespace System
 {
     // CONTRACT with Runtime

src/coreclr/nativeaot/Runtime.Base/src/System/Object.cs

@@ -1,10 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using Internal.Runtime;
-using Internal.Runtime.CompilerServices;
 
 namespace System
 {

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs

@@ -6,7 +6,6 @@
 using System.Runtime.CompilerServices;
 
 using Internal.Runtime;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {

src/coreclr/nativeaot/Runtime.Base/src/Internal/Runtime/CompilerServices/Unsafe.cs → src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CompilerServices/Unsafe.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace Internal.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices
 {
     //
     // Subsetted clone of System.Runtime.CompilerServices.Unsafe for internal runtime use.

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs

@@ -5,8 +5,6 @@
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
 
-using Internal.Runtime.CompilerServices;
-
 namespace System.Runtime.InteropServices
 {
     /// <summary>

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/MethodTable.Runtime.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Runtime;
-using Internal.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 namespace Internal.Runtime
 {

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

@@ -10,7 +10,6 @@
 using System.Runtime.CompilerServices;
 
 using Internal.Runtime;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs

@@ -6,7 +6,6 @@
 using System.Runtime.InteropServices;
 
 using Internal.Runtime;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {

src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj

@@ -94,7 +94,6 @@
     <Compile Include="Internal\IntrinsicSupport\ComparerHelpers.cs" />
     <Compile Include="Internal\IntrinsicSupport\EqualityComparerHelpers.cs" />
     <Compile Include="Internal\Reflection\Augments\ReflectionAugments.cs" />
-    <Compile Include="Internal\Runtime\CompilerServices\Unsafe.cs" />
     <Compile Include="Internal\Runtime\IDynamicInterfaceCastableSupport.cs" />
     <Compile Include="Internal\Runtime\MethodTable.Runtime.cs" />
     <Compile Include="Internal\Runtime\CompilerHelpers\ThrowHelpers.cs" />

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreRT.cs

@@ -1,14 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 using Internal.Runtime.Augments;
-using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime.InteropServices
 {

src/coreclr/nativeaot/System.Private.CoreLib/src/System/ValueType.cs

@@ -12,8 +12,8 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime;
+using System.Runtime.CompilerServices;
 
-using Internal.Runtime.CompilerServices;
 using Internal.Runtime.Augments;
 
 using Debug = System.Diagnostics.Debug;
@@ -146,11 +146,11 @@ private int RegularGetValueTypeHashCode(EETypePtr type, ref byte data, int numFi
 
                 if (fieldType.ElementType == Internal.Runtime.EETypeElementType.Single)
                 {
-                    hashCode = Unsafe.Read<float>(ref fieldData).GetHashCode();
+                    hashCode = Unsafe.As<byte, float>(ref fieldData).GetHashCode();
                 }
                 else if (fieldType.ElementType == Internal.Runtime.EETypeElementType.Double)
                 {
-                    hashCode = Unsafe.Read<double>(ref fieldData).GetHashCode();
+                    hashCode = Unsafe.As<byte, double>(ref fieldData).GetHashCode();
                 }
                 else if (fieldType.IsPrimitive)
                 {
@@ -178,7 +178,7 @@ private int RegularGetValueTypeHashCode(EETypePtr type, ref byte data, int numFi
                 }
                 else
                 {
-                    object fieldValue = Unsafe.Read<object>(ref fieldData);
+                    object fieldValue = Unsafe.As<byte, object>(ref fieldData);
                     if (fieldValue != null)
                     {
                         hashCode = fieldValue.GetHashCode();