Fix watson bucketing/broken triage dumps (#26670)

Mike McLaughlin · web-flow · commit 922429db0144 · 2019-09-12T15:39:39.000-07:00
Fix watson bucketing/broken triage dumps

The DAC EnumMemoryRegions needs to include some missing code version
manager memory.
diff --git a/src/vm/method.cpp b/src/vm/method.cpp
@@ -5475,6 +5475,11 @@ MethodDesc::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)
         }
     }
 
+#ifdef FEATURE_CODE_VERSIONING
+    // Make sure the active IL and native code version are in triage dumps.
+    GetCodeVersionManager()->GetActiveILCodeVersion(dac_cast<PTR_MethodDesc>(this)).GetActiveNativeCodeVersion(dac_cast<PTR_MethodDesc>(this));
+#endif
+
     // Also, call DacValidateMD to dump the memory it needs. !clrstack calls 
     // DacValidateMD before it retrieves the method name. We don't expect 
     // DacValidateMD to fail, but if it does, ignore the failure and try to assemble the 

Original file line number	Diff line number	Diff line change
`@@ -5475,6 +5475,11 @@ MethodDesc::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)`
`5475`	`5475`	`}`
`5476`	`5476`	`}`
`5477`	`5477`
	`5478`	`+#ifdef FEATURE_CODE_VERSIONING`
	`5479`	`+ // Make sure the active IL and native code version are in triage dumps.`
	`5480`	`+ GetCodeVersionManager()->GetActiveILCodeVersion(dac_cast<PTR_MethodDesc>(this)).GetActiveNativeCodeVersion(dac_cast<PTR_MethodDesc>(this));`
	`5481`	`+#endif`
	`5482`	`+`
`5478`	`5483`	`// Also, call DacValidateMD to dump the memory it needs. !clrstack calls`
`5479`	`5484`	`// DacValidateMD before it retrieves the method name. We don't expect`
`5480`	`5485`	`// DacValidateMD to fail, but if it does, ignore the failure and try to assemble the`