compiler compatability

Author: jsinglet

c/cert/test/rules/CON40-C/AtomicVariableTwiceInExpression.expected

@@ -1,6 +1,6 @@
-| test.c:6:19:6:40 | ATOMIC_VAR_INIT(value) | Atomic variable possibly referred to twice in an $@. | test.c:32:3:32:10 | ... += ... | expression |
-| test.c:6:19:6:40 | ATOMIC_VAR_INIT(value) | Atomic variable possibly referred to twice in an $@. | test.c:33:3:33:13 | ... = ... | expression |
-| test.c:10:3:10:23 | atomic_store(a,b) | Atomic variable possibly referred to twice in an $@. | test.c:10:3:10:23 | atomic_store(a,b) | expression |
-| test.c:11:3:11:35 | atomic_store_explicit(a,b,c) | Atomic variable possibly referred to twice in an $@. | test.c:11:3:11:35 | atomic_store_explicit(a,b,c) | expression |
-| test.c:24:3:24:48 | atomic_compare_exchange_weak(a,b,c) | Atomic variable possibly referred to twice in an $@. | test.c:24:3:24:48 | atomic_compare_exchange_weak(a,b,c) | expression |
-| test.c:25:3:26:45 | atomic_compare_exchange_weak_explicit(a,b,c,d,e) | Atomic variable possibly referred to twice in an $@. | test.c:25:3:26:45 | atomic_compare_exchange_weak_explicit(a,b,c,d,e) | expression |
+| test.c:7:18:7:39 | ATOMIC_VAR_INIT(value) | Atomic variable possibly referred to twice in an $@. | test.c:33:3:33:10 | ... += ... | expression |
+| test.c:7:18:7:39 | ATOMIC_VAR_INIT(value) | Atomic variable possibly referred to twice in an $@. | test.c:34:3:34:13 | ... = ... | expression |
+| test.c:11:3:11:23 | atomic_store(object,desired) | Atomic variable possibly referred to twice in an $@. | test.c:11:3:11:23 | atomic_store(object,desired) | expression |
+| test.c:12:3:12:23 | atomic_store_explicit | Atomic variable possibly referred to twice in an $@. | test.c:12:3:12:23 | atomic_store_explicit | expression |
+| test.c:25:3:25:49 | atomic_compare_exchange_weak(object,expected,desired) | Atomic variable possibly referred to twice in an $@. | test.c:25:3:25:49 | atomic_compare_exchange_weak(object,expected,desired) | expression |
+| test.c:26:3:26:39 | atomic_compare_exchange_weak_explicit | Atomic variable possibly referred to twice in an $@. | test.c:26:3:26:39 | atomic_compare_exchange_weak_explicit | expression |

c/cert/test/rules/CON40-C/AtomicVariableTwiceInExpression.expected.clang

@@ -0,0 +1,6 @@
+| test.c:7:18:7:39 | ATOMIC_VAR_INIT(value) | Atomic variable possibly referred to twice in an $@. | test.c:33:3:33:10 | ... += ... | expression |
+| test.c:7:18:7:39 | ATOMIC_VAR_INIT(value) | Atomic variable possibly referred to twice in an $@. | test.c:34:3:34:13 | ... = ... | expression |
+| test.c:11:3:11:23 | atomic_store(object,desired) | Atomic variable possibly referred to twice in an $@. | test.c:11:3:11:23 | atomic_store(object,desired) | expression |
+| test.c:12:3:12:23 | atomic_store_explicit | Atomic variable possibly referred to twice in an $@. | test.c:12:3:12:23 | atomic_store_explicit | expression |
+| test.c:25:3:25:49 | atomic_compare_exchange_weak(object,expected,desired) | Atomic variable possibly referred to twice in an $@. | test.c:25:3:25:49 | atomic_compare_exchange_weak(object,expected,desired) | expression |
+| test.c:26:3:26:39 | atomic_compare_exchange_weak_explicit | Atomic variable possibly referred to twice in an $@. | test.c:26:3:26:39 | atomic_compare_exchange_weak_explicit | expression |

c/cert/test/rules/CON40-C/AtomicVariableTwiceInExpression.expected.gcc

@@ -0,0 +1,6 @@
+| test.c:7:18:7:39 | ATOMIC_VAR_INIT(VALUE) | Atomic variable possibly referred to twice in an $@. | test.c:33:3:33:10 | ... += ... | expression |
+| test.c:7:18:7:39 | ATOMIC_VAR_INIT(VALUE) | Atomic variable possibly referred to twice in an $@. | test.c:34:3:34:13 | ... = ... | expression |
+| test.c:11:3:11:23 | atomic_store(PTR,VAL) | Atomic variable possibly referred to twice in an $@. | test.c:11:3:11:23 | atomic_store(PTR,VAL) | expression |
+| test.c:12:3:12:35 | atomic_store_explicit(PTR,VAL,MO) | Atomic variable possibly referred to twice in an $@. | test.c:12:3:12:35 | atomic_store_explicit(PTR,VAL,MO) | expression |
+| test.c:25:3:25:49 | atomic_compare_exchange_weak(PTR,VAL,DES) | Atomic variable possibly referred to twice in an $@. | test.c:25:3:25:49 | atomic_compare_exchange_weak(PTR,VAL,DES) | expression |
+| test.c:26:3:27:42 | atomic_compare_exchange_weak_explicit(PTR,VAL,DES,SUC,FAIL) | Atomic variable possibly referred to twice in an $@. | test.c:26:3:27:42 | atomic_compare_exchange_weak_explicit(PTR,VAL,DES,SUC,FAIL) | expression |

c/cert/test/rules/CON40-C/test.c

@@ -1,10 +1,11 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 
-static bool fl1 = ATOMIC_VAR_INIT(false);
-static bool fl2 = ATOMIC_VAR_INIT(false);
-static bool fl3 = ATOMIC_VAR_INIT(false);
-static bool fl4 = ATOMIC_VAR_INIT(false);
+static _Atomic int fl1 = ATOMIC_VAR_INIT(false);
+static _Atomic int fl2 = ATOMIC_VAR_INIT(false);
+static int fl2a = ATOMIC_VAR_INIT(false);
+static int fl3 = ATOMIC_VAR_INIT(false);
+static int fl4 = ATOMIC_VAR_INIT(false);
 
 void f1() {
   atomic_store(&fl1, 0);             // NON_COMPLIANT
@@ -13,17 +14,17 @@ void f1() {
 
 void f2() {
   do {
-  } while (!atomic_compare_exchange_weak(&fl2, &fl2, &fl2)); // COMPLIANT
+  } while (!atomic_compare_exchange_weak(&fl2, &fl2a, fl2a)); // COMPLIANT
 
   do {
-  } while (!atomic_compare_exchange_weak_explicit(&fl2, &fl2, &fl2, &fl2,
-                                                  &fl2)); // COMPLIANT
+  } while (!atomic_compare_exchange_weak_explicit(&fl2, &fl2a, fl2a, 0,
+                                                  0)); // COMPLIANT
 }
 
 void f3() {
-  atomic_compare_exchange_weak(&fl2, &fl2, &fl2); // NON_COMPLIANT
-  atomic_compare_exchange_weak_explicit(&fl2, &fl2, &fl2, &fl2,
-                                        &fl2); // NON_COMPLIANT
+  atomic_compare_exchange_weak(&fl2, &fl2a, fl2a); // NON_COMPLIANT
+  atomic_compare_exchange_weak_explicit(&fl2, &fl2a, fl2a, 0,
+                                        0); // NON_COMPLIANT
 }
 
 void f4() { fl3 ^= true; }