maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

sanitizer_deadlock_detector.h: MSVC 2012 doesn't like compound literals 

llvm-svn: 206199
This commit is contained in:
Hans Wennborg 2014-04-14 17:43:45 +00:00
parent d60571bad7
commit ec77f619bb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector.h
View File

@ -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);
}