Changeset 63bde81 for tests/unified_locking

Timestamp:

Jul 19, 2021, 4:03:19 PM (5 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

f9b68d6

Parents:

12a1013 (diff), fcaa1e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/unified_locking/mutex_test.hfa (modified) (2 diffs)

tests/unified_locking/mutex_test.hfa

@@ -8 +8 @@
 struct MutexObj {
         LOCK l;
-        $thread * id;
+        thread$ * id;
         uint32_t sum;
 };
@@ -22 +22 @@
 
 uint32_t cs() {
-        $thread * me = active_thread();
+        thread$ * me = active_thread();
         uint32_t value;
         lock(mo.l);