[llvm-branch-commits] [cfe-branch] r345304 - Merging r339424:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu Oct 25 12:37:31 2018
New Revision: 345304

URL: http://llvm.org/viewvc/llvm-project?rev=345304&view=rev
Log:
Merging r339424:

------------------------------------------------------------------------
r339424 | hans | 2018-08-10 04:40:50 -0700 (Fri, 10 Aug 2018) | 1 line

clang-cl: accept -fcrash-diagnostics-dir=
------------------------------------------------------------------------

Modified:
    cfe/branches/release_70/include/clang/Driver/Options.td
    cfe/branches/release_70/test/Driver/cl-options.c

Modified: cfe/branches/release_70/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/include/clang/Driver/Options.td?rev=345304&r1=345303&r2=345304&view=diff
==============================================================================
--- cfe/branches/release_70/include/clang/Driver/Options.td (original)
+++ cfe/branches/release_70/include/clang/Driver/Options.td Thu Oct 25 12:37:31 2018
@@ -802,7 +802,7 @@ def fconstexpr_backtrace_limit_EQ : Join
                                     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]>;

Modified: cfe/branches/release_70/test/Driver/cl-options.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/Driver/cl-options.c?rev=345304&r1=345303&r2=345304&view=diff
==============================================================================
--- cfe/branches/release_70/test/Driver/cl-options.c (original)
+++ cfe/branches/release_70/test/Driver/cl-options.c Thu Oct 25 12:37:31 2018
@@ -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 \