diff options
author | Hans Wennborg <hans@hanshq.net> | 2014-04-14 17:43:45 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2014-04-14 17:43:45 +0000 |
commit | 481560ea7eecdfb327a303a2a02884d9a441764e (patch) | |
tree | 1bbfddb9fbd9c2b511f091a6e843647b5b463c1d /lib | |
parent | a4a7111220149d72f3a44b07116bbdd56e6517ed (diff) |
sanitizer_deadlock_detector.h: MSVC 2012 doesn't like compound literals
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@206199 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sanitizer_common/sanitizer_deadlock_detector.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/sanitizer_common/sanitizer_deadlock_detector.h b/lib/sanitizer_common/sanitizer_deadlock_detector.h index e0beb1261..90e1cc4eb 100644 --- a/lib/sanitizer_common/sanitizer_deadlock_detector.h +++ b/lib/sanitizer_common/sanitizer_deadlock_detector.h @@ -67,7 +67,8 @@ class DeadlockDetectorTLS { CHECK_LT(n_all_locks_, ARRAY_SIZE(all_locks_with_contexts_)); // lock_id < BV::kSize, can cast to a smaller int. u32 lock_id_short = static_cast<u32>(lock_id); - all_locks_with_contexts_[n_all_locks_++] = {lock_id_short, stk}; + LockWithContext l = {lock_id_short, stk}; + all_locks_with_contexts_[n_all_locks_++] = l; return true; } @@ -244,10 +245,12 @@ class DeadlockDetector { uptr n_added_edges = g_.addEdges(dtls->getLocks(current_epoch_), cur_idx, added_edges, ARRAY_SIZE(added_edges)); for (uptr i = 0; i < n_added_edges; i++) { - if (n_edges_ < ARRAY_SIZE(edges_)) - edges_[n_edges_++] = {(u16)added_edges[i], (u16)cur_idx, - dtls->findLockContext(added_edges[i]), stk, - unique_tid}; + if (n_edges_ < ARRAY_SIZE(edges_)) { + Edge e = {(u16)added_edges[i], (u16)cur_idx, + dtls->findLockContext(added_edges[i]), stk, + unique_tid}; + edges_[n_edges_++] = e; + } // Printf("Edge%zd: %u %zd=>%zd in T%d\n", // n_edges_, stk, added_edges[i], cur_idx, unique_tid); } |