diff options
Diffstat (limited to 'compiler-rt/lib')
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_defs.h | 19 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_rtl.h | 5 |
2 files changed, 8 insertions, 16 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_defs.h b/compiler-rt/lib/tsan/rtl/tsan_defs.h index 2002ad0ae9b..d68bc354482 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_defs.h +++ b/compiler-rt/lib/tsan/rtl/tsan_defs.h @@ -123,27 +123,24 @@ void build_consistency_shadow8(); static inline void USED build_consistency() { #if TSAN_DEBUG - void(*volatile cfg)() = &build_consistency_debug; + build_consistency_debug(); #else - void(*volatile cfg)() = &build_consistency_release; + build_consistency_release(); #endif #if TSAN_COLLECT_STATS - void(*volatile stats)() = &build_consistency_stats; + build_consistency_stats(); #else - void(*volatile stats)() = &build_consistency_nostats; + build_consistency_nostats(); #endif #if TSAN_SHADOW_COUNT == 1 - void(*volatile shadow)() = &build_consistency_shadow1; + build_consistency_shadow1(); #elif TSAN_SHADOW_COUNT == 2 - void(*volatile shadow)() = &build_consistency_shadow2; + build_consistency_shadow2(); #elif TSAN_SHADOW_COUNT == 4 - void(*volatile shadow)() = &build_consistency_shadow4; + build_consistency_shadow4(); #else - void(*volatile shadow)() = &build_consistency_shadow8; + build_consistency_shadow8(); #endif - (void)cfg; - (void)stats; - (void)shadow; } template<typename T> diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h index 5da0b14d272..fc585243477 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h @@ -39,11 +39,6 @@ namespace __tsan { void Printf(const char *format, ...) FORMAT(1, 2); uptr Snprintf(char *buffer, uptr length, const char *format, ...) FORMAT(3, 4); -inline void NOINLINE breakhere() { - volatile int x = 42; - (void)x; -} - // FastState (from most significant bit): // unused : 1 // tid : kTidBits |
