Merge pull request #3573 from vcsjones/fix-3566

Fix failing test in IntPtrGetHashCode.

1 files changed, 18 insertions, 2 deletions

diff --git a/tests/src/CoreMangLib/cti/system/intptr/intptrgethashcode.cs b/tests/src/CoreMangLib/cti/system/intptr/intptrgethashcode.cs
index 5f85489d40..ffc46c7d58 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/intptrgethashcode.cs
+++ b/tests/src/CoreMangLib/cti/system/intptr/intptrgethashcode.cs
@@ -67,9 +67,25 @@ public class IntPtrGetHashCode
         {
             byte* mem = stackalloc byte[1024];
             System.IntPtr ip = new IntPtr((void*)mem);
-            if (ip.GetHashCode() != (int)mem)
+            if (System.IntPtr.Size == 4)
+            {
+                if (ip.GetHashCode() != (int)mem)
+                {
+                    TestLibrary.TestFramework.LogError("002", "expect IntPtr.GetHashCode() equals the address");
+                    retVal = false;
+                }
+            }
+            else if (System.IntPtr.Size == 8)
+            {
+                if (ip.GetHashCode() != ((int)mem ^ (int)((long)mem >> 32)))
+                {
+                    TestLibrary.TestFramework.LogError("002", "expect IntPtr.GetHashCode() equals the address xor halves");
+                    retVal = false;
+                }
+            }
+            else
             {
-                TestLibrary.TestFramework.LogError("002", "expect IntPtr.GetHashCode() equals the address");
+                TestLibrary.TestFramework.LogError("002", "Unexpected IntPtr.Size: " + System.IntPtr.Size);
                 retVal = false;
             }
         }