This is an archive of the discontinued LLVM Phabricator instance.

Differential D75820

tsan_interface.h: make constants static
ClosedPublic

Authored by cota on Mar 7 2020, 10:26 PM.

Details

Reviewers
dvyukov
Summary

Note that in C++ the static keyword is implicit for const objects.
In C however it is not, and we get clashes at link time after
including the header from more than one C file:

lib.a(bar.o):(.rodata+0x0): multiple definition of `__tsan_mutex_linker_init'
lib.a(foo.o):(.rodata+0x0): first defined here
lib.a(bar.o):(.rodata+0xc): multiple definition of `__tsan_mutex_not_static'
lib.a(foo.o):(.rodata+0xc): first defined here
<snip>

Indeed both foo.o and bar.o define the clashing symbols:

$ nm foo.o
<snip>
0000000000000000 R __tsan_mutex_linker_init
000000000000000c R __tsan_mutex_not_static
<snip>

Fix it by explicitly making the constants static.

Diff Detail

Event Timeline

cota created this revision.Mar 7 2020, 10:26 PM
Herald added subscribers: Restricted Project, llvm-commits. · View Herald TranscriptMar 7 2020, 10:26 PM
dvyukov accepted this revision.Mar 8 2020, 10:51 PM

Interesting difference between C and C++...
Do you want me to merge this as well? or you have commit access?
Thanks

This revision is now accepted and ready to land.Mar 8 2020, 10:51 PM
cota added a comment.Mar 9 2020, 9:57 AM

I have no commit access -- please merge it, thanks!

dvyukov closed this revision.Mar 10 2020, 1:15 AM

Committed in https://github.com/llvm/llvm-project/commit/a72dc86cddd26921f12184032e27abcc3be427cb
Thanks

Revision Contents

PathSize
include/
sanitizer/
20 lines

Diff 248984

include/sanitizer/tsan_interface.h

Show All 32 Lines
// Mutex creation flags are passed to __tsan_mutex_create annotation. // Mutex creation flags are passed to __tsan_mutex_create annotation.
// If mutex has no constructor and __tsan_mutex_create is not called, // If mutex has no constructor and __tsan_mutex_create is not called,
// the flags may be passed to __tsan_mutex_pre_lock/__tsan_mutex_post_lock // the flags may be passed to __tsan_mutex_pre_lock/__tsan_mutex_post_lock
// annotations. // annotations.
// Mutex has static storage duration and no-op constructor and destructor. // Mutex has static storage duration and no-op constructor and destructor.
// This effectively makes tsan ignore destroy annotation. // This effectively makes tsan ignore destroy annotation.
const unsigned __tsan_mutex_linker_init = 1 << 0; static const unsigned __tsan_mutex_linker_init = 1 << 0;
// Mutex is write reentrant. // Mutex is write reentrant.
const unsigned __tsan_mutex_write_reentrant = 1 << 1; static const unsigned __tsan_mutex_write_reentrant = 1 << 1;
// Mutex is read reentrant. // Mutex is read reentrant.
const unsigned __tsan_mutex_read_reentrant = 1 << 2; static const unsigned __tsan_mutex_read_reentrant = 1 << 2;
// Mutex does not have static storage duration, and must not be used after // Mutex does not have static storage duration, and must not be used after
// its destructor runs. The opposite of __tsan_mutex_linker_init. // its destructor runs. The opposite of __tsan_mutex_linker_init.
// If this flag is passed to __tsan_mutex_destroy, then the destruction // If this flag is passed to __tsan_mutex_destroy, then the destruction
// is ignored unless this flag was previously set on the mutex. // is ignored unless this flag was previously set on the mutex.
const unsigned __tsan_mutex_not_static = 1 << 8; static const unsigned __tsan_mutex_not_static = 1 << 8;
// Mutex operation flags: // Mutex operation flags:
// Denotes read lock operation. // Denotes read lock operation.
const unsigned __tsan_mutex_read_lock = 1 << 3; static const unsigned __tsan_mutex_read_lock = 1 << 3;
// Denotes try lock operation. // Denotes try lock operation.
const unsigned __tsan_mutex_try_lock = 1 << 4; static const unsigned __tsan_mutex_try_lock = 1 << 4;
// Denotes that a try lock operation has failed to acquire the mutex. // Denotes that a try lock operation has failed to acquire the mutex.
const unsigned __tsan_mutex_try_lock_failed = 1 << 5; static const unsigned __tsan_mutex_try_lock_failed = 1 << 5;
// Denotes that the lock operation acquires multiple recursion levels. // Denotes that the lock operation acquires multiple recursion levels.
// Number of levels is passed in recursion parameter. // Number of levels is passed in recursion parameter.
// This is useful for annotation of e.g. Java builtin monitors, // This is useful for annotation of e.g. Java builtin monitors,
// for which wait operation releases all recursive acquisitions of the mutex. // for which wait operation releases all recursive acquisitions of the mutex.
const unsigned __tsan_mutex_recursive_lock = 1 << 6; static const unsigned __tsan_mutex_recursive_lock = 1 << 6;
// Denotes that the unlock operation releases all recursion levels. // Denotes that the unlock operation releases all recursion levels.
// Number of released levels is returned and later must be passed to // Number of released levels is returned and later must be passed to
// the corresponding __tsan_mutex_post_lock annotation. // the corresponding __tsan_mutex_post_lock annotation.
const unsigned __tsan_mutex_recursive_unlock = 1 << 7; static const unsigned __tsan_mutex_recursive_unlock = 1 << 7;
// Annotate creation of a mutex. // Annotate creation of a mutex.
// Supported flags: mutex creation flags. // Supported flags: mutex creation flags.
void __tsan_mutex_create(void *addr, unsigned flags); void __tsan_mutex_create(void *addr, unsigned flags);
// Annotate destruction of a mutex. // Annotate destruction of a mutex.
// Supported flags: // Supported flags:
// - __tsan_mutex_linker_init // - __tsan_mutex_linker_init
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
void *__tsan_get_current_fiber(void); void *__tsan_get_current_fiber(void);
void *__tsan_create_fiber(unsigned flags); void *__tsan_create_fiber(unsigned flags);
void __tsan_destroy_fiber(void *fiber); void __tsan_destroy_fiber(void *fiber);
void __tsan_switch_to_fiber(void *fiber, unsigned flags); void __tsan_switch_to_fiber(void *fiber, unsigned flags);
void __tsan_set_fiber_name(void *fiber, const char *name); void __tsan_set_fiber_name(void *fiber, const char *name);
// Flags for __tsan_switch_to_fiber: // Flags for __tsan_switch_to_fiber:
// Do not establish a happens-before relation between fibers // Do not establish a happens-before relation between fibers
const unsigned __tsan_switch_to_fiber_no_sync = 1 << 0; static const unsigned __tsan_switch_to_fiber_no_sync = 1 << 0;
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
#endif // SANITIZER_TSAN_INTERFACE_H #endif // SANITIZER_TSAN_INTERFACE_H