summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2018-10-25 19:37:31 +0000
committerTom Stellard <tstellar@redhat.com>2018-10-25 19:37:31 +0000
commit457a2c1c330b9d17e20ca14fe6b34cd754f7c180 (patch)
treefb15014a9c4dbe91fbc968e97449a421edd31f54
parentf286144ce5922f109dba99f61822ea7133c9447a (diff)
Merging r339424:
------------------------------------------------------------------------ r339424 | hans | 2018-08-10 04:40:50 -0700 (Fri, 10 Aug 2018) | 1 line clang-cl: accept -fcrash-diagnostics-dir= ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_70@345304 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Driver/Options.td2
-rw-r--r--test/Driver/cl-options.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 7da45d2774..601aa87449 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -802,7 +802,7 @@ def fconstexpr_backtrace_limit_EQ : Joined<["-"], "fconstexpr-backtrace-limit=">
Group<f_Group>;
def fno_crash_diagnostics : Flag<["-"], "fno-crash-diagnostics">, Group<f_clang_Group>, Flags<[NoArgumentUnused]>,
HelpText<"Disable auto-generation of preprocessed source files and a script for reproduction during a clang crash">;
-def fcrash_diagnostics_dir : Joined<["-"], "fcrash-diagnostics-dir=">, Group<f_clang_Group>, Flags<[NoArgumentUnused]>;
+def fcrash_diagnostics_dir : Joined<["-"], "fcrash-diagnostics-dir=">, Group<f_clang_Group>, Flags<[NoArgumentUnused, CoreOption]>;
def fcreate_profile : Flag<["-"], "fcreate-profile">, Group<f_Group>;
def fcxx_exceptions: Flag<["-"], "fcxx-exceptions">, Group<f_Group>,
HelpText<"Enable C++ exceptions">, Flags<[CC1Option]>;
diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c
index 9aa6ced349..59f565e6f2 100644
--- a/test/Driver/cl-options.c
+++ b/test/Driver/cl-options.c
@@ -566,6 +566,7 @@
// RUN: %clang_cl \
// RUN: --driver-mode=cl \
// RUN: -fblocks \
+// RUN: -fcrash-diagnostics-dir=/foo \
// RUN: -fno-blocks \
// RUN: -fbuiltin \
// RUN: -fno-builtin \