Fix the dumpasync common to handle general ValueTasks.

Lifeng Lu · Lifeng Lu · commit 345e1a190925 · 2021-02-08T14:45:01.000-08:00
diff --git a/src/SosThreadingTools/DumpAsyncCommand.cs b/src/SosThreadingTools/DumpAsyncCommand.cs
@@ -56,7 +56,15 @@ private static void GetAllStateMachines(DebuggerContext context, ClrHeap heap, L
                                             break;
                                         }
 
-                                        asyncBuilder = asyncBuilder.TryGetValueClassField("m_builder");
+                                        ClrValueType? nextAsyncBuilder = asyncBuilder.TryGetValueClassField("m_builder");
+                                        if (nextAsyncBuilder == null)
+                                        {
+                                            asyncBuilder = asyncBuilder.TryGetValueClassField("_methodBuilder");
+                                        }
+                                        else
+                                        {
+                                            asyncBuilder = nextAsyncBuilder;
+                                        }
                                     }
                                 }
                                 else

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,15 @@ private static void GetAllStateMachines(DebuggerContext context, ClrHeap heap, L`
`56`	`56`	`break;`
`57`	`57`	`}`
`58`	`58`
`59`		`- asyncBuilder = asyncBuilder.TryGetValueClassField("m_builder");`
	`59`	`+ ClrValueType? nextAsyncBuilder = asyncBuilder.TryGetValueClassField("m_builder");`
	`60`	`+ if (nextAsyncBuilder == null)`
	`61`	`+ {`
	`62`	`+ asyncBuilder = asyncBuilder.TryGetValueClassField("_methodBuilder");`
	`63`	`+ }`
	`64`	`+ else`
	`65`	`+ {`
	`66`	`+ asyncBuilder = nextAsyncBuilder;`
	`67`	`+ }`
`60`	`68`	`}`
`61`	`69`	`}`
`62`	`70`	`else`