Changeset 60401b76 for src/tests

Timestamp:

Feb 28, 2017, 4:44:00 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

be65cca

Parents:

1e6b350 (diff), 20221d4 (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

Location:

src/tests

Files:

• .expect/multi-monitor.txt (added)
• monitor.c (modified) (1 diff)
• multi-monitor.c (added)

src/tests/monitor.c

@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        monitor_guard_t g1 = { &this->m };
+        __monitor_t * mon = &this->m;
+        monitor_guard_t g1 = { &mon };
         {
-                monitor_guard_t g2 = { &this->m };
+                monitor_guard_t g2 = { &mon };
                 {
-                        monitor_guard_t g3 = { &this->m };
+                        monitor_guard_t g3 = { &mon };
                         this->value += 1;
                 }