Merge commit '246603125da1' from apple/stable/20210107 into swift/release/5.5

git apple-llvm automerger · git apple-llvm automerger · commit 907947e499b1 · 2021-07-20T08:23:46.000-07:00
diff --git a/llvm/unittests/Support/Host.cpp b/llvm/unittests/Support/Host.cpp
@@ -39,7 +39,7 @@ class HostTest : public testing::Test {
     // physical cores, which is currently only supported/tested on
     // some systems.
     return (Host.isOSWindows() && llvm_is_multithreaded()) ||
-           (Host.isX86() && (Host.isOSDarwin() || Host.isOSLinux())) ||
+           Host.isOSDarwin() || (Host.isX86() && Host.isOSLinux()) ||
            (Host.isPPC64() && Host.isOSLinux()) ||
            (Host.isSystemZ() && (Host.isOSLinux() || Host.isOSzOS()));
   }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class HostTest : public testing::Test {`
`39`	`39`	`// physical cores, which is currently only supported/tested on`
`40`	`40`	`// some systems.`
`41`	`41`	`return (Host.isOSWindows() && llvm_is_multithreaded()) \|\|`
`42`		`- (Host.isX86() && (Host.isOSDarwin() \|\| Host.isOSLinux())) \|\|`
	`42`	`+ Host.isOSDarwin() \|\| (Host.isX86() && Host.isOSLinux()) \|\|`
`43`	`43`	`(Host.isPPC64() && Host.isOSLinux()) \|\|`
`44`	`44`	`(Host.isSystemZ() && (Host.isOSLinux() \|\| Host.isOSzOS()));`
`45`	`45`	`}`