[sanitizer] Restrict querying VM size on Darwin only to iOS devices

kubamracek · kubamracek · commit 5c30b2e0469c · 2020-12-15T12:17:46.000-08:00
We currently do this for SANITIZER_IOS, which includes devices *and* simulators. This change opts out the check for simulators to unify the behavior with macOS, because VM size is really a property of the host OS, and not the simulator. <rdar://problem/72129387> Differential Revision: https://reviews.llvm.org/D93140
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
@@ -1003,7 +1003,7 @@ char **GetArgv() {
   return *_NSGetArgv();
 }
 
-#if SANITIZER_IOS
+#if SANITIZER_IOS && !SANITIZER_IOSSIM
 // The task_vm_info struct is normally provided by the macOS SDK, but we need
 // fields only available in 10.12+. Declare the struct manually to be able to
 // build against older SDKs.

Original file line number	Diff line number	Diff line change
`@@ -1003,7 +1003,7 @@ char **GetArgv() {`
`1003`	`1003`	`return *_NSGetArgv();`
`1004`	`1004`	`}`
`1005`	`1005`
`1006`		`-#if SANITIZER_IOS`
	`1006`	`+#if SANITIZER_IOS && !SANITIZER_IOSSIM`
`1007`	`1007`	`// The task_vm_info struct is normally provided by the macOS SDK, but we need`
`1008`	`1008`	`// fields only available in 10.12+. Declare the struct manually to be able to`
`1009`	`1009`	`// build against older SDKs.`