diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-03-28 09:11:20 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-03-28 09:11:20 +0000 |
| commit | 6e7dca77e5e28ba4411edeadc2cfb7a4e296cef6 (patch) | |
| tree | 4758672f73f12ace59725508c65159d6510a3d28 /lib | |
| parent | 83b47072ff373766b8f424e31c278cfa31ab46a3 (diff) | |
| download | compiler-rt-6e7dca77e5e28ba4411edeadc2cfb7a4e296cef6.tar.gz compiler-rt-6e7dca77e5e28ba4411edeadc2cfb7a4e296cef6.tar.bz2 compiler-rt-6e7dca77e5e28ba4411edeadc2cfb7a4e296cef6.tar.xz | |
Fix unmatching ASan runtime flag for init-order checking exposed by r178158. Add a test for r178158.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@178229 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asan/asan_rtl.cc | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/tests/sanitizer_flags_test.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/asan/asan_rtl.cc b/lib/asan/asan_rtl.cc index ebdb5710..837bf974 100644 --- a/lib/asan/asan_rtl.cc +++ b/lib/asan/asan_rtl.cc @@ -96,7 +96,7 @@ static void ParseFlagsFromString(Flags *f, const char *str) { ParseFlag(str, &f->debug, "debug"); ParseFlag(str, &f->report_globals, "report_globals"); - ParseFlag(str, &f->check_initialization_order, "initialization_order"); + ParseFlag(str, &f->check_initialization_order, "check_initialization_order"); ParseFlag(str, &f->malloc_context_size, "malloc_context_size"); CHECK((uptr)f->malloc_context_size <= kStackTraceMax); diff --git a/lib/sanitizer_common/tests/sanitizer_flags_test.cc b/lib/sanitizer_common/tests/sanitizer_flags_test.cc index 8c456c6a..cd3cac11 100644 --- a/lib/sanitizer_common/tests/sanitizer_flags_test.cc +++ b/lib/sanitizer_common/tests/sanitizer_flags_test.cc @@ -63,6 +63,7 @@ TEST(SanitizerCommon, StrFlags) { TestStrFlag("", "--flag_name='abc zxc'", "abc zxc"); TestStrFlag("", "--flag_name='abc zxcc'", "abc zxcc"); TestStrFlag("", "--flag_name=\"abc qwe\" asd", "abc qwe"); + TestStrFlag("", "other_flag_name=zzz", ""); } static void TestTwoFlags(const char *env, bool expected_flag1, |