Mirror changes from dotnet/coreclr

dependencies.props

@@ -10,11 +10,11 @@
   -->
   <PropertyGroup>
     <CoreFxCurrentRef>3c5f8e69e456790cc711a78c66b89f5b8035f02b</CoreFxCurrentRef>
-    <CoreClrCurrentRef>e697c7d95c14fc4e39a0de1a09d0dd9f1faf3f92</CoreClrCurrentRef>
+    <CoreClrCurrentRef>f9f2dcffe189a681d43949ee3b02dd1fc9d9e636</CoreClrCurrentRef>
     <CoreSetupCurrentRef>3c5f8e69e456790cc711a78c66b89f5b8035f02b</CoreSetupCurrentRef>
     <ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
-    <ProjectNTfsCurrentRef>e697c7d95c14fc4e39a0de1a09d0dd9f1faf3f92</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>e697c7d95c14fc4e39a0de1a09d0dd9f1faf3f92</ProjectNTfsTestILCCurrentRef>
+    <ProjectNTfsCurrentRef>f9f2dcffe189a681d43949ee3b02dd1fc9d9e636</ProjectNTfsCurrentRef>
+    <ProjectNTfsTestILCCurrentRef>f9f2dcffe189a681d43949ee3b02dd1fc9d9e636</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
     <StandardCurrentRef>6298244e25cf84d91e3cda9627315f2425274624</StandardCurrentRef>
     <BuildToolsCurrentRef>e697c7d95c14fc4e39a0de1a09d0dd9f1faf3f92</BuildToolsCurrentRef>
@@ -33,10 +33,10 @@
   <PropertyGroup>
     <CoreFxExpectedPrerelease>preview1-26122-01</CoreFxExpectedPrerelease>
     <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-26122-01</MicrosoftNETCorePlatformsPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-26120-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <ProjectNTfsExpectedPrerelease>beta-26120-00</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-26120-00</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-26120-00</ProjectNTfsTestILCPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-26122-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <ProjectNTfsExpectedPrerelease>beta-26122-00</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsTestILCExpectedPrerelease>beta-26122-00</ProjectNTfsTestILCExpectedPrerelease>
+    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-26122-00</ProjectNTfsTestILCPackageVersion>
     <MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview1-26121-02</MicrosoftNETCoreDotNetHostPackageVersion>
     <MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview1-26121-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
     <MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26121-02</MicrosoftNETCoreAppPackageVersion>

external/test-runtime/optional.json

@@ -3,9 +3,9 @@
     "net45": {
       "dependencies": {
         "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
-        "TestILC.amd64ret": "1.0.0-beta-26120-00",
-        "TestILC.armret": "1.0.0-beta-26120-00",
-        "TestILC.x86ret": "1.0.0-beta-26120-00"
+        "TestILC.amd64ret": "1.0.0-beta-26122-00",
+        "TestILC.armret": "1.0.0-beta-26122-00",
+        "TestILC.x86ret": "1.0.0-beta-26122-00"
       }
     }
   }

src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs

@@ -41,24 +41,6 @@ public unsafe struct MemoryHandle : IDisposable
         /// </summary>
         public bool HasPointer => _pointer != null;
 
-        /// <summary>
-        /// Adds an offset to the pinned pointer.
-        /// </summary>
-        /// <exception cref="System.ArgumentNullException">
-        /// Throw when pinned pointer is null.
-        /// </exception>
-        internal void AddOffset(int offset)
-        {
-            if (_pointer == null)
-            {
-                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.pointer);
-            }
-            else
-            {
-                _pointer = (void*)((byte*)_pointer + offset);
-            }
-        }
-
         /// <summary>
         /// Frees the pinned handle and releases IRetainable.
         /// </summary>

src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs

@@ -43,7 +43,7 @@ public Memory<T> Memory
         /// <summary>
         /// Returns a handle for the array that has been pinned and hence its address can be taken
         /// </summary>
-        public abstract MemoryHandle Pin();
+        public abstract MemoryHandle Pin(int offset = 0);
 
         /// <summary>
         /// Returns an array segment.

src/Common/src/CoreLib/System/Memory.cs

@@ -244,8 +244,7 @@ public unsafe MemoryHandle Retain(bool pin = false)
             {
                 if (_index < 0)
                 {
-                    memoryHandle = ((OwnedMemory<T>)_object).Pin();
-                    memoryHandle.AddOffset((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
+                    memoryHandle = ((OwnedMemory<T>)_object).Pin((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
                 }
                 else if (typeof(T) == typeof(char) && _object is string s)
                 {

src/Common/src/CoreLib/System/ReadOnlyMemory.cs

@@ -222,8 +222,7 @@ public unsafe MemoryHandle Retain(bool pin = false)
             {
                 if (_index < 0)
                 {
-                    memoryHandle = ((OwnedMemory<T>)_object).Pin();
-                    memoryHandle.AddOffset((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
+                    memoryHandle = ((OwnedMemory<T>)_object).Pin((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
                 }
                 else if (typeof(T) == typeof(char) && _object is string s)
                 {

src/Common/tests/System/Buffers/NativeOwnedMemory.cs

@@ -53,7 +53,12 @@ protected override bool IsRetained
 
         public override unsafe Span<byte> Span => new Span<byte>((void*)_ptr, _length);
 
-        public override unsafe MemoryHandle Pin() => new MemoryHandle(this, (void*)_ptr);
+        public override unsafe MemoryHandle Pin(int offset = 0)
+        {
+            if (offset < 0 || offset > _length) throw new ArgumentOutOfRangeException(nameof(offset));
+            void* pointer = (void*)((byte*)_ptr + offset);
+            return new MemoryHandle(this, pointer);
+        }
 
         public override bool Release()
         {

src/System.Memory/ref/System.Memory.cs

@@ -226,7 +226,7 @@ protected OwnedMemory() { }
         public abstract System.Span<T> Span { get; }
         public void Dispose() { }
         protected abstract void Dispose(bool disposing);
-        public abstract System.Buffers.MemoryHandle Pin();
+        public abstract System.Buffers.MemoryHandle Pin(int offset=0);
         public abstract bool Release();
         public abstract void Retain();
         protected internal abstract bool TryGetArray(out System.ArraySegment<T> arraySegment);

src/System.Memory/tests/Memory/CustomMemoryForTest.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Buffers;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 
@@ -38,13 +39,14 @@ public override Span<T> Span
             }
         }
 
-        public override MemoryHandle Pin()
+        public override MemoryHandle Pin(int offset = 0)
         {
             unsafe
             {
                 Retain();
+                if (offset < 0 || offset > _array.Length) throw new ArgumentOutOfRangeException(nameof(offset));
                 var handle = GCHandle.Alloc(_array, GCHandleType.Pinned);
-                return new MemoryHandle(this, (void*)handle.AddrOfPinnedObject(), handle);
+                return new MemoryHandle(this, Unsafe.Add<byte>((void*)handle.AddrOfPinnedObject(), offset), handle);
             }
         }
 

src/System.Memory/tests/Memory/OwnedMemory.cs

@@ -86,6 +86,36 @@ public static void OwnedMemoryDispose()
             owner.Dispose();
             Assert.True(owner.IsDisposed);
         }
+
+        [Fact]
+        public static void OwnedMemoryPinEmptyArray()
+        {
+            int[] a = {};
+            OwnedMemory<int> owner = new CustomMemoryForTest<int>(a);
+            MemoryHandle handle = owner.Pin();
+            Assert.True(handle.HasPointer);
+        }
+
+        [Fact]
+        public static void OwnedMemoryPinArray()
+        {
+            int[] array = { 1, 2, 3, 4, 5 };
+            OwnedMemory<int> owner = new CustomMemoryForTest<int>(array);
+            MemoryHandle handle = owner.Pin();
+            Assert.True(handle.HasPointer);
+            unsafe
+            {
+                int* pointer = (int*)handle.Pointer;
+
+                GC.Collect();
+
+                for (int i = 0; i < owner.Memory.Length; i++)
+                {
+                    Assert.Equal(array[i], pointer[i]);
+                }
+            }
+            handle.Dispose();
+        }
 
         [Fact]
         public static void MemoryFromOwnedMemoryAfterDispose()

src/System.Memory/tests/Memory/Retain.cs

@@ -110,6 +110,23 @@ public static void OwnedMemoryRetainWithPinning()
             handle.Dispose();
         }
 
+        [Fact]
+        public static void MemoryFromEmptyArrayRetainWithPinning()
+        {
+            Memory<int> memory = new int[0];
+            MemoryHandle handle = memory.Retain(pin: true);
+            Assert.True(handle.HasPointer);
+            unsafe
+            {
+                int* pointer = (int*)handle.Pointer;
+
+                GC.Collect();
+
+                Assert.True(pointer != null);
+            }
+            handle.Dispose();
+        }
+
         [Fact]
         public static void OwnedMemoryRetainWithPinningAndSlice()
         {

src/System.Memory/tests/ReadOnlyMemory/Retain.cs

@@ -45,6 +45,23 @@ public static void MemoryRetainWithPinning()
             handle.Dispose();
         }
 
+        [Fact]
+        public static void MemoryFromEmptyArrayRetainWithPinning()
+        {
+            ReadOnlyMemory<int> memory = new int[0];
+            MemoryHandle handle = memory.Retain(pin: true);
+            Assert.True(handle.HasPointer);
+            unsafe
+            {
+                int* pointer = (int*)handle.Pointer;
+
+                GC.Collect();
+
+                Assert.True(pointer != null);
+            }
+            handle.Dispose();
+        }
+
         [Fact]
         public static void MemoryRetainWithPinningAndSlice()
         {

src/System.Runtime/ref/System.Runtime.cs

@@ -3728,7 +3728,7 @@ protected OwnedMemory() { }
         public abstract System.Span<T> Span { get; }
         public void Dispose() { }
         protected abstract void Dispose(bool disposing);
-        public abstract System.Buffers.MemoryHandle Pin();
+        public abstract MemoryHandle Pin(int offset=0);
         public abstract bool Release();
         public abstract void Retain();
         protected internal abstract bool TryGetArray(out System.ArraySegment<T> arraySegment);

tools-local/ILAsmVersion.txt

@@ -1 +1 @@
-2.1.0-preview1-26120-01
+2.1.0-preview1-26122-04