Index: tests/builtins/sync.cfa
===================================================================
--- tests/builtins/sync.cfa	(revision 5b11c25668bf48e43c6bf9f0e7c460acb2ca76f5)
+++ tests/builtins/sync.cfa	(revision 8278abfe651317e9b27dc124c600abcf84e8bc7b)
@@ -11,4 +11,5 @@
 	volatile __int128 * vp16 = 0; __int128 * rp16 = 0; __int128 v16 = 0;
 	#endif
+	struct type * volatile * vpp = 0; struct type ** rpp = 0; struct type * vp = 0;
 
 	{ char ret; ret = __sync_fetch_and_add(vp1, v1); }
@@ -180,4 +181,5 @@
 	{ _Bool ret; ret = __sync_bool_compare_and_swap_16(vp16, v16,v16); }
 	#endif
+	{ _Bool ret; ret = __sync_bool_compare_and_swap(vpp, vp, vp); }
 
 	{ char ret; ret = __sync_val_compare_and_swap(vp1, v1, v1); }
@@ -193,4 +195,6 @@
 	{ __int128 ret; ret = __sync_val_compare_and_swap_16(vp16, v16,v16); }
 	#endif
+	{ struct type * ret; ret = __sync_val_compare_and_swap(vpp, vp, vp); }
+
 
 	{ char ret; ret = __sync_lock_test_and_set(vp1, v1); }
@@ -230,21 +234,23 @@
 	{ __atomic_clear(vp1, v1); }
 
-	{ char ret; ret = __atomic_exchange_n(vp1, &v1, __ATOMIC_SEQ_CST); }
+	{ char ret; ret = __atomic_exchange_n(vp1, v1, __ATOMIC_SEQ_CST); }
 	{ char ret; ret = __atomic_exchange_1(vp1, v1, __ATOMIC_SEQ_CST); }
 	{ char ret; __atomic_exchange(vp1, &v1, &ret, __ATOMIC_SEQ_CST); }
-	{ short ret; ret = __atomic_exchange_n(vp2, &v2, __ATOMIC_SEQ_CST); }
+	{ short ret; ret = __atomic_exchange_n(vp2, v2, __ATOMIC_SEQ_CST); }
 	{ short ret; ret = __atomic_exchange_2(vp2, v2, __ATOMIC_SEQ_CST); }
 	{ short ret; __atomic_exchange(vp2, &v2, &ret, __ATOMIC_SEQ_CST); }
-	{ int ret; ret = __atomic_exchange_n(vp4, &v4, __ATOMIC_SEQ_CST); }
+	{ int ret; ret = __atomic_exchange_n(vp4, v4, __ATOMIC_SEQ_CST); }
 	{ int ret; ret = __atomic_exchange_4(vp4, v4, __ATOMIC_SEQ_CST); }
 	{ int ret; __atomic_exchange(vp4, &v4, &ret, __ATOMIC_SEQ_CST); }
-	{ long long int ret; ret = __atomic_exchange_n(vp8, &v8, __ATOMIC_SEQ_CST); }
+	{ long long int ret; ret = __atomic_exchange_n(vp8, v8, __ATOMIC_SEQ_CST); }
 	{ long long int ret; ret = __atomic_exchange_8(vp8, v8, __ATOMIC_SEQ_CST); }
 	{ long long int ret; __atomic_exchange(vp8, &v8, &ret, __ATOMIC_SEQ_CST); }
 	#if defined(__SIZEOF_INT128__)
-	{ __int128 ret; ret = __atomic_exchange_n(vp16, &v16, __ATOMIC_SEQ_CST); }
+	{ __int128 ret; ret = __atomic_exchange_n(vp16, v16, __ATOMIC_SEQ_CST); }
 	{ __int128 ret; ret = __atomic_exchange_16(vp16, v16, __ATOMIC_SEQ_CST); }
 	{ __int128 ret; __atomic_exchange(vp16, &v16, &ret, __ATOMIC_SEQ_CST); }
 	#endif
+	{ struct type * ret; ret = __atomic_exchange_n(vpp, vp, __ATOMIC_SEQ_CST); }
+	{ struct type * ret; __atomic_exchange(vpp, &vp, &ret, __ATOMIC_SEQ_CST); }
 
 	{ char ret; ret = __atomic_load_n(vp1, __ATOMIC_SEQ_CST); }
@@ -265,4 +271,6 @@
 	{ __int128 ret; __atomic_load(vp16, &ret, __ATOMIC_SEQ_CST); }
 	#endif
+	{ struct type * ret; ret = __atomic_load_n(vpp, __ATOMIC_SEQ_CST); }
+	{ struct type * ret; __atomic_load(vpp, &ret, __ATOMIC_SEQ_CST); }
 
 	{ _Bool ret; ret = __atomic_compare_exchange_n(vp1, rp1, v1, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); }
@@ -283,4 +291,6 @@
 	{ _Bool ret; ret = __atomic_compare_exchange(vp16, rp16, &v16, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); }
 	#endif
+	{ _Bool ret; ret = __atomic_compare_exchange_n(vpp, rpp, vp, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); }
+	{ _Bool ret; ret = __atomic_compare_exchange(vpp, rpp, &vp, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); }
 
 	{ __atomic_store_n(vp1, v1, __ATOMIC_SEQ_CST); }
@@ -301,4 +311,6 @@
 	{ __atomic_store(vp16, &v16, __ATOMIC_SEQ_CST); }
 	#endif
+	{ __atomic_store_n(vpp, vp, __ATOMIC_SEQ_CST); }
+	{ __atomic_store(vpp, &vp, __ATOMIC_SEQ_CST); }
 
 	{ char ret; ret = __atomic_add_fetch(vp1, v1, __ATOMIC_SEQ_CST); }