Merge pull request swiftlang#590 from triplef/fix-dispatch_wait_for_enqueuer

rokhinip · web-flow · commit 3e7c7980c183 · 2022-02-21T08:07:36.000-08:00
Fix possible crash in _dispatch_wait_for_enqueuer on Android armeabi-v7a
diff --git a/src/shims/yield.c b/src/shims/yield.c
@@ -36,7 +36,7 @@ void *
 _dispatch_wait_for_enqueuer(void **ptr)
 {
 #if !DISPATCH_HW_CONFIG_UP
-#if defined(__arm__) || defined(__arm64__)
+#if (defined(__arm__) && defined(__APPLE__)) || defined(__arm64__)
 	int spins = DISPATCH_WAIT_SPINS_WFE;
 	void *value;
 	while (unlikely(spins-- > 0)) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void *`
`36`	`36`	`_dispatch_wait_for_enqueuer(void **ptr)`
`37`	`37`	`{`
`38`	`38`	`#if !DISPATCH_HW_CONFIG_UP`
`39`		`-#if defined(__arm__) \|\| defined(__arm64__)`
	`39`	`+#if (defined(__arm__) && defined(__APPLE__)) \|\| defined(__arm64__)`
`40`	`40`	`int spins = DISPATCH_WAIT_SPINS_WFE;`
`41`	`41`	`void *value;`
`42`	`42`	`while (unlikely(spins-- > 0)) {`