Fix test issues

Author: MichaelRFairhurst

c/cert/test/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.qlref

@@ -1,6 +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(a,b) | Atomic variable possibly referred to twice in an $@. | test.c:11:3:11:23 | atomic_store(a,b) | expression |
-| test.c:12:3:12:35 | atomic_store_explicit(a,b,c) | Atomic variable possibly referred to twice in an $@. | test.c:12:3:12:35 | atomic_store_explicit(a,b,c) | expression |
-| test.c:25:3:25:49 | atomic_compare_exchange_weak(a,b,c) | Atomic variable possibly referred to twice in an $@. | test.c:25:3:25:49 | atomic_compare_exchange_weak(a,b,c) | expression |
-| test.c:26:3:27:42 | atomic_compare_exchange_weak_explicit(a,b,c,d,e) | Atomic variable possibly referred to twice in an $@. | test.c:26:3:27:42 | atomic_compare_exchange_weak_explicit(a,b,c,d,e) | 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

@@ -1,4 +1,4 @@
-| test.c:41:13:41:13 | x | Invalid access to member '$@' on atomic struct or union. | test.c:5:7:5:7 | x | x |
-| test.c:42:18:42:18 | x | Invalid access to member '$@' on atomic struct or union. | test.c:5:7:5:7 | x | x |
 | test.c:43:13:43:13 | x | Invalid access to member '$@' on atomic struct or union. | test.c:5:7:5:7 | x | x |
 | test.c:44:18:44:18 | x | Invalid access to member '$@' on atomic struct or union. | test.c:5:7:5:7 | x | x |
+| test.c:45:13:45:13 | x | Invalid access to member '$@' on atomic struct or union. | test.c:5:7:5:7 | x | x |
+| test.c:46:18:46:18 | x | Invalid access to member '$@' on atomic struct or union. | test.c:5:7:5:7 | x | x |

c/misra/test/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.expected

@@ -1,7 +1,7 @@
 #include "stdatomic.h"
 #include "string.h"
 
-typedef struct s2 {
+typedef struct s1 {
   int x;
 } s1;
 
@@ -16,14 +16,16 @@ _Atomic int g3;
 void takeCopy(s1 p1);
 
 void f1() {
-  s1 *l1;
+  s1 l1;
+  s1 *l2;
   l1 = atomic_load(&atomic_s1);     // COMPLIANT
   l1 = atomic_load(ptr_atomic_s1);  // COMPLIANT
-  l1 = atomic_load(&s1_atomic_ptr); // COMPLIANT
-  l1->x = 4;                        // COMPLIANT
+  l2 = atomic_load(&s1_atomic_ptr); // COMPLIANT
+  l1.x = 4;                         // COMPLIANT
+  l2->x = 4;                        // COMPLIANT
   atomic_store(&atomic_s1, l1);     // COMPLIANT
   atomic_store(ptr_atomic_s1, l1);  // COMPLIANT
-  atomic_store(&s1_atomic_ptr, l1); // COMPLIANT
+  atomic_store(&s1_atomic_ptr, l2); // COMPLIANT
 
   // Undefined behavior, but not banned by this rule.
   memset(&atomic_s1, sizeof(atomic_s1), 0);         // COMPLIANT
@@ -34,8 +36,8 @@ void f1() {
   takeCopy(*ptr_atomic_s1); // COMPLIANT
   atomic_s1 = (s1){0};      // COMPLIANT
   *ptr_atomic_s1 = (s1){0}; // COMPLIANT
-  atomic_s1 = *l1;          // COMPLIANT
-  ptr_atomic_s1 = l1;       // COMPLIANT
+  atomic_s1 = *l2;          // COMPLIANT
+  ptr_atomic_s1 = l2;       // COMPLIANT
 
   // Banned: circumvents data-race protection, results in UB.
   atomic_s1.x;          // NON-COMPLIANT
@@ -54,6 +56,6 @@ void f1() {
   memset(s1_atomic_ptr, sizeof(*s1_atomic_ptr), 0); // COMPLIANT
   takeCopy(*s1_atomic_ptr);                         // COMPLIANT
   *s1_atomic_ptr = (s1){0};                         // COMPLIANT
-  s1_atomic_ptr = l1;                               // COMPLIANT
+  s1_atomic_ptr = l2;                               // COMPLIANT
   s1_atomic_ptr->x;                                 // COMPLIANT
 }