Revert "Temporarily removing use of ReadOnlySpan indexer in Runtime.E…

…xtensions (dotnet#25326)" This reverts commit 1d95739.
pjanotti · Dec 16, 2017 · 2e5a18a · 2e5a18a
1 parent 4110bfa
commit 2e5a18a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/System.Runtime.Extensions/src/System/IO/StreamReader.cs b/src/System.Runtime.Extensions/src/System/IO/StreamReader.cs
@@ -559,7 +559,7 @@ private void DetectEncoding()
         // there is no match. If there is no match, every byte read previously will be available 
         // for further consumption. If there is a match, we will compress the buffer for the 
         // leading preamble bytes
-        private unsafe bool IsPreamble()
+        private bool IsPreamble()
         {
             if (!_checkPreamble)
             {
@@ -571,17 +571,13 @@ private unsafe bool IsPreamble()
             Debug.Assert(_bytePos <= preamble.Length, "_compressPreamble was called with the current bytePos greater than the preamble buffer length.  Are two threads using this StreamReader at the same time?");
             int len = (_byteLen >= (preamble.Length)) ? (preamble.Length - _bytePos) : (_byteLen - _bytePos);
 
-            fixed (byte* preamblePtr = &preamble.DangerousGetPinnableReference())
+            for (int i = 0; i < len; i++, _bytePos++)
             {
-                var preambleSpan = new Span<byte>(preamblePtr, preamble.Length);
-                for (int i = 0; i < len; i++, _bytePos++)
+                if (_byteBuffer[_bytePos] != preamble[_bytePos])
                 {
-                    if (_byteBuffer[_bytePos] != preambleSpan[_bytePos])
-                    {
-                        _bytePos = 0;
-                        _checkPreamble = false;
-                        break;
-                    }
+                    _bytePos = 0;
+                    _checkPreamble = false;
+                    break;
                 }
             }
 

diff --git a/src/System.Runtime.Extensions/src/System/IO/StreamWriter.cs b/src/System.Runtime.Extensions/src/System/IO/StreamWriter.cs
@@ -375,13 +375,9 @@ private unsafe void WriteCore(ReadOnlySpan<char> buffer, bool autoFlush)
             {
                 // For very short buffers and when we don't need to worry about running out of space
                 // in the char buffer, just copy the chars individually.
-                fixed (char* bufferPtr = &buffer.DangerousGetPinnableReference())
+                for (int i = 0; i < buffer.Length; i++)
                 {
-                    Span<char> bufferSpan = new Span<char>(bufferPtr, buffer.Length);
-                    for (int i = 0; i < buffer.Length; i++)
-                    {
-                        _charBuffer[_charPos++] = bufferSpan[i];
-                    }
+                    _charBuffer[_charPos++] = buffer[i];
                 }
             }
             else