CR feedback

dotnet · Sep 7, 2017 · 502debe · 502debe
1 parent 1cc6053
commit 502debe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/System.Buffers.Experimental/System/Buffers/BufferExtensions.cs b/src/System.Buffers.Experimental/System/Buffers/BufferExtensions.cs
@@ -19,8 +19,9 @@ public static void Pipe(this Transformation transformation, ReadOnlyBytes source
             // TODO: "ReadOnlySpan<byte> remainder = stackalloc byte[0]" would fit better here, 
             //       but it emits substandard IL, see https://github.com/dotnet/roslyn/issues/21952
             //
-            // make 'remainder' formally stack-referring or we won't be able to reference stack data later
-            var remainder = true ? new ReadOnlySpan<byte>() : stackalloc byte[0];
+            // Assign 'remainder' to something formally stack-referring.
+            // The default classification is "returnable, not referring to stack", we want the opposite in this case.
+            ReadOnlySpan<byte> remainder = true ? new ReadOnlySpan<byte>() : stackalloc byte[0];
             Span<byte> stackSpan = stackalloc byte[stackLength];
 
             var poisition = Position.First;
@@ -325,10 +326,10 @@ internal static int IndexOfStraddling(this ReadOnlySpan<byte> first, IReadOnlyBu
             if (bytesToSearchAgain.IndexOf(value[0]) != -1)
             {
                 var combinedBufferLength = value.Length << 1;
-                Span<byte> combined = combinedBufferLength < 128 ?
+                var combined = combinedBufferLength < 128 ?
                                         stackalloc byte[combinedBufferLength] :
                                         // TODO (pri 3): I think this could be eliminated by chunking values
-                                        combined = new byte[combinedBufferLength];
+                                        (Span<byte>)new byte[combinedBufferLength];
 
                 bytesToSearchAgain.CopyTo(combined);
                 int combinedLength = bytesToSearchAgain.Length + rest.CopyTo(combined.Slice(bytesToSearchAgain.Length));

diff --git a/src/System.IO.Pipelines.Text.Primitives/ReadableBufferExtensions.cs b/src/System.IO.Pipelines.Text.Primitives/ReadableBufferExtensions.cs
@@ -213,8 +213,9 @@ public static string GetUtf8String(this ReadableBuffer buffer)
             // TODO: "ReadOnlySpan<byte> textSpan = stackalloc byte[0]" would fit better here, 
             //       but it emits substandard IL, see https://github.com/dotnet/roslyn/issues/21952
             //
-            // make 'textSpan' formally stack-referring or we won't be able to reference stack data later
-            var textSpan = true? new ReadOnlySpan<byte>() : stackalloc byte[0];
+            // Assign 'textSpan' to something formally stack-referring.
+            // The default classification is "returnable, not referring to stack", we want the opposite in this case.
+            ReadOnlySpan<byte> textSpan = true? new ReadOnlySpan<byte>() : stackalloc byte[0];
 
             if (buffer.IsSingleSpan)
             {