Merge branch 'vd/pthread-setspecific-g11-fix' into maint

gitster · gitster · commit 5fbd2fc5997d · 2021-11-04T12:24:20.000-07:00
One CI task based on Fedora image noticed a not-quite-kosher
consturct recently, which has been corrected.

* vd/pthread-setspecific-g11-fix:
  async_die_is_recursing: work around GCC v11.x issue on Fedora
diff --git a/run-command.c b/run-command.c
@@ -1093,7 +1093,7 @@ static NORETURN void die_async(const char *err, va_list params)
 static int async_die_is_recursing(void)
 {
 	void *ret = pthread_getspecific(async_die_counter);
-	pthread_setspecific(async_die_counter, (void *)1);
+	pthread_setspecific(async_die_counter, &async_die_counter); /* set to any non-NULL valid pointer */
 	return ret != NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,7 @@ static NORETURN void die_async(const char *err, va_list params)`
`1093`	`1093`	`static int async_die_is_recursing(void)`
`1094`	`1094`	`{`
`1095`	`1095`	`void *ret = pthread_getspecific(async_die_counter);`
`1096`		`- pthread_setspecific(async_die_counter, (void *)1);`
	`1096`	`+ pthread_setspecific(async_die_counter, &async_die_counter); /* set to any non-NULL valid pointer */`
`1097`	`1097`	`return ret != NULL;`
`1098`	`1098`	`}`
`1099`	`1099`