[compiler-rt] r225079 - Revert r224736: "[Sanitizer] Make CommonFlags immutable after initialization."
Chandler Carruth
chandlerc at gmail.com
Fri Jan 2 01:59:39 PST 2015
Author: chandlerc
Date: Fri Jan 2 03:59:38 2015
New Revision: 225079
URL: http://llvm.org/viewvc/llvm-project?rev=225079&view=rev
Log:
Revert r224736: "[Sanitizer] Make CommonFlags immutable after initialization."
We've got some internal users that either aren't compatible with this or
have found a bug with it. Either way, this is an isolated cleanup and so
I'm reverting it to un-block folks while we investigate. Alexey and
I will be working on fixing everything up so this can be re-committed
soon. Sorry for the noise and any inconvenience.
Modified:
compiler-rt/trunk/lib/asan/asan_flags.cc
compiler-rt/trunk/lib/lsan/lsan_common.cc
compiler-rt/trunk/lib/msan/msan.cc
compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h
compiler-rt/trunk/lib/tsan/dd/dd_rtl.cc
compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc
compiler-rt/trunk/lib/ubsan/ubsan_flags.cc
Modified: compiler-rt/trunk/lib/asan/asan_flags.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_flags.cc?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_flags.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_flags.cc Fri Jan 2 03:59:38 2015
@@ -172,15 +172,13 @@ void ParseFlagsFromString(Flags *f, cons
}
void InitializeFlags(Flags *f) {
+ CommonFlags *cf = common_flags();
SetCommonFlagsDefaults();
- {
- CommonFlags cf = *common_flags();
- cf.detect_leaks = CAN_SANITIZE_LEAKS;
- cf.external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH");
- cf.malloc_context_size = kDefaultMallocContextSize;
- cf.intercept_tls_get_addr = true;
- OverrideCommonFlags(cf);
- }
+ cf->detect_leaks = CAN_SANITIZE_LEAKS;
+ cf->external_symbolizer_path = GetEnv("ASAN_SYMBOLIZER_PATH");
+ cf->malloc_context_size = kDefaultMallocContextSize;
+ cf->intercept_tls_get_addr = true;
+ cf->coverage = false;
internal_memset(f, 0, sizeof(*f));
f->quarantine_size = (ASAN_LOW_MEMORY) ? 1UL << 26 : 1UL << 28;
@@ -260,17 +258,17 @@ void InitializeFlags(Flags *f) {
}
// Flag validation:
- if (!CAN_SANITIZE_LEAKS && common_flags()->detect_leaks) {
+ if (!CAN_SANITIZE_LEAKS && cf->detect_leaks) {
Report("%s: detect_leaks is not supported on this platform.\n",
SanitizerToolName);
- Die();
+ cf->detect_leaks = false;
}
// Make "strict_init_order" imply "check_initialization_order".
// TODO(samsonov): Use a single runtime flag for an init-order checker.
if (f->strict_init_order) {
f->check_initialization_order = true;
}
- CHECK_LE((uptr)common_flags()->malloc_context_size, kStackTraceMax);
+ CHECK_LE((uptr)cf->malloc_context_size, kStackTraceMax);
CHECK_LE(f->min_uar_stack_size_log, f->max_uar_stack_size_log);
CHECK_GE(f->redzone, 16);
CHECK_GE(f->max_redzone, f->redzone);
Modified: compiler-rt/trunk/lib/lsan/lsan_common.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.cc?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/lsan_common.cc (original)
+++ compiler-rt/trunk/lib/lsan/lsan_common.cc Fri Jan 2 03:59:38 2015
@@ -74,13 +74,12 @@ static void InitializeFlags(bool standal
// Set defaults for common flags (only in standalone mode) and parse
// them from LSAN_OPTIONS.
+ CommonFlags *cf = common_flags();
if (standalone) {
SetCommonFlagsDefaults();
- CommonFlags cf = *common_flags();
- cf.external_symbolizer_path = GetEnv("LSAN_SYMBOLIZER_PATH");
- cf.malloc_context_size = 30;
- cf.detect_leaks = true;
- OverrideCommonFlags(cf);
+ cf->external_symbolizer_path = GetEnv("LSAN_SYMBOLIZER_PATH");
+ cf->malloc_context_size = 30;
+ cf->detect_leaks = true;
}
ParseCommonFlagsFromString(options);
}
Modified: compiler-rt/trunk/lib/msan/msan.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan.cc?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan.cc (original)
+++ compiler-rt/trunk/lib/msan/msan.cc Fri Jan 2 03:59:38 2015
@@ -144,17 +144,14 @@ static void ParseFlagsFromString(Flags *
}
static void InitializeFlags(Flags *f, const char *options) {
+ CommonFlags *cf = common_flags();
SetCommonFlagsDefaults();
- {
- CommonFlags cf = *common_flags();
- cf.external_symbolizer_path = GetEnv("MSAN_SYMBOLIZER_PATH");
- cf.malloc_context_size = 20;
- cf.handle_ioctl = true;
- // FIXME: test and enable.
- cf.check_printf = false;
- cf.intercept_tls_get_addr = true;
- OverrideCommonFlags(cf);
- }
+ cf->external_symbolizer_path = GetEnv("MSAN_SYMBOLIZER_PATH");
+ cf->malloc_context_size = 20;
+ cf->handle_ioctl = true;
+ // FIXME: test and enable.
+ cf->check_printf = false;
+ cf->intercept_tls_get_addr = true;
internal_memset(f, 0, sizeof(*f));
f->poison_heap_with_zeroes = false;
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h Fri Jan 2 03:59:38 2015
@@ -73,7 +73,7 @@ struct CommonFlags {
// Functions to get/set global CommonFlags shared by all sanitizer runtimes:
extern CommonFlags common_flags_dont_use;
-inline const CommonFlags *common_flags() {
+inline CommonFlags *common_flags() {
return &common_flags_dont_use;
}
@@ -84,16 +84,6 @@ inline void SetCommonFlagsDefaults() {
inline void ParseCommonFlagsFromString(const char *str) {
common_flags_dont_use.ParseFromString(str);
}
-
-// This function can only be used to setup tool-specific overrides for
-// CommonFlags defaults. Generally, it should only be used right after
-// SetCommonFlagsDefaults(), but before ParseCommonFlagsFromString(), and
-// only during the flags initialization (i.e. before they are used for
-// the first time).
-inline void OverrideCommonFlags(const CommonFlags &cf) {
- common_flags_dont_use = cf;
-}
-
void PrintFlagDescriptions();
} // namespace __sanitizer
Modified: compiler-rt/trunk/lib/tsan/dd/dd_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/dd/dd_rtl.cc?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/dd/dd_rtl.cc (original)
+++ compiler-rt/trunk/lib/tsan/dd/dd_rtl.cc Fri Jan 2 03:59:38 2015
@@ -70,13 +70,10 @@ void InitializeFlags(Flags *f, const cha
// Default values.
f->second_deadlock_stack = false;
+ CommonFlags *cf = common_flags();
SetCommonFlagsDefaults();
- {
- // Override some common flags defaults.
- CommonFlags cf = *common_flags();
- cf.allow_addr2line = true;
- OverrideCommonFlags(cf);
- }
+ // Override some common flags defaults.
+ cf->allow_addr2line = true;
// Override from command line.
ParseFlag(env, &f->second_deadlock_stack, "second_deadlock_stack", "");
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_flags.cc Fri Jan 2 03:59:38 2015
@@ -93,16 +93,13 @@ void InitializeFlags(Flags *f, const cha
// DDFlags
f->second_deadlock_stack = false;
+ CommonFlags *cf = common_flags();
SetCommonFlagsDefaults();
- {
- // Override some common flags defaults.
- CommonFlags cf = *common_flags();
- cf.allow_addr2line = true;
- cf.detect_deadlocks = true;
- cf.print_suppressions = false;
- cf.stack_trace_format = " #%n %f %S %M";
- OverrideCommonFlags(cf);
- }
+ // Override some common flags defaults.
+ cf->allow_addr2line = true;
+ cf->detect_deadlocks = true;
+ cf->print_suppressions = false;
+ cf->stack_trace_format = " #%n %f %S %M";
// Let a frontend override.
ParseFlags(f, __tsan_default_options());
@@ -118,8 +115,7 @@ void InitializeFlags(Flags *f, const cha
f->report_signal_unsafe = false;
}
- if (common_flags()->help)
- PrintFlagDescriptions();
+ if (cf->help) PrintFlagDescriptions();
if (f->history_size < 0 || f->history_size > 7) {
Printf("ThreadSanitizer: incorrect value for history_size"
Modified: compiler-rt/trunk/lib/ubsan/ubsan_flags.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_flags.cc?rev=225079&r1=225078&r2=225079&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/ubsan_flags.cc (original)
+++ compiler-rt/trunk/lib/ubsan/ubsan_flags.cc Fri Jan 2 03:59:38 2015
@@ -22,10 +22,9 @@ static const char *MaybeCallUbsanDefault
}
void InitializeCommonFlags() {
+ CommonFlags *cf = common_flags();
SetCommonFlagsDefaults();
- CommonFlags cf = *common_flags();
- cf.print_summary = false;
- OverrideCommonFlags(cf);
+ cf->print_summary = false;
// Override from user-specified string.
ParseCommonFlagsFromString(MaybeCallUbsanDefaultOptions());
// Override from environment variable.
More information about the llvm-commits
mailing list