Fix Windows x86 dumpheap (#1316)

Fix Windows x86 dumpheap

Re-enable GC tests for Windows x86

diff --git a/src/SOS/SOS.UnitTests/SOS.cs b/src/SOS/SOS.UnitTests/SOS.cs
index 3acc536ffbeb59338ecb84789b048a9c67069e5e..943dd5b909132b2b724b1f05cd0d5e281123911e 100644 (file)
--- a/src/SOS/SOS.UnitTests/SOS.cs
+++ b/src/SOS/SOS.UnitTests/SOS.cs
@@ -106,15 +106,6 @@ public class SOS
         }
     }
 
-    private static void SkipForIssue1289(TestConfiguration config)
-    {
-        // https://github.com/dotnet/diagnostics/issues/1289
-        if (config.IsNETCore && config.RuntimeFrameworkVersionMajor == 5 && config.TargetArchitecture == "x86")
-        {
-            throw new SkipTestException("DumpHeap command output does not contain 'Statistics' on .NET 5.0 x86.");
-        }
-    }
-
     [SkippableTheory, MemberData(nameof(Configurations))]
     public async Task DivZero(TestConfiguration config)
     {
@@ -124,8 +115,6 @@ public class SOS
     [SkippableTheory, MemberData(nameof(Configurations))]
     public async Task GCTests(TestConfiguration config)
     {
-        SkipForIssue1289(config);
-
         SkipIfArm(config);
 
         // Live only
@@ -193,8 +182,6 @@ public class SOS
     [SkippableTheory, MemberData(nameof(Configurations))]
     public async Task OtherCommands(TestConfiguration config)
     {
-        SkipForIssue1289(config);
-
         // This debuggee needs the directory of the exes/dlls to load the SymbolTestDll assembly.
         await RunTest("OtherCommands.script", information: new SOSRunner.TestInformation {
             TestConfiguration = config,
@@ -233,8 +220,6 @@ public class SOS
     [SkippableTheory, MemberData(nameof(GetConfigurations), "TestName", "SOS.WebApp3")]
     public async Task WebApp3(TestConfiguration config)
     {
-        SkipForIssue1289(config);
-
         await RunTest("WebApp.script", testLive: false, information: new SOSRunner.TestInformation {
             TestConfiguration = config,
             DebuggeeName = "WebApp3",
@@ -246,8 +231,6 @@ public class SOS
     [SkippableTheory, MemberData(nameof(GetConfigurations), "TestName", "SOS.DualRuntimes")]
     public async Task DualRuntimes(TestConfiguration config)
     {
-        SkipForIssue1289(config);
-
         // The assembly path, class and function name of the desktop test code to load/run
         string desktopTestParameters = TestConfiguration.MakeCanonicalPath(config.GetValue("DesktopTestParameters"));
         if (string.IsNullOrEmpty(desktopTestParameters))

diff --git a/src/SOS/Strike/sos.cpp b/src/SOS/Strike/sos.cpp
index 0f0d169bbb2e232865afdaff1834b1a3d83e13ac..939862171219dd4ab9bcbc82f55bc4e41b7dbacb 100644 (file)
--- a/src/SOS/Strike/sos.cpp
+++ b/src/SOS/Strike/sos.cpp
@@ -733,7 +733,7 @@ namespace sos
     void ObjectIterator::MoveToNextObject()
     {
         // Object::GetSize can be unaligned, so we must align it ourselves.
-        size_t size = (bLarge ? AlignLarge(mCurrObj.GetSize()) : Align(mCurrObj.GetSize()));
+        size_t size = (bLarge || bPinned) ? AlignLarge(mCurrObj.GetSize()) : Align(mCurrObj.GetSize());
 
         mLastObj = mCurrObj;
         mCurrObj = mCurrObj.GetAddress() + size;