Ensure that IsSupported being false disables the tracked hierachy in our tests (#88848)

tannergooding · web-flow · commit 9915e9825edf · 2023-07-14T11:10:53.000-07:00
diff --git a/src/tests/JIT/HardwareIntrinsics/X86/X86Base/CpuId.cs b/src/tests/JIT/HardwareIntrinsics/X86/X86Base/CpuId.cs
@@ -373,7 +373,7 @@ public unsafe static void CpuId()
         static bool IsBitIncorrect(int register, int bitNumber, Type isa, bool isSupported, string name, ref bool isHierarchyDisabled)
         {
             bool isSupportedByHardware = (register & (1 << bitNumber)) != 0;
-            isHierarchyDisabled |= !GetDotnetEnable(name);
+            isHierarchyDisabled |= (!isSupported || !GetDotnetEnable(name));
 
             if (isSupported)
             {
diff --git a/src/tests/readytorun/HardwareIntrinsics/X86/CpuId.cs b/src/tests/readytorun/HardwareIntrinsics/X86/CpuId.cs
@@ -366,7 +366,7 @@ public unsafe static int Main()
         static bool IsBitIncorrect(int register, int bitNumber, Type isa, bool isSupported, string name, ref bool isHierarchyDisabled)
         {
             bool isSupportedByHardware = (register & (1 << bitNumber)) != 0;
-            isHierarchyDisabled |= !GetDotnetEnable(name);
+            isHierarchyDisabled |= (!isSupported || !GetDotnetEnable(name));
 
             if (isSupported)
             {

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ public unsafe static void CpuId()`
`373`	`373`	`static bool IsBitIncorrect(int register, int bitNumber, Type isa, bool isSupported, string name, ref bool isHierarchyDisabled)`
`374`	`374`	`{`
`375`	`375`	`bool isSupportedByHardware = (register & (1 << bitNumber)) != 0;`
`376`		`- isHierarchyDisabled \|= !GetDotnetEnable(name);`
	`376`	`+ isHierarchyDisabled \|= (!isSupported \|\| !GetDotnetEnable(name));`
`377`	`377`
`378`	`378`	`if (isSupported)`
`379`	`379`	`{`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public unsafe static int Main()`
`366`	`366`	`static bool IsBitIncorrect(int register, int bitNumber, Type isa, bool isSupported, string name, ref bool isHierarchyDisabled)`
`367`	`367`	`{`
`368`	`368`	`bool isSupportedByHardware = (register & (1 << bitNumber)) != 0;`
`369`		`- isHierarchyDisabled \|= !GetDotnetEnable(name);`
	`369`	`+ isHierarchyDisabled \|= (!isSupported \|\| !GetDotnetEnable(name));`
`370`	`370`
`371`	`371`	`if (isSupported)`
`372`	`372`	`{`