diff options
| author | Alexandre Ganea <alexandre.ganea@ubisoft.com> | 2020-02-07 09:35:51 -0500 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2020-02-10 15:45:46 +0100 |
| commit | 0e1c734fa5b88ec7efc2bcf8d45ed58f6ba48b91 (patch) | |
| tree | b5aca3fc040931a094f3f5d945120a4d242a3995 /clang/lib/Frontend/CompilerInvocation.cpp | |
| parent | 4759c6ef8b4ab8d17be3a5e6c96e890944bc515d (diff) | |
| download | bcm5719-llvm-0e1c734fa5b88ec7efc2bcf8d45ed58f6ba48b91.tar.gz bcm5719-llvm-0e1c734fa5b88ec7efc2bcf8d45ed58f6ba48b91.zip | |
Re-land "[Clang][Driver] Remove -M group options ..." and "[Clang] Avoid crashing when generating crash diagnostics when '#pragma clang __debug ..."
This re-lands commits f41ec709d9d388dc43469e6ac7f51b6313f7e4af (https://reviews.llvm.org/D74076)
and commit 5fedc2b410853a6aef05e8edf19ebfc4e071e28f (https://reviews.llvm.org/D74070)
The previous build break was caused by '#pragma clang __debug llvm_unreachable' used in a non-assert build. Move it to a separate test in crash-report-with-asserts.c.
(cherry picked from commit 75f09b54429bee17a96e2ba7a2ac0f0a8a7f7e74)
Diffstat (limited to 'clang/lib/Frontend/CompilerInvocation.cpp')
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 4e5babdbaa0..e98a407ac42 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -3440,6 +3440,7 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args, Opts.LexEditorPlaceholders = false; Opts.SetUpStaticAnalyzer = Args.hasArg(OPT_setup_static_analyzer); + Opts.DisablePragmaDebugCrash = Args.hasArg(OPT_disable_pragma_debug_crash); } static void ParsePreprocessorOutputArgs(PreprocessorOutputOptions &Opts, |
