commit 555c6be041d468cfc2baaf69a6ae5d1cf889dc9e
author Jan Korous <jkorous@apple.com> Fri Nov 08 13:56:37 2019 -0800
committer Jan Korous <jkorous@apple.com> Fri Nov 08 13:57:33 2019 -0800
tree 3447afab4a5a5d63d19ae283e6dde72c7ff4bea6
parent cae4a28864f4e8a55920e2b94e2cd43617902dec

[clang] Fix -fsanitize-system-blacklist processing in cc1

clang/lib/Frontend/CompilerInvocation.cpp

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 195a29d..9bd7c56 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -3194,6 +3194,11 @@
   Opts.SanitizeAddressFieldPadding =
       getLastArgIntValue(Args, OPT_fsanitize_address_field_padding, 0, Diags);
   Opts.SanitizerBlacklistFiles = Args.getAllArgValues(OPT_fsanitize_blacklist);
+  std::vector<std::string> systemBlacklists =
+      Args.getAllArgValues(OPT_fsanitize_system_blacklist);
+  Opts.SanitizerBlacklistFiles.insert(Opts.SanitizerBlacklistFiles.end(),
+                                      systemBlacklists.begin(),
+                                      systemBlacklists.end());
 
   // -fxray-instrument
   Opts.XRayInstrument =