This is an archive of the discontinued LLVM Phabricator instance.

Differential D32360

[tsan] Refactor __tsan_external_read/__tsan_external_write to avoid code duplication
ClosedPublic

Authored by kubamracek on Apr 21 2017, 10:37 AM.

Details

Reviewers
dvyukov
Commits
rG428b36671c91: [tsan] Refactor __tsan_external_read/__tsan_external_write to avoid code…
rCRT301008: [tsan] Refactor __tsan_external_read/__tsan_external_write to avoid code…
rL301008: [tsan] Refactor __tsan_external_read/__tsan_external_write to avoid code…
Summary

Let's introduce a ExternalAccess function that has the shared code only once.

Diff Detail

Repository
rL LLVM

Revision Contents

PathSize
compiler-rt/
trunk/
lib/
tsan/
rtl/
36 lines

Diff 96183

compiler-rt/trunk/lib/tsan/rtl/tsan_external.cc

Show All 24 Lines
const char *GetObjectTypeFromTag(uptr tag) { const char *GetObjectTypeFromTag(uptr tag) {
if (tag == 0) return nullptr; if (tag == 0) return nullptr;
// Invalid/corrupted tag? Better return NULL and let the caller deal with it. // Invalid/corrupted tag? Better return NULL and let the caller deal with it.
if (tag >= atomic_load(&used_tags, memory_order_relaxed)) return nullptr; if (tag >= atomic_load(&used_tags, memory_order_relaxed)) return nullptr;
return registered_tags[tag]; return registered_tags[tag];
} }
typedef void(*AccessFunc)(ThreadState *, uptr, uptr, int);
void ExternalAccess(void *addr, void *caller_pc, void *tag, AccessFunc access) {
CHECK_LT(tag, atomic_load(&used_tags, memory_order_relaxed));
ThreadState *thr = cur_thread();
thr->external_tag = (uptr)tag;
if (caller_pc) FuncEntry(thr, (uptr)caller_pc);
bool in_ignored_lib;
if (!caller_pc || !libignore()->IsIgnored((uptr)caller_pc, &in_ignored_lib)) {
access(thr, CALLERPC, (uptr)addr, kSizeLog1);
}
if (caller_pc) FuncExit(thr);
thr->external_tag = 0;
}
extern "C" { extern "C" {
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void *__tsan_external_register_tag(const char *object_type) { void *__tsan_external_register_tag(const char *object_type) {
uptr new_tag = atomic_fetch_add(&used_tags, 1, memory_order_relaxed); uptr new_tag = atomic_fetch_add(&used_tags, 1, memory_order_relaxed);
CHECK_LT(new_tag, kMaxTag); CHECK_LT(new_tag, kMaxTag);
registered_tags[new_tag] = internal_strdup(object_type); registered_tags[new_tag] = internal_strdup(object_type);
return (void *)new_tag; return (void *)new_tag;
} }
Show All 9 Linesvoid __tsan_external_assign_tag(void *addr, void *tag) {
} }
if (b) { if (b) {
b->tag = (uptr)tag; b->tag = (uptr)tag;
} }
} }
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __tsan_external_read(void *addr, void *caller_pc, void *tag) { void __tsan_external_read(void *addr, void *caller_pc, void *tag) {
CHECK_LT(tag, atomic_load(&used_tags, memory_order_relaxed)); ExternalAccess(addr, caller_pc, tag, MemoryRead);
ThreadState *thr = cur_thread();
thr->external_tag = (uptr)tag;
if (caller_pc) FuncEntry(thr, (uptr)caller_pc);
bool in_ignored_lib;
if (!caller_pc || !libignore()->IsIgnored((uptr)caller_pc, &in_ignored_lib)) {
MemoryRead(thr, CALLERPC, (uptr)addr, kSizeLog1);
}
if (caller_pc) FuncExit(thr);
thr->external_tag = 0;
} }
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
void __tsan_external_write(void *addr, void *caller_pc, void *tag) { void __tsan_external_write(void *addr, void *caller_pc, void *tag) {
CHECK_LT(tag, atomic_load(&used_tags, memory_order_relaxed)); ExternalAccess(addr, caller_pc, tag, MemoryWrite);
ThreadState *thr = cur_thread();
thr->external_tag = (uptr)tag;
if (caller_pc) FuncEntry(thr, (uptr)caller_pc);
bool in_ignored_lib;
if (!caller_pc || !libignore()->IsIgnored((uptr)caller_pc, &in_ignored_lib)) {
MemoryWrite(thr, CALLERPC, (uptr)addr, kSizeLog1);
}
if (caller_pc) FuncExit(thr);
thr->external_tag = 0;
} }
} // extern "C" } // extern "C"
} // namespace __tsan } // namespace __tsan