From e586170e8666294e94e0867c4b8f155686a719a8 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 28 Mar 2013 09:11:20 +0000 Subject: [PATCH] Fix unmatching ASan runtime flag for init-order checking exposed by r178158. Add a test for r178158. llvm-svn: 178229 --- compiler-rt/lib/asan/asan_rtl.cc | 2 +- compiler-rt/lib/sanitizer_common/tests/sanitizer_flags_test.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc index ebdb5710ddee..837bf974d261 100644 --- a/compiler-rt/lib/asan/asan_rtl.cc +++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/tests/sanitizer_flags_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_flags_test.cc index 8c456c6a7e22..cd3cac11bc80 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_flags_test.cc +++ b/compiler-rt/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,