[ubsan] Save binary name before parsing options

vitalybuka · vitalybuka · commit bdcc82d7eda1 · 2017-09-11T21:13:06.000Z
Summary: To parser "include" we may need to do binary name substitution. Reviewers: eugenis, alekseyshl Subscribers: llvm-commits, kubamracek Differential Revision: https://reviews.llvm.org/D37658 llvm-svn: 312953
diff --git a/compiler-rt/lib/ubsan/ubsan_init.cc b/compiler-rt/lib/ubsan/ubsan_init.cc
@@ -40,8 +40,8 @@ static void CommonInit() {
 
 static void CommonStandaloneInit() {
   SanitizerToolName = GetSanititizerToolName();
-  InitializeFlags();
   CacheBinaryName();
+  InitializeFlags();
   __sanitizer_set_report_path(common_flags()->log_path);
   AndroidLogInit();
   InitializeCoverage(common_flags()->coverage, common_flags()->coverage_dir);
diff --git a/compiler-rt/test/sanitizer_common/TestCases/options-include.cc b/compiler-rt/test/sanitizer_common/TestCases/options-include.cc
@@ -1,5 +1,4 @@
 // RUN: %clangxx -O0 %s -o %t
-// UNSUPPORTED: ubsan
 
 // Recursive include: options1 includes options2
 // RUN: echo "symbolize=1" > %t.options1.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %clangxx -O0 %s -o %t`
`2`		`-// UNSUPPORTED: ubsan`
`3`	`2`
`4`	`3`	`// Recursive include: options1 includes options2`
`5`	`4`	`// RUN: echo "symbolize=1" > %t.options1.txt`