Fix/disable nullable warnings treated as errors with newer SDKs installed (#3616)

Mike McLaughlin · web-flow · commit e83a272a4894 · 2023-01-25T16:40:02.000-08:00
* Fix/disable nullable warnings treated as errors with newer SDKs installed

* Missed a test cs file
diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/DumpAsyncCommand.cs b/src/Microsoft.Diagnostics.ExtensionCommands/DumpAsyncCommand.cs
@@ -459,7 +459,7 @@ bool ShouldIncludeStack(AsyncObject obj)
             // <summary>Outputs a line of information for each instance field on the object.</summary>
             void RenderFields(IAddressableTypedEntity? obj, int depth)
             {
-                if (obj is not null)
+                if (obj?.Type is not null)
                 {
                     string depthTab = new string(' ', depth * TabWidth);
 
@@ -489,33 +489,36 @@ void RenderFields(IAddressableTypedEntity? obj, int depth)
             // <summary>Gets a printable description for the specified object.</summary>
             string Describe(ClrObject obj)
             {
-                // Default the description to the type name.
-                string description = obj.Type.Name;
-
-                if (IsStateMachineBox(obj.Type))
+                string description = string.Empty;
+                if (obj.Type?.Name is not null)
                 {
-                    // Remove the boilerplate box type from the name.
-                    int pos = description.IndexOf("StateMachineBox<", StringComparison.Ordinal);
-                    if (pos >= 0)
+                    // Default the description to the type name.
+                    description = obj.Type.Name;
+
+                    if (IsStateMachineBox(obj.Type))
                     {
-                        ReadOnlySpan<char> slice = description.AsSpan(pos + "StateMachineBox<".Length);
-                        slice = slice.Slice(0, slice.Length - 1); // remove trailing >
-                        description = slice.ToString();
+                        // Remove the boilerplate box type from the name.
+                        int pos = description.IndexOf("StateMachineBox<", StringComparison.Ordinal);
+                        if (pos >= 0)
+                        {
+                            ReadOnlySpan<char> slice = description.AsSpan(pos + "StateMachineBox<".Length);
+                            slice = slice.Slice(0, slice.Length - 1); // remove trailing >
+                            description = slice.ToString();
+                        }
                     }
-                }
-                else if (TryGetValidObjectField(obj, "m_action", out ClrObject taskDelegate))
-                {
-                    // If we can figure out what the task's delegate points to, append the method signature.
-                    if (TryGetMethodFromDelegate(runtime, taskDelegate, out ClrMethod? method))
+                    else if (TryGetValidObjectField(obj, "m_action", out ClrObject taskDelegate))
+                    {
+                        // If we can figure out what the task's delegate points to, append the method signature.
+                        if (TryGetMethodFromDelegate(runtime, taskDelegate, out ClrMethod? method))
+                        {
+                            description = $"{description} {{{method!.Signature}}}";
+                        }
+                    }
+                    else if (obj.Address != 0 && taskCompletionSentinel.Address == obj.Address)
                     {
-                        description = $"{description} {{{method!.Signature}}}";
+                        description = "TaskCompletionSentinel";
                     }
                 }
-                else if (obj.Address != 0 && taskCompletionSentinel.Address == obj.Address)
-                {
-                    description = "TaskCompletionSentinel";
-                }
-
                 return description;
             }
 
@@ -527,14 +530,17 @@ bool IncludeInOutput(ClrObject obj)
                     return false;
                 }
 
-                if (MethodTableAddress is ulong mt && obj.Type.MethodTable != mt)
+                if (obj.Type is not null)
                 {
-                    return false;
-                }
+                    if (MethodTableAddress is ulong mt && obj.Type.MethodTable != mt)
+                    {
+                        return false;
+                    }
 
-                if (NameSubstring is not null && !obj.Type.Name.Contains(NameSubstring))
-                {
-                    return false;
+                    if (NameSubstring is not null && obj.Type.Name is not null && !obj.Type.Name.Contains(NameSubstring))
+                    {
+                        return false;
+                    }
                 }
 
                 return true;
@@ -655,37 +661,42 @@ Dictionary<ClrObject, AsyncObject> CollectObjects()
             // </remarks>
             void AddContinuation(ClrObject continuation, List<ClrObject> continuations)
             {
-                if (continuation.Type.Name.StartsWith("System.Collections.Generic.List<", StringComparison.Ordinal))
+                if (continuation.Type is not null)
                 {
-                    if (continuation.Type.GetFieldByName("_items") is ClrInstanceField itemsField)
+                    if (continuation.Type.Name is not null &&
+                        continuation.Type.Name.StartsWith("System.Collections.Generic.List<", StringComparison.Ordinal))
                     {
-                        ClrObject itemsObj = itemsField.ReadObject(continuation.Address, interior: false);
-                        if (!itemsObj.IsNull)
+                        if (continuation.Type.GetFieldByName("_items") is ClrInstanceField itemsField)
                         {
-                            ClrArray items = itemsObj.AsArray();
-                            if (items.Rank == 1)
+                            ClrObject itemsObj = itemsField.ReadObject(continuation.Address, interior: false);
+                            if (!itemsObj.IsNull)
                             {
-                                for (int i = 0; i < items.Length; i++)
+                                ClrArray items = itemsObj.AsArray();
+                                if (items.Rank == 1)
                                 {
-                                    if (items.GetObjectValue(i) is ClrObject { IsValid: true } c)
+                                    for (int i = 0; i < items.Length; i++)
                                     {
-                                        continuations.Add(ResolveContinuation(c));
+                                        if (items.GetObjectValue(i) is ClrObject { IsValid: true } c)
+                                        {
+                                            continuations.Add(ResolveContinuation(c));
+                                        }
                                     }
                                 }
                             }
                         }
                     }
-                }
-                else
-                {
-                    continuations.Add(continuation);
+                    else
+                    {
+                        continuations.Add(continuation);
+                    }
                 }
             }
 
             // <summary>Tries to get the object contents of a Task's continuations field</summary>
             bool TryGetContinuation(ClrObject obj, out ClrObject continuation)
             {
-                if (obj.Type.GetFieldByName("m_continuationObject") is ClrInstanceField continuationObjectField &&
+                if (obj.Type is not null &&
+                    obj.Type.GetFieldByName("m_continuationObject") is ClrInstanceField continuationObjectField &&
                     continuationObjectField.ReadObject(obj.Address, interior: false) is ClrObject { IsValid: true } continuationObject)
                 {
                     continuation = ResolveContinuation(continuationObject);
@@ -888,7 +899,7 @@ private void WriteCodeLink(ulong address)
         }
 
         /// <summary>Gets whether the specified type is an AsyncStateMachineBox{T}.</summary>
-        private static bool IsStateMachineBox(ClrType type)
+        private static bool IsStateMachineBox(ClrType? type)
         {
             // Ideally we would compare the metadata token and module for the generic template for the type,
             // but that information isn't fully available via ClrMd, nor can it currently find DebugFinalizableAsyncStateMachineBox
diff --git a/src/SOS/SOS.UnitTests/SOS.cs b/src/SOS/SOS.UnitTests/SOS.cs
@@ -14,6 +14,11 @@
 using Xunit.Abstractions;
 using Xunit.Extensions;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
+[Collection("Windows Dump Generation")]
 public class SOS
 {
     public SOS(ITestOutputHelper output)
diff --git a/src/tests/DbgShim.UnitTests/DbgShimTests.cs b/src/tests/DbgShim.UnitTests/DbgShimTests.cs
@@ -20,6 +20,10 @@
 using Xunit.Abstractions;
 using Xunit.Extensions;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics
 {
     public class DbgShimTests : IDisposable
diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs
@@ -11,6 +11,10 @@
 using Xunit.Abstractions;
 using Xunit.Extensions;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.DebugServices.UnitTests
 {
     public class DebugServicesTests : IDisposable
diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs
@@ -13,6 +13,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests
 {
     public class EventCounterPipelineUnitTests
diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs
@@ -10,14 +10,17 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests
 {
     public class EventCounterTriggerTests
diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
@@ -18,6 +18,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests
 {
     public class EventLogsPipelineUnitTests
diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventTracePipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventTracePipelineUnitTests.cs
@@ -17,6 +17,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests
 {
     public class EventTracePipelineUnitTests
diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs
@@ -14,6 +14,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.NETCore.Client
 {
     public class EventPipeSessionTests
diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessEnvironmentTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessEnvironmentTests.cs
@@ -10,6 +10,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.NETCore.Client
 {
     public class ProcessEnvironmentTests
diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessInfoTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessInfoTests.cs
@@ -13,6 +13,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.NETCore.Client
 {
     public class GetProcessInfoTests
diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/GetPublishedProcessesTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/GetPublishedProcessesTests.cs
@@ -5,14 +5,17 @@
 using Microsoft.Diagnostics.TestHelpers;
 using System;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.NETCore.Client
 {
 
diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/ReversedServerTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/ReversedServerTests.cs
@@ -19,6 +19,10 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.NETCore.Client
 {
     public class ReversedServerTests
diff --git a/src/tests/dotnet-counters/JSONExporterTests.cs b/src/tests/dotnet-counters/JSONExporterTests.cs
@@ -4,12 +4,13 @@
 
 using System;
 using System.IO;
-using System.Collections.Generic;
 using Xunit;
 using Microsoft.Diagnostics.Tools.Counters.Exporters;
 using Newtonsoft.Json;
 using Microsoft.Diagnostics.Tools.Counters;
 
+#pragma warning disable CA1507 // Use nameof to express symbol names
+
 namespace DotnetCounters.UnitTests
 {
     /// <summary>
diff --git a/src/tests/dotnet-trace/ChildProcessTests.cs b/src/tests/dotnet-trace/ChildProcessTests.cs
@@ -12,9 +12,12 @@
 using Xunit.Extensions;
 using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner;
 
+// Newer SDKs flag MemberData(nameof(Configurations)) with this error
+// Avoid unnecessary zero-length array allocations.  Use Array.Empty<object>() instead.
+#pragma warning disable CA1825 
+
 namespace Microsoft.Diagnostics.Tools.Trace
 {
-
     public class ChildProcessTests
     {
         public static IEnumerable<object[]> Configurations => TestRunner.Configurations;

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ bool ShouldIncludeStack(AsyncObject obj)`
`459`	`459`	`// <summary>Outputs a line of information for each instance field on the object.</summary>`
`460`	`460`	`void RenderFields(IAddressableTypedEntity? obj, int depth)`
`461`	`461`	`{`
`462`		`- if (obj is not null)`
	`462`	`+ if (obj?.Type is not null)`
`463`	`463`	`{`
`464`	`464`	`string depthTab = new string(' ', depth * TabWidth);`
`465`	`465`
`@@ -489,33 +489,36 @@ void RenderFields(IAddressableTypedEntity? obj, int depth)`
`489`	`489`	`// <summary>Gets a printable description for the specified object.</summary>`
`490`	`490`	`string Describe(ClrObject obj)`
`491`	`491`	`{`
`492`		`- // Default the description to the type name.`
`493`		`- string description = obj.Type.Name;`
`494`		`-`
`495`		`- if (IsStateMachineBox(obj.Type))`
	`492`	`+ string description = string.Empty;`
	`493`	`+ if (obj.Type?.Name is not null)`
`496`	`494`	`{`
`497`		`- // Remove the boilerplate box type from the name.`
`498`		`- int pos = description.IndexOf("StateMachineBox<", StringComparison.Ordinal);`
`499`		`- if (pos >= 0)`
	`495`	`+ // Default the description to the type name.`
	`496`	`+ description = obj.Type.Name;`
	`497`	`+`
	`498`	`+ if (IsStateMachineBox(obj.Type))`
`500`	`499`	`{`
`501`		`- ReadOnlySpan<char> slice = description.AsSpan(pos + "StateMachineBox<".Length);`
`502`		`- slice = slice.Slice(0, slice.Length - 1); // remove trailing >`
`503`		`- description = slice.ToString();`
	`500`	`+ // Remove the boilerplate box type from the name.`
	`501`	`+ int pos = description.IndexOf("StateMachineBox<", StringComparison.Ordinal);`
	`502`	`+ if (pos >= 0)`
	`503`	`+ {`
	`504`	`+ ReadOnlySpan<char> slice = description.AsSpan(pos + "StateMachineBox<".Length);`
	`505`	`+ slice = slice.Slice(0, slice.Length - 1); // remove trailing >`
	`506`	`+ description = slice.ToString();`
	`507`	`+ }`
`504`	`508`	`}`
`505`		`- }`
`506`		`- else if (TryGetValidObjectField(obj, "m_action", out ClrObject taskDelegate))`
`507`		`- {`
`508`		`- // If we can figure out what the task's delegate points to, append the method signature.`
`509`		`- if (TryGetMethodFromDelegate(runtime, taskDelegate, out ClrMethod? method))`
	`509`	`+ else if (TryGetValidObjectField(obj, "m_action", out ClrObject taskDelegate))`
	`510`	`+ {`
	`511`	`+ // If we can figure out what the task's delegate points to, append the method signature.`
	`512`	`+ if (TryGetMethodFromDelegate(runtime, taskDelegate, out ClrMethod? method))`
	`513`	`+ {`
	`514`	`+ description = $"{description} {{{method!.Signature}}}";`
	`515`	`+ }`
	`516`	`+ }`
	`517`	`+ else if (obj.Address != 0 && taskCompletionSentinel.Address == obj.Address)`
`510`	`518`	`{`
`511`		`- description = $"{description} {{{method!.Signature}}}";`
	`519`	`+ description = "TaskCompletionSentinel";`
`512`	`520`	`}`
`513`	`521`	`}`
`514`		`- else if (obj.Address != 0 && taskCompletionSentinel.Address == obj.Address)`
`515`		`- {`
`516`		`- description = "TaskCompletionSentinel";`
`517`		`- }`
`518`		`-`
`519`	`522`	`return description;`
`520`	`523`	`}`
`521`	`524`
`@@ -527,14 +530,17 @@ bool IncludeInOutput(ClrObject obj)`
`527`	`530`	`return false;`
`528`	`531`	`}`
`529`	`532`
`530`		`- if (MethodTableAddress is ulong mt && obj.Type.MethodTable != mt)`
	`533`	`+ if (obj.Type is not null)`
`531`	`534`	`{`
`532`		`- return false;`
`533`		`- }`
	`535`	`+ if (MethodTableAddress is ulong mt && obj.Type.MethodTable != mt)`
	`536`	`+ {`
	`537`	`+ return false;`
	`538`	`+ }`
`534`	`539`
`535`		`- if (NameSubstring is not null && !obj.Type.Name.Contains(NameSubstring))`
`536`		`- {`
`537`		`- return false;`
	`540`	`+ if (NameSubstring is not null && obj.Type.Name is not null && !obj.Type.Name.Contains(NameSubstring))`
	`541`	`+ {`
	`542`	`+ return false;`
	`543`	`+ }`
`538`	`544`	`}`
`539`	`545`
`540`	`546`	`return true;`
`@@ -655,37 +661,42 @@ Dictionary<ClrObject, AsyncObject> CollectObjects()`
`655`	`661`	`// </remarks>`
`656`	`662`	`void AddContinuation(ClrObject continuation, List<ClrObject> continuations)`
`657`	`663`	`{`
`658`		`- if (continuation.Type.Name.StartsWith("System.Collections.Generic.List<", StringComparison.Ordinal))`
	`664`	`+ if (continuation.Type is not null)`
`659`	`665`	`{`
`660`		`- if (continuation.Type.GetFieldByName("_items") is ClrInstanceField itemsField)`
	`666`	`+ if (continuation.Type.Name is not null &&`
	`667`	`+ continuation.Type.Name.StartsWith("System.Collections.Generic.List<", StringComparison.Ordinal))`
`661`	`668`	`{`
`662`		`- ClrObject itemsObj = itemsField.ReadObject(continuation.Address, interior: false);`
`663`		`- if (!itemsObj.IsNull)`
	`669`	`+ if (continuation.Type.GetFieldByName("_items") is ClrInstanceField itemsField)`
`664`	`670`	`{`
`665`		`- ClrArray items = itemsObj.AsArray();`
`666`		`- if (items.Rank == 1)`
	`671`	`+ ClrObject itemsObj = itemsField.ReadObject(continuation.Address, interior: false);`
	`672`	`+ if (!itemsObj.IsNull)`
`667`	`673`	`{`
`668`		`- for (int i = 0; i < items.Length; i++)`
	`674`	`+ ClrArray items = itemsObj.AsArray();`
	`675`	`+ if (items.Rank == 1)`
`669`	`676`	`{`
`670`		`- if (items.GetObjectValue(i) is ClrObject { IsValid: true } c)`
	`677`	`+ for (int i = 0; i < items.Length; i++)`
`671`	`678`	`{`
`672`		`- continuations.Add(ResolveContinuation(c));`
	`679`	`+ if (items.GetObjectValue(i) is ClrObject { IsValid: true } c)`
	`680`	`+ {`
	`681`	`+ continuations.Add(ResolveContinuation(c));`
	`682`	`+ }`
`673`	`683`	`}`
`674`	`684`	`}`
`675`	`685`	`}`
`676`	`686`	`}`
`677`	`687`	`}`
`678`		`- }`
`679`		`- else`
`680`		`- {`
`681`		`- continuations.Add(continuation);`
	`688`	`+ else`
	`689`	`+ {`
	`690`	`+ continuations.Add(continuation);`
	`691`	`+ }`
`682`	`692`	`}`
`683`	`693`	`}`
`684`	`694`
`685`	`695`	`// <summary>Tries to get the object contents of a Task's continuations field</summary>`
`686`	`696`	`bool TryGetContinuation(ClrObject obj, out ClrObject continuation)`
`687`	`697`	`{`
`688`		`- if (obj.Type.GetFieldByName("m_continuationObject") is ClrInstanceField continuationObjectField &&`
	`698`	`+ if (obj.Type is not null &&`
	`699`	`+ obj.Type.GetFieldByName("m_continuationObject") is ClrInstanceField continuationObjectField &&`
`689`	`700`	`continuationObjectField.ReadObject(obj.Address, interior: false) is ClrObject { IsValid: true } continuationObject)`
`690`	`701`	`{`
`691`	`702`	`continuation = ResolveContinuation(continuationObject);`
`@@ -888,7 +899,7 @@ private void WriteCodeLink(ulong address)`
`888`	`899`	`}`
`889`	`900`
`890`	`901`	`/// <summary>Gets whether the specified type is an AsyncStateMachineBox{T}.</summary>`
`891`		`- private static bool IsStateMachineBox(ClrType type)`
	`902`	`+ private static bool IsStateMachineBox(ClrType? type)`
`892`	`903`	`{`
`893`	`904`	`// Ideally we would compare the metadata token and module for the generic template for the type,`
`894`	`905`	`// but that information isn't fully available via ClrMd, nor can it currently find DebugFinalizableAsyncStateMachineBox`