Changeset c8a0210 for tests/concurrent/spinaphore.cfa

Timestamp:

Apr 16, 2021, 2:28:09 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

665edf40

Parents:

857a1c6 (diff), 5f6a172 (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/concurrent/spinaphore.cfa (modified) (2 diffs)

tests/concurrent/spinaphore.cfa

@@ -49 +49 @@
 void main(Unblocker & this) {
         this.sum = 0;
-        unsigned me = (unsigned)&this;
+        unsigned me = (unsigned)(uintptr_t)&this;
         for(num_unblocks) {
                 $thread * t = V(sem, false);
                 Blocker * b = from_thread(t);
                 b->sum += me;
-                this.sum += (unsigned)b;
+                this.sum += (unsigned)(uintptr_t)b;
                 unpark(t);
                 yield(random(10));
@@ -73 +73 @@
                 for(i;num_blockers) {
                         for(num_blocks)
-                                usum += (unsigned)&blockers[i];
+                                usum += (unsigned)(uintptr_t)&blockers[i];
                 }
 
                 for(i;num_unblockers) {
                         for(num_unblocks)
-                                bsum += (unsigned)&unblockers[i];
+                                bsum += (unsigned)(uintptr_t)&unblockers[i];
                 }